From 032dfec906a6d8cbeffd079c330db7e2c0d9b0ce Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 15 Jul 2025 14:46:12 +0200 Subject: [PATCH] DAQ: Handle transmission/dtz null --- daq/src/aaredaq/daq.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index 9eae469f..96c28da6 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -377,7 +377,8 @@ class AareDAQ: def __raster(self, r: RasterGridRequest) -> CompletedRasterGridElem: max_time = r.exp_time_s * r.n_y * r.n_x + 60 - self.__cfg.dtz = r.dtz + if r.dtz is not None: + self.__cfg.dtz = r.dtz self.__set_state(BeamlineStateEnum.DataCollection) save_smargon_position = self.__devs.smargon.readback @@ -390,8 +391,8 @@ class AareDAQ: self.__devs.smargon.target = SmargonCoordinate(sh_mm=r.smargon.sh_mm + delta_mm, phi_deg=r.smargon.phi_deg, chi_deg=r.smargon.chi_deg) - - self.__devs.transmission.set(r.transmission, wait=False) + if r.transmission is not None: + self.__devs.transmission.set(r.transmission, wait=False) self.__devs.aerotech.move(r.omega_deg, wait=True, speed=360.0) self.__devs.transmission.wait() self.__devs.smargon.wait() @@ -437,10 +438,14 @@ class AareDAQ: raise e def __rotation(self, request: RotationScanRequest) -> CompletedRotationScan: - self.__cfg.dtz = request.dtz + if request.dtz is not None: + self.__cfg.dtz = request.dtz + self.__set_state(BeamlineStateEnum.DataCollection) - self.__devs.transmission.set(request.transmission, wait=False) + if request.transmission is not None: + self.__devs.transmission.set(request.transmission, wait=False) + if request.start is not None: self.__devs.smargon.target = request.start