From 5ceebaa8f62f3d6b84834d4c34a101ceaea989eb Mon Sep 17 00:00:00 2001 From: Unknown MX Person Date: Thu, 22 May 2025 13:18:08 +0200 Subject: [PATCH 1/3] fix(auto_update): autoupdate script moved to autoupdate directory --- pxiii_bec/bec_widgets/__init__.py | 2 +- pxiii_bec/bec_widgets/auto_updates/__init__.py | 1 + pxiii_bec/bec_widgets/{ => auto_updates}/auto_updates.py | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename pxiii_bec/bec_widgets/{ => auto_updates}/auto_updates.py (100%) diff --git a/pxiii_bec/bec_widgets/__init__.py b/pxiii_bec/bec_widgets/__init__.py index 3f9a7e4..8b13789 100644 --- a/pxiii_bec/bec_widgets/__init__.py +++ b/pxiii_bec/bec_widgets/__init__.py @@ -1 +1 @@ -from .auto_updates import PlotUpdate + diff --git a/pxiii_bec/bec_widgets/auto_updates/__init__.py b/pxiii_bec/bec_widgets/auto_updates/__init__.py index e69de29..be12001 100644 --- a/pxiii_bec/bec_widgets/auto_updates/__init__.py +++ b/pxiii_bec/bec_widgets/auto_updates/__init__.py @@ -0,0 +1 @@ +from .auto_updates import AutoUpdates \ No newline at end of file diff --git a/pxiii_bec/bec_widgets/auto_updates.py b/pxiii_bec/bec_widgets/auto_updates/auto_updates.py similarity index 100% rename from pxiii_bec/bec_widgets/auto_updates.py rename to pxiii_bec/bec_widgets/auto_updates/auto_updates.py -- 2.49.1 From abaf0867cd78320e59abfe528c8025f3b786d6ad Mon Sep 17 00:00:00 2001 From: Unknown MX Person Date: Thu, 22 May 2025 13:19:33 +0200 Subject: [PATCH 2/3] fix(scan_history): chagned hardcoded simulated devices from PXII to real PXIII devices --- pxiii_bec/bec_widgets/widgets/scan_history/scan_history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pxiii_bec/bec_widgets/widgets/scan_history/scan_history.py b/pxiii_bec/bec_widgets/widgets/scan_history/scan_history.py index 33072f8..8003187 100644 --- a/pxiii_bec/bec_widgets/widgets/scan_history/scan_history.py +++ b/pxiii_bec/bec_widgets/widgets/scan_history/scan_history.py @@ -63,7 +63,7 @@ class ScanHistory(BECWidget, QWidget): icon_options = {"size": (16, 16), "convert_to_pixmap": False} self.components['monitor_combobox'].apply_filter = False - self.components['monitor_combobox'].devices = ['dccm_diode_bottom', 'dccm_diode_top'] + self.components['monitor_combobox'].devices = ['dccm_diode_bottom', 'dccm_diode_top', 'dccm_xbpm', 'ssxbpm', 'xbox_diode'] self.components['history_spin_box'].setMinimum(-10000) self.components['history_spin_box'].setMaximum(-1) -- 2.49.1 From 3e340334cfeea11ad291b80fe506a64430c31d67 Mon Sep 17 00:00:00 2001 From: Unknown MX Person Date: Thu, 22 May 2025 13:19:49 +0200 Subject: [PATCH 3/3] fix(config): reenable some devices --- .../device_configs/x06da_device_config.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pxiii_bec/device_configs/x06da_device_config.yaml b/pxiii_bec/device_configs/x06da_device_config.yaml index 5f2ecb4..762f498 100644 --- a/pxiii_bec/device_configs/x06da_device_config.yaml +++ b/pxiii_bec/device_configs/x06da_device_config.yaml @@ -230,15 +230,15 @@ ssxbpm_try: readoutPriority: monitored readOnly: false softwareTrigger: false -# ssxbpm: -# description: XBPM before secondary source -# deviceClass: ophyd.EpicsSignalRO -# deviceConfig: {read_pv: 'X06DA-ES-SSBPM1:SumAll:MeanValue_RBV'} -# onFailure: buffer -# enabled: true -# readoutPriority: monitored -# readOnly: true -# softwareTrigger: false +ssxbpm: + description: XBPM before secondary source + deviceClass: ophyd.EpicsSignalRO + deviceConfig: {read_pv: 'X06DA-ES-SSBPM1:SumAll:MeanValue_RBV'} + onFailure: buffer + enabled: true + readoutPriority: monitored + readOnly: true + softwareTrigger: false ssslit_trxr: description: Secondary source blade motion deviceClass: ophyd.EpicsMotor -- 2.49.1