From 81404facde60adf16e04f78e3875d6cb142eb886 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 30 Sep 2025 09:18:57 +0200 Subject: [PATCH] DAQ: zoom in BL state, work in progress --- common/src/aaredaqlib/models.py | 2 +- daq/src/aaredaq/daq.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/src/aaredaqlib/models.py b/common/src/aaredaqlib/models.py index 1265afc2..8296483a 100644 --- a/common/src/aaredaqlib/models.py +++ b/common/src/aaredaqlib/models.py @@ -499,7 +499,7 @@ class ZoomModel(BaseModel): if zoom_value >= sorted_zooms[-1]: elem = self.z[sorted_zooms[-1]] return SampleCameraSettings(gain=elem.gain, exposure=elem.exposure) - + print('interpolating zoom') for i in range(len(sorted_zooms) - 1): if sorted_zooms[i] <= zoom_value <= sorted_zooms[i + 1]: lower_zoom = sorted_zooms[i] diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index 91e63315..e6fd3fcd 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -103,10 +103,13 @@ class AareDAQ: def zoom(self, val: float): self.__saved_box = None self.__devs.zoom = val + print(f"{self.__cfg.state}") if self.__cfg.state == BeamlineStateEnum.BeamLocation: + print(f"Setting BL zoom {val} {self.__cfg.bl_zoom_settings.get_camera_settings(val)}") self.samcam_settings = self.__cfg.bl_zoom_settings.get_camera_settings(val) - zoom_settings = self.__cfg.zoom_settings.get_camera_settings(val) - print("Setting zoom {val} {zoom_settings}") + else: + zoom_settings = self.__cfg.zoom_settings.get_camera_settings(val) + print(f"Setting zoom {val} {zoom_settings}") self.samcam_settings = zoom_settings #elf.__cfg.state_busy = False