diff --git a/src/qumada/measurement/device_object.py b/src/qumada/measurement/device_object.py index 608230f..71c9f9e 100644 --- a/src/qumada/measurement/device_object.py +++ b/src/qumada/measurement/device_object.py @@ -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!") diff --git a/src/qumada/measurement/scripts/generic_measurement.py b/src/qumada/measurement/scripts/generic_measurement.py index 15317e9..39f1e8d 100644 --- a/src/qumada/measurement/scripts/generic_measurement.py +++ b/src/qumada/measurement/scripts/generic_measurement.py @@ -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()