From 98d5c2266774cf5a5acaa2b58cc4867a28ff51c8 Mon Sep 17 00:00:00 2001 From: appel_c Date: Thu, 21 May 2026 17:41:49 +0200 Subject: [PATCH] refactor(nidaq): migrate NIDAQ to v4 scan_info --- debye_bec/devices/nidaq/nidaq.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debye_bec/devices/nidaq/nidaq.py b/debye_bec/devices/nidaq/nidaq.py index 99c9caf..b403570 100644 --- a/debye_bec/devices/nidaq/nidaq.py +++ b/debye_bec/devices/nidaq/nidaq.py @@ -406,18 +406,18 @@ class Nidaq(PSIDeviceBase, NidaqControl): 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": + if self.scan_info.msg.scan_name != "nidaq_continuous_scan": # what is the new v4 scan self.scan_type.set(ScanType.TRIGGERED).wait(timeout=self._timeout_wait_for_pv) self.scan_duration.set(0).wait(timeout=self._timeout_wait_for_pv) self.enable_compression.set(1).wait(timeout=self._timeout_wait_for_pv) else: self.scan_type.set(ScanType.CONTINUOUS).wait(timeout=self._timeout_wait_for_pv) - self.scan_duration.set(self.scan_info.msg.scan_parameters["scan_duration"]).wait( - timeout=self._timeout_wait_for_pv - ) - self.enable_compression.set(self.scan_info.msg.scan_parameters["compression"]).wait( - timeout=self._timeout_wait_for_pv - ) + self.scan_duration.set( + self.scan_info.msg.additional_scan_parameters["scan_duration"] + ).wait(timeout=self._timeout_wait_for_pv) + self.enable_compression.set( + self.scan_info.msg.additional_scan_parameters["compression"] + ).wait(timeout=self._timeout_wait_for_pv) # Stage call to IOC status = CompareStatus(self.state, NidaqState.STAGE) @@ -499,7 +499,7 @@ class Nidaq(PSIDeviceBase, NidaqControl): Args: value (int) : current progress value """ - scan_duration = self.scan_info.msg.scan_parameters.get("scan_duration", None) + scan_duration = self.scan_info.msg.additional_scan_parameters.get("scan_duration", None) if not isinstance(scan_duration, (int, float)): return value = scan_duration - value