From dafda5adcbf71612ac6f21ae3f7517f97db39678 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 17 Jun 2025 16:16:54 +0200 Subject: [PATCH] GUI: Add detector description and serial number --- common/src/aaredaqlib/diffraction_geometry.py | 3 ++- daq/src/aaredaq/daq.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/src/aaredaqlib/diffraction_geometry.py b/common/src/aaredaqlib/diffraction_geometry.py index c01b0fa9..ffbcead3 100644 --- a/common/src/aaredaqlib/diffraction_geometry.py +++ b/common/src/aaredaqlib/diffraction_geometry.py @@ -9,7 +9,8 @@ class DiffractionGeometry(BaseModel): pixel_size_mm: Annotated[float, Field(ge=0.05, le=0.5)] beam_center_pxl: Tuple[float, float] detector_size_pxl: Tuple[int, int] - + detector_description: str + detector_serial_number: str @property def detector_max_radius_pxl(self): diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index 9337739e..155fdc07 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -750,7 +750,9 @@ class AareDAQ: dtz_mm=self.__devs.dtz.value, detector_size_pxl=(det_cfg.width, det_cfg.height), pixel_size_mm=det_cfg.pixel_size_mm, - beam_center_pxl=self.__cfg.beam_center + beam_center_pxl=self.__cfg.beam_center, + detector_description=det_cfg.description, + detector_serial_number=det_cfg.serial_number ) @property