diff --git a/common/src/aaredaqlib/models.py b/common/src/aaredaqlib/models.py index 6adef796..dc890f60 100644 --- a/common/src/aaredaqlib/models.py +++ b/common/src/aaredaqlib/models.py @@ -740,4 +740,38 @@ 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 \ No newline at end of file + 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) + angular_range: int = 360 + start_angle: float = 0 + incr_omega_deg:float = 0.2 + d_vis: float = 1.5 + current_temp_k: float = 100 + filename: Optional[str] = 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 \ No newline at end of file