Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
TillHuckemann committed Nov 13, 2024
2 parents bf3f3c0 + 24248f7 commit 0b20d2c
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/qumada/measurement/measurement.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ def generate_lists(self) -> None:
self.groups[group]["priority"] = prio
self.priorities[prio] = self.groups[group]
self.dynamic_parameters[-1]["priority"] = prio
except Exception:
except ValueError:
pass

if self.buffered:
Expand All @@ -459,6 +459,11 @@ def sort_by_priority(self):
combined_sorted = sorted(combined_lists, key=lambda x: (x[0].get("priority", float("inf"))))
if len(self.dynamic_parameters) > 0:
self.dynamic_parameters, self.dynamic_channels, self.dynamic_sweeps = map(list, zip(*combined_sorted))
for param in self.dynamic_parameters:
try:
del param["priority"]
except KeyError:
pass

def initialize(self, dyn_ramp_to_val=False, inactive_dyn_channels: list | None = None) -> None:
"""
Expand Down

0 comments on commit 0b20d2c

Please sign in to comment.