From 3c7ae33b804ef2b476d793e3eb44dfd54dde9f70 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 17 Jun 2025 16:22:36 +0200 Subject: [PATCH] GUI: Add beamline name to BeamlineStatus --- common/src/aaredaqlib/models.py | 1 + daq/src/aaredaq/daq.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/aaredaqlib/models.py b/common/src/aaredaqlib/models.py index 5a1861d0..9511c1a4 100644 --- a/common/src/aaredaqlib/models.py +++ b/common/src/aaredaqlib/models.py @@ -146,6 +146,7 @@ class AutofocusSettings(BaseModel): z_steps: int class BeamlineStatus(BaseModel): + name: str ring_current_mA: float light: Annotated[float, Field(ge=0.0, le=100.0)] cryojet_K: float diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index 155fdc07..02ae93ed 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -47,6 +47,7 @@ class AareDAQ: self.__devs = BeamlineDevices(bl) self.__mlbox = MlBox() self.__jfjoch = JFJochWrapper(bl) + self.__bl = bl.value.upper() @property def state(self) -> BeamlineStateEnum: @@ -763,7 +764,8 @@ class AareDAQ: cryojet_K=self.__devs.cryojet_temp, shutter_open=self.__devs.shutter, flux_ph_s=3.0e12, - sample_camera=self.__devs.samcam_settings + sample_camera=self.__devs.samcam_settings, + name=self.__bl ) @property