From 2109673d4dab1a2b6e925d847f7c7d0d54dea98d Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Thu, 15 Jan 2026 15:28:07 +0100 Subject: [PATCH] Restructure --- src/aare/daq/daq.py | 4 ++-- src/aare/daq/devices.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/aare/daq/daq.py b/src/aare/daq/daq.py index 39e32a0b..a109c82f 100644 --- a/src/aare/daq/daq.py +++ b/src/aare/daq/daq.py @@ -1267,7 +1267,7 @@ class AareDAQ: det_cfg = self.__jfjoch.detector() return DiffractionGeometry( energy_keV=self.__devs.energy_kev, - dtz_mm=self.__devs.dtz.value, + dtz_mm=self.__devs.dtz, detector_size_pxl=(det_cfg.width, det_cfg.height), pixel_size_mm=det_cfg.pixel_size_mm, beam_center_pxl=self.__cfg.beam_center, @@ -1284,7 +1284,7 @@ class AareDAQ: light=self.light, cryojet_K=self.__devs.cryojet_temp, shutter_open=self.__devs.shutter, - exp_shutter_open=self.__devs.exp_shutter.state(), + exp_shutter_open=self.__devs.shutter, flux_ph_s=self.__devs.full_flux, sample_camera=self.__devs.samcam_settings, name=self.__bl, diff --git a/src/aare/daq/devices.py b/src/aare/daq/devices.py index 044b2162..ad6ca291 100644 --- a/src/aare/daq/devices.py +++ b/src/aare/daq/devices.py @@ -27,6 +27,17 @@ class BeamlineDevices: self.__dtz = MyMotor(f"{BEAMLINE}-ES-DET:TRZ1") self.__sample_cam = epicsAD(f"{BEAMLINE}-SAMCAM:") +# Transmission + @property + def transmission(self) -> float: + return 1.0 + def set_transmission(self, value: float, /, wait: bool = True): + pass + + @transmission.setter + def transmission(self, value: float): + self.set_transmission(value, wait=False) + # Lamp light @property def lamp_light(self) -> float: