diff --git a/common/src/aaredaqlib/models.py b/common/src/aaredaqlib/models.py index 20c899e8..fdca1c25 100644 --- a/common/src/aaredaqlib/models.py +++ b/common/src/aaredaqlib/models.py @@ -135,10 +135,11 @@ class SessionsStateEnum(Enum): class BeamlineStatus(BaseModel): energy_keV: float - detector_distance_mm: float + dtz_mm: float ring_current_mA: float light: Annotated[float, Field(ge=0.0, le=100.0)] cryojet_K: float + shutter_open: bool class SessionStatus(BaseModel): session: SessionsStateEnum = SessionsStateEnum.Vacant @@ -146,10 +147,10 @@ class SessionStatus(BaseModel): staff: bool = False class DAQStatusModel(BaseModel): - state: BeamlineStateEnum - busy: bool geom: SampleGeometryModel bl: BeamlineStatus + state: BeamlineStateEnum + busy: bool sample: SampleShortInfo | None = None session: SessionStatus