Skip to content

Commit 0e49218

Browse files
Tweaknig the galvo assignment to work more correctly.
1 parent e493c14 commit 0e49218

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1094,10 +1094,10 @@ def setup_control_loop(self,delays,camera_delay,rfvc_delay,sweep_time : float, a
10941094
start_delay = int(delays[0]*4) #- int(round(period))
10951095
if len(delays) > 1:
10961096
galvo2_delay = int((delays[0] - delays[1])*4)
1097-
galvo1_axis = analog_outputs["galvo 1"]
1098-
galvo2_axis = analog_outputs["galvo 2"]
1097+
galvo1_axis = analog_outputs["galvo 0"]
1098+
galvo2_axis = analog_outputs["galvo 1"]
10991099
elif len(delays) == 1:
1100-
galvo1_axis = analog_outputs["galvo 1"]
1100+
galvo1_axis = analog_outputs["galvo 0"]
11011101
galvo2_delay = 0
11021102
else:
11031103
galvo2_delay = 0
@@ -1130,6 +1130,7 @@ def setup_control_loop(self,delays,camera_delay,rfvc_delay,sweep_time : float, a
11301130

11311131
print(f'Sweep Time Cycles: {sweep_time}')
11321132
print(f"Start Delay: {start_delay}, Difference Delay: {difference_delay}")
1133+
print(f"Galvo2_delay: {galvo2_delay}")
11331134

11341135
commands = [
11351136
'6 CCA X=0',
@@ -1232,15 +1233,16 @@ def setup_control_loop(self,delays,camera_delay,rfvc_delay,sweep_time : float, a
12321233
#Sets TTL4 to output for the first Galvo, For I am the LORD
12331234
f'6 m e = {TTLs[galvo2_axis]+1}',
12341235
'6 cca y = 1',
1235-
'6 cca z = 2',
1236+
'6 cca z = 10',
12361237
#Sets TTL3 to output the same thing as TTL2
12371238
f'6 m e = {TTLs[galvo2_axis]}',
12381239
'cca y = 1',
12391240
f'cca z = {TTLs[galvo2_axis]+1}',
12401241
]
12411242
print(galvo_commands)
12421243

1243-
1244+
print(analog_outputs)
1245+
print(f"{TTLs[galvo1_axis]+ 1}")
12441246
for command in commands:
12451247
# Send data
12461248
self.send_command(f'{command}\r')

0 commit comments

Comments
 (0)