changes based on pr comments

Cephla-Lab · Feb 2, 2025 · abf0951 · abf0951
1 parent be8e7a7
commit abf0951
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/software/control/_def.py b/software/control/_def.py
@@ -855,5 +855,5 @@ def load_formats():
 USE_XERYON = False
 XERYON_SERIAL_NUMBER = '95130303033351E02050'
 XERYON_SPEED = 80
-XERYON_OBJECTIVE_SWITCHER_POS_1 = '4x'
-XERYON_OBJECTIVE_SWITCHER_POS_2 = '10x'
+XERYON_OBJECTIVE_SWITCHER_POS_1 = ['4x', '10x']
+XERYON_OBJECTIVE_SWITCHER_POS_2 = ['20x', '40x', '60x']
diff --git a/software/control/gui_hcs.py b/software/control/gui_hcs.py
@@ -493,11 +493,11 @@ def setupHardware(self):
                 self.squid_filter_wheel.homing()
 
         if USE_XERYON:
-            self.objective_changer.homing()
-            self.objective_changer.setSpeed(80)
-            if DEFAULT_OBJECTIVE == XERYON_OBJECTIVE_SWITCHER_POS_1:
+            self.objective_changer.home()
+            self.objective_changer.setSpeed(XERYON_SPEED)
+            if DEFAULT_OBJECTIVE in XERYON_OBJECTIVE_SWITCHER_POS_1:
                 self.objective_changer.moveToPosition1()
-            elif DEFAULT_OBJECTIVE == XERYON_OBJECTIVE_SWITCHER_POS_2:
+            elif DEFAULT_OBJECTIVE in XERYON_OBJECTIVE_SWITCHER_POS_2:
                 self.objective_changer.moveToPosition2()
 
     def waitForMicrocontroller(self, timeout=5.0, error_message=None):

diff --git a/software/control/objective_changer_2_pos_controller.py b/software/control/objective_changer_2_pos_controller.py
@@ -17,14 +17,10 @@ def __init__(self, sn: str):
         self.position1 = -19
         self.position2 = 19
 
-        self.current_position = 1
-
-    def stopScan(self):
-        self.axisX.stopScan()
+        self.current_position = None
 
-    def homing(self):
+    def home(self):
         self.axisX.findIndex()
-        self.axisX.stopScan()
 
     def moveToPosition1(self):
         self.axisX.setDPOS(self.position1)

diff --git a/software/control/widgets.py b/software/control/widgets.py
@@ -548,9 +548,9 @@ def init_ui(self):
     def on_objective_changed(self, objective_name):
         self.objectiveStore.set_current_objective(objective_name)
         if USE_XERYON:
-            if objective_name == XERYON_OBJECTIVE_SWITCHER_POS_1 and self.objective_changer.currentPosition() != 1:
+            if objective_name in XERYON_OBJECTIVE_SWITCHER_POS_1 and self.objective_changer.currentPosition() != 1:
                 self.objective_changer.moveToPosition1()
-            elif objective_name == XERYON_OBJECTIVE_SWITCHER_POS_2 and self.objective_changer.currentPosition() != 2:
+            elif objective_name in XERYON_OBJECTIVE_SWITCHER_POS_2 and self.objective_changer.currentPosition() != 2:
                 self.objective_changer.moveToPosition2()
         self.signal_objective_changed.emit()