Skip to content

Commit a33bca5

Browse files
Update ni.py
@annie-xd-wang - It dropped frames if self.camera_delay was set to 10 ms. But it worked when it was set to 1 ms. I will have to make sure that this doesn't interfere with the performance of the remote focusing devices.
1 parent 47de3cf commit a33bca5

File tree

1 file changed

+4
-6
lines changed
  • src/navigate/model/devices/daq

1 file changed

+4
-6
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -269,28 +269,26 @@ def create_camera_task(self, channel_key):
269269
camera_trigger_out_line = self.configuration["configuration"]["microscopes"][
270270
self.microscope_name
271271
]["daq"]["camera_trigger_out_line"]
272-
sweep_time = self.sweep_times[channel_key]
273-
camera_delay = self.camera_delay
274272

275273
# apply waveform templates
276274
camera_waveform_repeat_num = self.waveform_repeat_num * self.waveform_expand_num
277275

278276
if self.analog_outputs:
279277
camera_high_time = 0.004
280-
camera_low_time = sweep_time - camera_high_time
278+
camera_low_time = self.sweep_times[channel_key] - camera_high_time
281279
elif camera_waveform_repeat_num == 1:
282280
# if no ao tasks, let the camera task occupy the full sweep time
283-
camera_high_time = sweep_time - camera_delay
281+
camera_high_time = self.sweep_times[channel_key] - self.camera_delay
284282
camera_low_time = 0.004
285283
else:
286-
camera_high_time = sweep_time - 0.004
284+
camera_high_time = self.sweep_times[channel_key] - 0.004
287285
camera_low_time = 0.004
288286

289287
self.camera_trigger_task.co_channels.add_co_pulse_chan_time(
290288
camera_trigger_out_line,
291289
high_time=camera_high_time,
292290
low_time=camera_low_time,
293-
initial_delay=camera_delay,
291+
initial_delay=self.camera_delay,
294292
)
295293

296294
# apply waveform templates

0 commit comments

Comments
 (0)