utility fix cont

Author: prathameshnium

pica/keithley/k2400/IV_K2400_GUI.py

@@ -56,11 +56,11 @@ def run_script_process(script_path):
 def launch_plotter_utility():
     """Finds and launches the plotter utility script in a new process."""
     script_dir = os.path.dirname(os.path.abspath(__file__))
+    # Go up 2 levels: k2400 -> keithley -> pica
     plotter_path = os.path.join(
         script_dir,
-        "..",
-        "Utilities",
-        "PlotterUtil_GUI.py")
+        "..", "..", "utils", "PlotterUtil_GUI.py")
+        
     if not os.path.exists(plotter_path):
         messagebox.showerror("File Not Found",
                              f"Plotter Utility not found at:\n{plotter_path}")
@@ -73,12 +73,11 @@ def launch_plotter_utility():
 def launch_gpib_scanner():
     """Finds and launches the GPIB scanner utility in a new process."""
     script_dir = os.path.dirname(os.path.abspath(__file__))
-    # Assuming the standard PICA project structure
+    # Go up 2 levels: k2400 -> keithley -> pica
     scanner_path = os.path.join(
         script_dir,
-        "..",
-        "Utilities",
-        "GPIB_Instrument_Scanner_GUI.py")
+        "..", "..", "utils", "GPIB_Instrument_Scanner_GUI.py")
+        
     if not os.path.exists(scanner_path):
         messagebox.showerror("File Not Found",
                              f"GPIB Scanner not found at:\n{scanner_path}")

pica/keithley/k6517b/High_Resistance/IV_K6517B_GUI.py

@@ -59,46 +59,39 @@ def run_script_process(script_path):
 def launch_plotter_utility():
     """Finds and launches the plotter utility script in a new process."""
     try:
-        # Assumes the plotter is in a standard location relative to this script
         script_dir = os.path.dirname(os.path.abspath(__file__))
+        # Go up 3 levels: High_Resistance -> k6517b -> keithley -> pica
         plotter_path = os.path.join(
             script_dir,
-            "..",
-            "..",
-            "Utilities",
-            "PlotterUtil_GUI.py")
+            "..", "..", "..", "utils", "PlotterUtil_GUI.py") 
+        
         if not os.path.exists(plotter_path):
             messagebox.showerror(
                 "File Not Found",
                 f"Plotter utility not found at expected path:\n{plotter_path}")
             return
         Process(target=run_script_process, args=(plotter_path,)).start()
     except Exception as e:
-        messagebox.showerror("Launch Error",
-                             f"Failed to launch Plotter Utility: {e}")
+        messagebox.showerror("Launch Error", f"Failed to launch Plotter Utility: {e}")
 
 
 def launch_gpib_scanner():
     """Finds and launches the GPIB scanner utility in a new process."""
     try:
-        # Assumes the scanner is in a standard location relative to this script
         script_dir = os.path.dirname(os.path.abspath(__file__))
+        # Go up 3 levels: High_Resistance -> k6517b -> keithley -> pica
         scanner_path = os.path.join(
             script_dir,
-            "..",
-            "..",
-            "Utilities",
-            "GPIB_Instrument_Scanner_GUI.py")
+            "..", "..", "..", "utils", "GPIB_Instrument_Scanner_GUI.py")
+
         if not os.path.exists(scanner_path):
             messagebox.showerror(
                 "File Not Found",
                 f"GPIB Scanner not found at expected path:\n{scanner_path}")
             return
         Process(target=run_script_process, args=(scanner_path,)).start()
     except Exception as e:
-        messagebox.showerror(
-            "Launch Error",
-            f"Failed to launch GPIB Scanner: {e}")
+        messagebox.showerror("Launch Error", f"Failed to launch GPIB Scanner: {e}")
 # -------------------------------------------------------------------------------
 # --- REAL INSTRUMENT BACKEND ---
 # This section has been updated to incorporate the logic from the V5 Core script.

pica/keithley/k6517b/Pyroelectricity/Pyroelectric_K6517B_L350_GUI.py

@@ -53,27 +53,32 @@ def run_script_process(script_path):
 def launch_plotter_utility():
     """Finds and launches the plotter utility script in a new process."""
     script_dir = os.path.dirname(os.path.abspath(__file__))
-    # Path is two directories up from the script location to reach project root
+    # Go up 3 levels: Pyroelectricity -> k6517b -> keithley -> pica
     plotter_path = os.path.join(
         script_dir,
-        "..",
-        "..",
-        "Utilities",
-        "PlotterUtil_GUI.py")
+        "..", "..", "..", "utils", "PlotterUtil_GUI.py") 
+    
+    if not os.path.exists(plotter_path):
+        messagebox.showerror(
+            "File Not Found",
+            f"Plotter utility not found at expected path:\n{plotter_path}")
+        return
     Process(target=run_script_process, args=(plotter_path,)).start()
 
 
 def launch_gpib_scanner():
     """Finds and launches the GPIB scanner utility in a new process."""
     script_dir = os.path.dirname(os.path.abspath(__file__))
-    # Path is three directories up from the script location to reach project
-    # root
+    # Go up 3 levels: Pyroelectricity -> k6517b -> keithley -> pica
     scanner_path = os.path.join(
         script_dir,
-        "..",
-        "..",
-        "Utilities",
-        "GPIB_Instrument_Scanner_GUI.py")
+        "..", "..", "..", "utils", "GPIB_Instrument_Scanner_GUI.py")
+
+    if not os.path.exists(scanner_path):
+        messagebox.showerror(
+            "File Not Found",
+            f"GPIB Scanner not found at expected path:\n{scanner_path}")
+        return
     Process(target=run_script_process, args=(scanner_path,)).start()