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 40a34af9..5ca021de 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, @@ -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