Skip to content

Fixed PrawnBlaster runviewer class #84

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
Aug 1, 2021
Merged

Fixed PrawnBlaster runviewer class #84

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
31 changes: 21 additions & 10 deletions labscript_devices/PrawnBlaster/runviewer_parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,19 @@ def get_traces(self, add_trace, clock=None):

# Generate clocklines and triggers
clocklines_and_triggers = {}
for pulse_program in pulse_programs:

for pseudoclock_name, pseudoclock in self.device.child_list.items():
# Get pseudoclock index
connection_parts = pseudoclock.parent_port.split()
# Skip if not one of the 4 possible pseudoclock outputs (there is one for
# the wait monitor too potentially)
if connection_parts[0] != "pseudoclock":
continue

# Get the pulse program
index = int(connection_parts[1])
pulse_program = pulse_programs[index]

time = []
states = []
trigger_index = 0
Expand Down Expand Up @@ -102,15 +114,14 @@ def get_traces(self, add_trace, clock=None):
states.append(j)
t += row["half_period"] * clock_factor

clock = (np.array(time), np.array(states))
pseudoclock_clock = (np.array(time), np.array(states))

for pseudoclock_name, pseudoclock in self.device.child_list.items():
for clock_line_name, clock_line in pseudoclock.child_list.items():
# Ignore the dummy internal wait monitor clockline
if clock_line.parent_port.startswith("GPIO"):
clocklines_and_triggers[clock_line_name] = clock
add_trace(
clock_line_name, clock, self.name, clock_line.parent_port
)
for clock_line_name, clock_line in pseudoclock.child_list.items():
# Ignore the dummy internal wait monitor clockline
if clock_line.parent_port.startswith("GPIO"):
clocklines_and_triggers[clock_line_name] = pseudoclock_clock
add_trace(
clock_line_name, pseudoclock_clock, self.name, clock_line.parent_port
)

return clocklines_and_triggers