From a18735824c6bed473a24fe105095a41b0cd18c69 Mon Sep 17 00:00:00 2001 From: appleb_m Date: Thu, 11 Jun 2026 16:14:27 +0200 Subject: [PATCH] devices: ring current (pv to bec) and ernergy (hard code) --- src/aare/daq/devices.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/aare/daq/devices.py b/src/aare/daq/devices.py index 33415a96..ceffcf07 100644 --- a/src/aare/daq/devices.py +++ b/src/aare/daq/devices.py @@ -37,8 +37,6 @@ class BeamlineDevices: logger.debug("initialising BEC worker done") self.__smargon = smargon.Smargon(beamline) - self.__ring_current_pv = PV(f"ARS07-DPCT-0100:CURR") - self.__dtz = MyMotor(f"{BEAMLINE}-ES-DET:TRZ") self.__dty = MyMotor(f"{BEAMLINE}-ES-DET:TRY") @@ -243,11 +241,13 @@ class BeamlineDevices: # Optics @property def energy_kev(self) -> float: + if self._beamline == MXBeamline.X06DA: + return 13.0 return 12.4 @property def ring_current(self) -> float: - return max(0.0, 0.0) + return max(0.0, self.bec_worker.ring_current) @property def flux(self) -> float: