Common: updated simplescanparameters and added in input

common/src/aaredaqlib/models.py

@@ -403,16 +403,6 @@ class SampleShortInfo(BaseModel):
 class SampleShortInfoList(BaseModel):
     s: List[SampleShortInfo]
 
-class SimpleScanParameters(BaseModel):
-    filename: Optional[str] = None
-    dtz: float = 150
-    exp_time_s: float = 0.02
-    start_omega_deg:float = 0
-    incr_omega_deg: float = 0.2
-    steps: int = 1800
-    transmission: Annotated[float, Field(ge=0.0, le=1.0)] = 1.0
-
-
 class BeamMarkCoeffModel(BaseModel):
     """
     Model to calculate beam center for a given zoom level based on a quadratic approximation
@@ -740,4 +730,39 @@ class BeamlineSettingsModel(BaseModel):
 class CryojetSettingsModel(BaseModel):
     cryojet_park_position: float | None = 12.0
     cryojet_measurement_position: float | None = 5.0
-    cryojet_in_use: bool | None = True
+    cryojet_in_use: bool | None = True
+
+class SimpleStrategyInputModel(BaseModel):
+    last_best_res: float | None = None
+    last_best_b_factor: float | None = None
+    crystal_size: CrystalSize = CrystalSize(x=0, y=0, z=0)
+    transmission: Annotated[float, Field(ge=0.0, le=1.0)] = 1.0
+    flux_ph_s: float | None = None
+    flux_ph_s_calc: float | None = None
+    beam_size_x_um: float | None = None
+    beam_size_y_um: float | None = None
+    angular_range: int = 360
+    beam_energy: float | None = None
+
+
+class SimpleScanParameters(BaseModel):
+    filename: Optional[str] = None
+    dtz: float = 150
+    exp_time_s: float = 0.02
+    start_omega_deg:float = 0
+    incr_omega_deg: float = 0.2
+    steps: int = 1800
+    transmission: Annotated[float, Field(ge=0.0, le=1.0)] = 1.0
+    last_best_res: float | None = None
+    last_best_b_factor: float | None = None
+    crystal_size: CrystalSize = CrystalSize(x=0, y=0, z=0)
+    flux_ph_s: float | None = None
+    calculated_dose_Mgy: float | None = None
+    calculated_dose_rate_MGy_s: float | None = None
+    xtal_size_dose_rate_MGy_s: float | None = None
+    target_dose_MGy: float | None = None
+    beam_size_x_um: float | None = None
+    beam_size_y_um: float | None = None
+    dose_rate_MGy_s: float | None = None
+    d_vis: float | None = None
+    d_tar: float | None = None