From e8bd2f59c6a8377443f700f67629f827c49a5e19 Mon Sep 17 00:00:00 2001 From: David Perl Date: Mon, 31 Aug 2026 13:35:52 +0200 Subject: [PATCH 1/2] fix: adjust gap when changing energy --- src/aare/devices/bec_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aare/devices/bec_worker.py b/src/aare/devices/bec_worker.py index 40a34af9..0d1e71ee 100644 --- a/src/aare/devices/bec_worker.py +++ b/src/aare/devices/bec_worker.py @@ -383,7 +383,7 @@ class BECClientWorker: logger.info(f"Current energy: {current_energy:.1f} eV") logger.info(f"Change energy requested: from {current_energy:.1f} to {value:.1f} eV") try: - self.macros.bl_energy(value, move_gap=False, mono_scan=True, plot=plot) + self.macros.bl_energy(value, move_gap=True, mono_scan=True, plot=plot) except Exception as e: raise self._bec_error( e, -- 2.54.0 From db6b09fa2441b136d5732b96ae880fbda4dfcefa Mon Sep 17 00:00:00 2001 From: David Perl Date: Tue, 1 Sep 2026 11:24:45 +0200 Subject: [PATCH 2/2] fix: cached read from BEC client devices --- src/aare/daq/devices.py | 4 ++-- src/aare/devices/bec_worker.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aare/daq/devices.py b/src/aare/daq/devices.py index 1560286b..c655169d 100644 --- a/src/aare/daq/devices.py +++ b/src/aare/daq/devices.py @@ -275,11 +275,11 @@ class BeamlineDevices: # Detector Z @property def dtz(self) -> float: - return self._dtz.user_setpoint.get() + return self._dtz.user_setpoint.get(cached=True) @property def dty(self) -> float: - return self._dty.user_setpoint.get() + return self._dty.user_setpoint.get(cached=True) @dtz.setter def dtz(self, value: float): diff --git a/src/aare/devices/bec_worker.py b/src/aare/devices/bec_worker.py index 0d1e71ee..5ca021de 100644 --- a/src/aare/devices/bec_worker.py +++ b/src/aare/devices/bec_worker.py @@ -530,7 +530,7 @@ class BECClientWorker: @property def ring_current(self) -> float: try: - return self._ring_current.get() + return self._ring_current.get(cached=True) except (RPCError, ScanRequestError): return 0 -- 2.54.0