From f7115acb0856a9fafba9b36d13d31d0c76507e97 Mon Sep 17 00:00:00 2001
From: Filip Leonarski <filip.leonarski@psi.ch>
Date: Mon, 19 May 2025 15:19:33 +0200
Subject: [PATCH] Models: Add shutter open, more logical parameter order

---
 common/src/aaredaqlib/models.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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