From 7556e14e26aba6cee3cc973d2bcf4e197ddc3b27 Mon Sep 17 00:00:00 2001 From: x12sa Date: Tue, 16 Dec 2025 08:20:28 +0100 Subject: [PATCH] fix: mcs card fixes --- csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py index 16e125e..189e0f0 100644 --- a/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py +++ b/csaxs_bec/devices/epics/mcs_card/mcs_card_csaxs.py @@ -108,6 +108,7 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard): self.prescale.set(1).wait(timeout=self._pv_timeout) self.user_led.set(0).wait(timeout=self._pv_timeout) + # Set the input and output modes & polarities self.input_mode.set(INPUTMODE.MODE_3).wait(timeout=self._pv_timeout) self.input_polarity.set(POLARITY.NORMAL).wait(timeout=self._pv_timeout) @@ -178,10 +179,10 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard): if len(self._current_data) == self.NUM_MCA_CHANNELS: # Send out data on multi async signal self.mca.put(self._current_data, acquisition_group=self._acquisition_group) - self._received_updates.clear() + self._current_data.clear() self._current_data_index += 1 - def _progress_update(self, value, **kwargs) -> None: + def _progress_update(self, *args, old_value:any, value:any, **kwargs) -> None: """Callback for progress updates from ophyd subscription on current_channel.""" scan_done = bool(value == self._num_total_triggers) self.progress.put(value=value, max_value=self._num_total_triggers, done=scan_done) @@ -201,7 +202,7 @@ class MCSCardCSAXS(PSIDeviceBase, MCSCard): self.num_use_all.set(triggers).wait(timeout=self._pv_timeout) # Reset data - self._received_updates.clear() + self._current_data.clear() # Reset monitoring of async data emission self._start_monitor_async_data_emission.clear()