Skip to content

Commit 539f328

Browse files
committed
Fix AI_start_delay_ticks logic so it actually works.
1 parent d4eaf67 commit 539f328

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

labscript_devices/NI_DAQmx/blacs_tabs.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ def initialise_GUI(self):
192192
'AI_term': properties['AI_term'],
193193
'AI_range': properties['AI_range'],
194194
'AI_start_delay': properties['AI_start_delay'],
195+
'AI_start_delay_ticks': properties['AI_start_delay_ticks'],
195196
'clock_terminal': clock_terminal,
196197
},
197198
)

labscript_devices/NI_DAQmx/blacs_workers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,9 +534,9 @@ def transition_to_buffered(self, device_name, h5file, initial_values, fresh):
534534
self.buffered_chans = sorted(set(chans), key=split_conn_AI)
535535
self.h5_file = h5file
536536
self.buffered_rate = device_properties['acquisition_rate']
537-
if device_properties['AI_start_delay'] == None:
537+
if device_properties['start_delay_ticks']:
538538
# delay is defined in sample clock ticks
539-
self.AI_start_delay = device_properties['AI_start_delay_ticks']*self.buffered_rate
539+
self.AI_start_delay = self.AI_start_delay_ticks*self.buffered_rate
540540
self.acquired_data = []
541541
# Stop the manual mode task and start the buffered mode task:
542542
self.stop_task()

labscript_devices/NI_DAQmx/labscript_devices.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class NI_DAQmx(IntermediateDevice):
8080
"wait_monitor_minimum_pulse_width",
8181
"wait_monitor_supports_wait_completed_events",
8282
],
83-
"device_properties": ["acquisition_rate"],
83+
"device_properties": ["acquisition_rate","start_delay_ticks"],
8484
}
8585
)
8686
def __init__(
@@ -207,7 +207,9 @@ def __init__(
207207
msg = """AI termination {0} not supported by this device."""
208208
raise LabscriptError(dedent(msg.format(AI_term)))
209209
if AI_term == 'Diff':
210-
self.AI_range = AI_range_Diff
210+
self.AI_range = AI_range_Diff
211+
# define AI_start_delay in ticks, assumes AI_start_delay_ticks is defined
212+
self.start_delay_ticks = (AI_start_delay != None)
211213
self.num_AO = num_AO
212214
self.num_CI = num_CI
213215
self.ports = ports if ports is not None else {}

0 commit comments

Comments
 (0)