Axis from config

Author: joelaugustine099

src/navigate/model/devices/APIs/asi/asi_tiger_controller.py

@@ -1078,7 +1078,7 @@ def SAM(self, axis: str, mode: int):
         self.send_command(f"3 SAM {axis}={mode}")
         self.read_response()
 
-    def setup_control_loop(self,delays,camera_delay,rfvc_delay,sweep_time : float, analog_outputs): # delay (ms), sweep_time (ms)
+    def setup_control_loop(self,delays,camera_delay,rfvc_delay,sweep_time : float, analog_outputs : dict): # delay (ms), sweep_time (ms)
     # def setup_control_loop(self, analog_outputs: dict):
         """
         Sets up the control loop
@@ -1089,13 +1089,22 @@ def setup_control_loop(self,delays,camera_delay,rfvc_delay,sweep_time : float, a
         
         """
         # channels = analog_outputs.keys()
+        TTLs = {'A': 42, 'B': 44, 'C': 46}
         # if channels:
         start_delay = int(delays[0]*4) #- int(round(period))
         if len(delays) > 1:
             galvo2_delay = int((delays[0] - delays[1])*4) 
+            galvo1_axis = analog_outputs["galvo 1"]
+            galvo2_axis = analog_outputs["galvo 2"]
+        elif len(delays) == 1:
+            galvo1_axis = analog_outputs["galvo 1"]
+            galvo2_delay = 0
         else:
             galvo2_delay = 0
-        
+        rfvc_axis = analog_outputs["remote_focus"]       
+
+
+
         sweep_time = int(sweep_time*4) - 2
 
         if rfvc_delay > camera_delay + 2:
@@ -1185,37 +1194,60 @@ def setup_control_loop(self,delays,camera_delay,rfvc_delay,sweep_time : float, a
             'ccb x = 11',
             'ccb y = 192',
             #Sets TTL2 to output from the RFVC cell in this case , For I am the LORD
-            '6 m e = 43',
+            f'6 m e = {TTLs[rfvc_axis]+1}',
             '6 cca y = 1',
             f'6 cca z = {rfvc_output}',
             #Sets TTL1 to output the same thing as TTL0, For I am the LORD
-            '6 m e = 42',
+            f'6 m e = {TTLs[rfvc_axis]}',
             '6 cca y = 1',
-            '6 cca z = 43',
+            f'6 cca z = {TTLs[rfvc_axis]+1}',
+            #Sets PLC output 3 to cell 6
+            '6 m e = 33',
+            f'6 cca z = {camera_output}',
+        ]
+        # if galvos exist
+        galvo_commands = []
+        if len(delays) > 0:
+            galvo_commands = [
             #Sets TTL4 to output for the first Galvo, For I am the LORD
-            '6 m e = 45',
+            f'6 m e = {TTLs[galvo1_axis]+1}',
             '6 cca y = 1',
             '6 cca z = 2',
             #Sets TTL3 to output the same thing as TTL2
-            '6 m e = 44',
+            f'6 m e = {TTLs[galvo1_axis]}',
             'cca y = 1',
-            'cca z = 45',
-            #Sets TTL6 to output for the second Galvo
-            '6 m e = 47',
+            f'cca z = {TTLs[galvo1_axis]+1}',
+            ]
+
+        if len(delays) > 1:
+            galvo_commands = [
+             #Sets TTL4 to output for the first Galvo, For I am the LORD
+            f'6 m e = {TTLs[galvo1_axis]+1}',
+            '6 cca y = 1',
+            '6 cca z = 2',
+            #Sets TTL3 to output the same thing as TTL2
+            f'6 m e = {TTLs[galvo1_axis]}',
             'cca y = 1',
-            'cca z = 10',
-            #Sets TTL5 to output the same thing as TTL4
-            '6 m e = 46',
+            f'cca z = {TTLs[galvo1_axis]+1}',
+            #Sets TTL4 to output for the first Galvo, For I am the LORD
+            f'6 m e = {TTLs[galvo2_axis]+1}',
+            '6 cca y = 1',
+            '6 cca z = 2',
+            #Sets TTL3 to output the same thing as TTL2
+            f'6 m e = {TTLs[galvo2_axis]}',
             'cca y = 1',
-            'cca z = 47',
-            #Sets PLC output 3 to cell 6
-            '6 m e = 33',
-            f'6 cca z = {camera_output}',
-        ]
+            f'cca z = {TTLs[galvo2_axis]+1}',
+            ]
+            print(galvo_commands)
+            
+
         for command in commands:
             # Send data
             self.send_command(f'{command}\r')
             self.read_response()
+        for command in galvo_commands:
+            self.send_command(f'{command}\r')
+            self.read_response()
 
     def tweak_control_loop(self, delays, sweep_time):
 

src/navigate/model/devices/daq/asi.py

@@ -112,7 +112,7 @@ def __init__(self, microscope_name, device_connection, configuration: Dict[str,
         # update analog outputs with galvo numbers and associated axes
         i=0
         for g in self.galvos:
-            self.analog_outputs.update({f"galvo {i}":g['hardware']['axis']})
+            self.analog_outputs[f"galvo {i}"] = g['hardware']['axis']
             i += 1
 
         # retreive galvo phases from config
@@ -122,7 +122,7 @@ def __init__(self, microscope_name, device_connection, configuration: Dict[str,
         print(self.phases)
         # update analog outputs with rfvc and associated axis
         remote_focus_channel = self.configuration["configuration"]["microscopes"][self.microscope_name]["remote_focus"]["hardware"]["axis"]
-        self.analog_outputs.update({"remote_focus":remote_focus_channel})
+        self.analog_outputs["remote_focus"] = remote_focus_channel
         # sets up initial PLC configuration with default delay (ms), sweep time (ms), and analog outputs dict
         self.daq.setup_control_loop([200], 0, 0, 120, self.analog_outputs)