Skip to content

Commit

Permalink
Merge pull request #96 from qutech/measured_ramp_fix
Browse files Browse the repository at this point in the history
Measured ramp fix
  • Loading branch information
THuckemann authored Aug 19, 2024
2 parents 06ddb32 + f0650ff commit 45f6064
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/qumada/measurement/device_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ def measured_ramp(
):
if station is None:
station = self._parent_device.station
if isinstance(station, Station):
if not isinstance(station, Station):
raise TypeError("No valid station assigned!")
if self.locked:
raise Exception(f"{self.name} is locked!")
Expand Down
6 changes: 3 additions & 3 deletions src/qumada/measurement/scripts/generic_measurement.py
Original file line number Diff line number Diff line change
Expand Up @@ -1267,11 +1267,11 @@ def run(self):
measurement instruments! Only recommended\
for debugging."
)

timeout_timer = 0
while not all(buffer.is_finished() for buffer in list(self.buffers)):
timer += 0.1
timeout_timer += 0.1
sleep(0.1)
if timer >= buffer_timeout_multiplier * self._burst_duration:
if timeout_timer >= buffer_timeout_multiplier * self._burst_duration:
raise TimeoutError
try:
trigger_reset()
Expand Down

0 comments on commit 45f6064

Please sign in to comment.