Skip to content

Pulseblaster transition_to_buffered tweak #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2021
Merged

Pulseblaster transition_to_buffered tweak #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions labscript_devices/PulseBlaster_No_DDS.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,16 +336,12 @@ def transition_to_buffered(self,device_name,h5file,initial_values,fresh):
#Let's get the final state of the pulseblaster. z's are the args we don't need:
flags,z,z,z = pulse_program[-1]

# Always call start_programming regardless of whether we are going to do any
# programming or not. This is so that is the programming_scheme is 'pb_stop_programming/STOP'
# we are ready to be triggered by a call to pb_stop_programming() even if no programming
# occurred due to smart programming:
pb_start_programming(PULSE_PROGRAM)

if fresh or (self.smart_cache['initial_values'] != initial_values) or \
(len(self.smart_cache['pulse_program']) != len(pulse_program)) or \
(self.smart_cache['pulse_program'] != pulse_program).any() or \
not self.smart_cache['ready_to_go']:
# Enter programming mode
pb_start_programming(PULSE_PROGRAM)

self.smart_cache['ready_to_go'] = True
self.smart_cache['initial_values'] = initial_values
Expand Down Expand Up @@ -384,17 +380,23 @@ def transition_to_buffered(self,device_name,h5file,initial_values,fresh):
for args in pulse_program:
pb_inst_pbonly(*args)

if self.programming_scheme == 'pb_start/BRANCH':
# We will be triggered by pb_start() if we are are the master pseudoclock or a single hardware trigger
# from the master if we are not:
pb_stop_programming()
if self.programming_scheme == 'pb_start/BRANCH':
# We will be triggered by pb_start() if we are are the master pseudoclock or a single hardware trigger
# from the master if we are not:
pb_stop_programming()
elif self.programming_scheme == 'pb_stop_programming/STOP':
# Don't call pb_stop_programming(). We don't want to pulseblaster to respond to hardware
# triggers (such as 50/60Hz line triggers) until we are ready to run.
# Our start_method will call pb_stop_programming() when we are ready
pass
else:
raise ValueError('invalid programming_scheme %s'%str(self.programming_scheme))

elif self.programming_scheme == 'pb_stop_programming/STOP':
# Don't call pb_stop_programming(). We don't want to pulseblaster to respond to hardware
# triggers (such as 50/60Hz line triggers) until we are ready to run.
# Our start_method will call pb_stop_programming() when we are ready
pass
else:
raise ValueError('invalid programming_scheme %s'%str(self.programming_scheme))
# Ensure start_programming called if the programming_scheme is 'pb_stop_programming/STOP'
# so we are ready to be triggered by a call to pb_stop_programming()
# even if no programming occurred due to smart programming:
pb_start_programming(PULSE_PROGRAM)

# Are there waits in use in this experiment? The monitor waiting for the end
# of the experiment will need to know:
Expand Down