nidaq improvement on_stage

debye_bec/device_configs/x01da_standard_config.yaml

@@ -51,7 +51,7 @@ optics_config:
 ##      Experimental Hutch       ##
 ###################################
 
-## NIDAQ
+# ## NIDAQ
 nidaq:
   readoutPriority: monitored
   description: NIDAQ backend for data reading for debye scans
@@ -67,8 +67,8 @@ xas_config:
   - !include ./x01da_xas.yaml
 
 ## XRD (Pilatus, pinhole, beamstop)
-xrd_config:
-  - !include ./x01da_xrd.yaml
+#xrd_config:
+#  - !include ./x01da_xrd.yaml
 
 # Commented out because too slow
 ## Hutch cameras

debye_bec/devices/nidaq/nidaq.py

@@ -494,7 +494,7 @@ class Nidaq(PSIDeviceBase, NidaqControl):
         super().__init__(name=name, prefix=prefix, scan_info=scan_info, **kwargs)
         self.scan_info: ScanInfo
         self.timeout_wait_for_signal = 5  # put 5s firsts
-        self._timeout_wait_for_pv = 3  # 3s timeout for pv calls
+        self._timeout_wait_for_pv = 5  # 5s timeout for pv calls. editted due to timeout issues persisting 
         self.valid_scan_names = [
             "xas_simple_scan",
             "xas_simple_scan_with_xrd",
@@ -693,7 +693,11 @@ class Nidaq(PSIDeviceBase, NidaqControl):
         # Stage call to IOC
         status = CompareStatus(self.state, NidaqState.STAGE)
         self.cancel_on_stop(status)
-        self.stage_call.set(1).wait(timeout=self._timeout_wait_for_pv)
+        # TODO 11.11.25/HS64
+        # Switched from set to put in the hope to get rid of the rare event where nidaq is stopped at the start of a scan
+        # Problems consistently persisting, testing changing back to set, unconvinced this is the actual cause 14.11.25/AHC
+        # self.stage_call.set(1).wait(timeout=self._timeout_wait_for_pv)
+        self.stage_call.put(1)
         status.wait(timeout=self.timeout_wait_for_signal)
         if self.scan_info.msg.scan_name != "nidaq_continuous_scan":
             status = self.on_kickoff()