Restructure

This commit is contained in:
2026-01-15 15:28:07 +01:00
parent 0044b782ae
commit 2109673d4d
2 changed files with 13 additions and 2 deletions
+2 -2
View File
@@ -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,
+11
View File
@@ -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: