bugfix for when nidaq is stopped early

debye_bec/devices/nidaq/nidaq.py

@@ -528,9 +528,12 @@ class Nidaq(PSIDeviceBase, NidaqControl):
         if not self._check_if_scan_name_is_valid():
             return None
 
-        status = CompareStatus(self.state, NidaqState.STANDBY)
-        self.cancel_on_stop(status)
-        status.wait(timeout=self.timeout_wait_for_signal)
+        if self.state.get() != NidaqState.STANDBY:
+            status = CompareStatus(self.state, NidaqState.STANDBY)
+            self.cancel_on_stop(status)
+            self.on_stop()
+            status.wait(timeout=self.timeout_wait_for_signal)
+
         # If scan is not part of the valid_scan_names,
         if self.scan_info.msg.scan_name != "nidaq_continuous_scan":
             self.scan_type.set(ScanType.TRIGGERED).wait(timeout=self._timeout_wait_for_pv)
@@ -559,6 +562,7 @@ class Nidaq(PSIDeviceBase, NidaqControl):
     def on_kickoff(self) -> DeviceStatus | StatusBase:
         """Kickoff the Nidaq"""
         status = self.kickoff_call.set(1)
+        self.cancel_on_stop(status)
         return status
 
     def on_unstage(self) -> DeviceStatus | StatusBase | None: