diff --git a/src/hyperion/external_interaction/callbacks/grid_detection_callback.py b/src/hyperion/external_interaction/callbacks/grid_detection_callback.py index 247aa4960..70d508eed 100644 --- a/src/hyperion/external_interaction/callbacks/grid_detection_callback.py +++ b/src/hyperion/external_interaction/callbacks/grid_detection_callback.py @@ -63,6 +63,7 @@ def event(self, doc: Event): def get_grid_parameters(self) -> GridScanParams: return GridScanParams( + transmission_fraction=0.01, dwell_time_ms=self.exposure_time * 1000, x_start=self.start_positions[0][0], y1_start=self.start_positions[0][1], @@ -80,6 +81,7 @@ def get_grid_parameters(self) -> GridScanParams: def get_panda_grid_parameters(self) -> PandAGridScanParams: return PandAGridScanParams( + transmission_fraction=0.01, run_up_distance_mm=self.run_up_distance_mm, x_start=self.start_positions[0][0], y1_start=self.start_positions[0][1], diff --git a/src/hyperion/parameters/internal_parameters.py b/src/hyperion/parameters/internal_parameters.py index 56d0b1050..3554b5594 100644 --- a/src/hyperion/parameters/internal_parameters.py +++ b/src/hyperion/parameters/internal_parameters.py @@ -73,10 +73,7 @@ def extract_experiment_params_from_flat_dict( experiment_param_class, flat_params: dict[str, Any] ): # Use __fields__ to get inherited attributes from BaseModels - if issubclass(experiment_param_class, BaseModel): - experiment_field_keys = list(experiment_param_class.__fields__.keys()) - else: - experiment_field_keys = list(experiment_param_class.__annotations__.keys()) + experiment_field_keys = list(experiment_param_class.__fields__.keys()) experiment_params_args = fetch_subdict_from_bucket( experiment_field_keys, flat_params diff --git a/src/hyperion/parameters/plan_specific/grid_scan_with_edge_detect_params.py b/src/hyperion/parameters/plan_specific/grid_scan_with_edge_detect_params.py index 96f90e0a8..7eb8263dc 100644 --- a/src/hyperion/parameters/plan_specific/grid_scan_with_edge_detect_params.py +++ b/src/hyperion/parameters/plan_specific/grid_scan_with_edge_detect_params.py @@ -6,7 +6,6 @@ from dodal.devices.detector import TriggerMode from dodal.parameters.experiment_parameter_base import AbstractExperimentWithBeamParams from pydantic import validator -from pydantic.dataclasses import dataclass from hyperion.external_interaction.ispyb.ispyb_dataclass import GridscanIspybParams from hyperion.parameters.internal_parameters import ( @@ -20,7 +19,6 @@ ) -@dataclass class GridScanWithEdgeDetectParams(AbstractExperimentWithBeamParams): """ Holder class for the parameters of a grid scan that uses edge detection to detect the grid. diff --git a/src/hyperion/parameters/plan_specific/pin_centre_then_xray_centre_params.py b/src/hyperion/parameters/plan_specific/pin_centre_then_xray_centre_params.py index 33813cd45..b11ee5634 100644 --- a/src/hyperion/parameters/plan_specific/pin_centre_then_xray_centre_params.py +++ b/src/hyperion/parameters/plan_specific/pin_centre_then_xray_centre_params.py @@ -6,7 +6,6 @@ from dodal.devices.detector import TriggerMode from dodal.parameters.experiment_parameter_base import AbstractExperimentWithBeamParams from pydantic import validator -from pydantic.dataclasses import dataclass from hyperion.external_interaction.ispyb.ispyb_dataclass import GridscanIspybParams from hyperion.parameters.internal_parameters import ( @@ -20,7 +19,6 @@ ) -@dataclass class PinCentreThenXrayCentreParams(AbstractExperimentWithBeamParams): """ Holder class for the parameters of a plan that does a pin centre then xray centre diff --git a/src/hyperion/parameters/plan_specific/rotation_scan_internal_params.py b/src/hyperion/parameters/plan_specific/rotation_scan_internal_params.py index e9eadba32..869a1e962 100644 --- a/src/hyperion/parameters/plan_specific/rotation_scan_internal_params.py +++ b/src/hyperion/parameters/plan_specific/rotation_scan_internal_params.py @@ -7,7 +7,7 @@ from dodal.devices.motors import XYZLimitBundle from dodal.devices.zebra import RotationDirection from dodal.parameters.experiment_parameter_base import AbstractExperimentWithBeamParams -from pydantic import BaseModel, validator +from pydantic import validator from scanspec.core import Path as ScanPath from scanspec.specs import Line @@ -36,7 +36,7 @@ class Config: } -class RotationScanParams(BaseModel, AbstractExperimentWithBeamParams): +class RotationScanParams(AbstractExperimentWithBeamParams): """ Holder class for the parameters of a rotation data collection. """ diff --git a/src/hyperion/parameters/plan_specific/wait_for_robot_load_then_center_params.py b/src/hyperion/parameters/plan_specific/wait_for_robot_load_then_center_params.py index 6bd90beff..2e9d20e2c 100644 --- a/src/hyperion/parameters/plan_specific/wait_for_robot_load_then_center_params.py +++ b/src/hyperion/parameters/plan_specific/wait_for_robot_load_then_center_params.py @@ -4,9 +4,8 @@ import numpy as np from dodal.devices.detector import DetectorParams, TriggerMode -from dodal.parameters.experiment_parameter_base import AbstractExperimentParameterBase +from dodal.parameters.experiment_parameter_base import AbstractExperimentWithBeamParams from pydantic import validator -from pydantic.dataclasses import dataclass from hyperion.external_interaction.ispyb.ispyb_dataclass import ( GRIDSCAN_ISPYB_PARAM_DEFAULTS, @@ -33,8 +32,7 @@ class Config: } -@dataclass -class WaitForRobotLoadThenCentreParams(AbstractExperimentParameterBase): +class WaitForRobotLoadThenCentreParams(AbstractExperimentWithBeamParams): """ Holder class for the parameters of a plan that waits for robot load then does a centre. @@ -56,6 +54,9 @@ class WaitForRobotLoadThenCentreParams(AbstractExperimentParameterBase): # plugin use_ophyd_pin_tip_detect: bool = False + def get_num_images(self): + return 0 + class WaitForRobotLoadThenCentreInternalParameters(InternalParameters): experiment_params: WaitForRobotLoadThenCentreParams diff --git a/src/hyperion/parameters/schemas/experiment_schemas/grid_scan_params_schema.json b/src/hyperion/parameters/schemas/experiment_schemas/grid_scan_params_schema.json index ba4252a8f..3b8c1dd5c 100644 --- a/src/hyperion/parameters/schemas/experiment_schemas/grid_scan_params_schema.json +++ b/src/hyperion/parameters/schemas/experiment_schemas/grid_scan_params_schema.json @@ -47,6 +47,9 @@ "omega_start": { "type": "number" }, + "transmission_fraction": { + "type": "number" + }, "set_stub_offsets": { "type": "boolean" } diff --git a/src/hyperion/parameters/schemas/experiment_schemas/grid_scan_with_edge_detect_params_schema.json b/src/hyperion/parameters/schemas/experiment_schemas/grid_scan_with_edge_detect_params_schema.json index 2aec24ce7..708073d4e 100644 --- a/src/hyperion/parameters/schemas/experiment_schemas/grid_scan_with_edge_detect_params_schema.json +++ b/src/hyperion/parameters/schemas/experiment_schemas/grid_scan_with_edge_detect_params_schema.json @@ -22,8 +22,10 @@ }, "use_panda": { "type": "boolean" + }, + "transmission_fraction": { + "type": "number" } - }, "required": [ "exposure_time", diff --git a/src/hyperion/parameters/schemas/experiment_schemas/panda_grid_scan_params_schema.json b/src/hyperion/parameters/schemas/experiment_schemas/panda_grid_scan_params_schema.json index 00a4efec6..1385deadc 100644 --- a/src/hyperion/parameters/schemas/experiment_schemas/panda_grid_scan_params_schema.json +++ b/src/hyperion/parameters/schemas/experiment_schemas/panda_grid_scan_params_schema.json @@ -47,10 +47,12 @@ "set_stub_offsets": { "type": "boolean" }, + "transmission_fraction": { + "type": "number" + }, "run_up_distance_mm": { "type": "number" } - }, "minProperties": 12, "additionalProperties": false diff --git a/src/hyperion/parameters/schemas/experiment_schemas/rotation_scan_params_schema.json b/src/hyperion/parameters/schemas/experiment_schemas/rotation_scan_params_schema.json index fb0cdcc3d..814bd289b 100644 --- a/src/hyperion/parameters/schemas/experiment_schemas/rotation_scan_params_schema.json +++ b/src/hyperion/parameters/schemas/experiment_schemas/rotation_scan_params_schema.json @@ -61,6 +61,9 @@ }, "shutter_opening_time_s": { "type": "number" + }, + "transmission_fraction": { + "type": "number" } }, "required": [ diff --git a/src/hyperion/parameters/schemas/experiment_schemas/wait_for_robot_load_then_centre_schema.json b/src/hyperion/parameters/schemas/experiment_schemas/wait_for_robot_load_then_centre_schema.json index 702d80f50..baf142d93 100644 --- a/src/hyperion/parameters/schemas/experiment_schemas/wait_for_robot_load_then_centre_schema.json +++ b/src/hyperion/parameters/schemas/experiment_schemas/wait_for_robot_load_then_centre_schema.json @@ -18,12 +18,17 @@ "type": "boolean" }, "requested_energy_kev": { - "type": ["number", "null"] + "type": [ + "number", + "null" + ] }, "use_panda": { "type": "boolean" + }, + "transmission_fraction": { + "type": "number" } - }, "required": [ "exposure_time", diff --git a/src/hyperion/parameters/schemas/full_external_parameters_schema.json b/src/hyperion/parameters/schemas/full_external_parameters_schema.json index a90809f23..b71fb1b44 100644 --- a/src/hyperion/parameters/schemas/full_external_parameters_schema.json +++ b/src/hyperion/parameters/schemas/full_external_parameters_schema.json @@ -3,7 +3,7 @@ "type": "object", "properties": { "params_version": { - "const": "4.0.4" + "const": "5.0.0" }, "hyperion_params": { "type": "object", diff --git a/src/hyperion/parameters/schemas/ispyb_parameters_schema.json b/src/hyperion/parameters/schemas/ispyb_parameters_schema.json index 7dc532e2b..624d6d1a4 100644 --- a/src/hyperion/parameters/schemas/ispyb_parameters_schema.json +++ b/src/hyperion/parameters/schemas/ispyb_parameters_schema.json @@ -45,9 +45,6 @@ "type": "string" } }, - "transmission_fraction": { - "type": "number" - }, "flux": { "type": "number" }, @@ -76,7 +73,10 @@ "type": "number" }, "ispyb_experiment_type": { - "type": ["string", "null"] + "type": [ + "string", + "null" + ] } }, "required": [ @@ -84,7 +84,6 @@ "microns_per_pixel_x", "microns_per_pixel_y", "position", - "transmission_fraction", "flux", "beam_size_x", "beam_size_y", diff --git a/tests/test_data/parameter_json_files/good_test_grid_with_edge_detect_parameters.json b/tests/test_data/parameter_json_files/good_test_grid_with_edge_detect_parameters.json index 47b253028..2996cd0e0 100644 --- a/tests/test_data/parameter_json_files/good_test_grid_with_edge_detect_parameters.json +++ b/tests/test_data/parameter_json_files/good_test_grid_with_edge_detect_parameters.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03S", "insertion_prefix": "SR03S", @@ -23,7 +23,6 @@ 20.0, 30.0 ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -41,6 +40,7 @@ "exposure_time": 0.1, "detector_distance": 100.0, "omega_start": 0.0, - "grid_width_microns": 151 + "grid_width_microns": 151, + "transmission_fraction": 1.0 } } \ No newline at end of file diff --git a/tests/test_data/parameter_json_files/good_test_parameters.json b/tests/test_data/parameter_json_files/good_test_parameters.json index 8a5f0afee..96a856ef5 100644 --- a/tests/test_data/parameter_json_files/good_test_parameters.json +++ b/tests/test_data/parameter_json_files/good_test_parameters.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03S", "insertion_prefix": "SR03S", @@ -43,7 +43,6 @@ "test_2", "test_3" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -70,6 +69,7 @@ "z2_start": 0.0, "exposure_time": 0.1, "detector_distance": 100.0, - "omega_start": 0.0 + "omega_start": 0.0, + "transmission_fraction": 1.0 } } \ No newline at end of file diff --git a/tests/test_data/parameter_json_files/good_test_pin_centre_then_xray_centre_parameters.json b/tests/test_data/parameter_json_files/good_test_pin_centre_then_xray_centre_parameters.json index 43e618692..38446af5c 100644 --- a/tests/test_data/parameter_json_files/good_test_pin_centre_then_xray_centre_parameters.json +++ b/tests/test_data/parameter_json_files/good_test_pin_centre_then_xray_centre_parameters.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03S", "insertion_prefix": "SR03S", @@ -23,7 +23,6 @@ 20.0, 30.0 ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -44,6 +43,7 @@ "tip_offset_microns": 108.9, "grid_width_microns": 290.6, "oav_centring_file": "tests/test_data/test_OAVCentring.json", - "use_ophyd_pin_tip_detect": true + "use_ophyd_pin_tip_detect": true, + "transmission_fraction": 1.0 } } \ No newline at end of file diff --git a/tests/test_data/parameter_json_files/good_test_rotation_scan_parameters.json b/tests/test_data/parameter_json_files/good_test_rotation_scan_parameters.json index 4a67521fb..4ff616a15 100644 --- a/tests/test_data/parameter_json_files/good_test_rotation_scan_parameters.json +++ b/tests/test_data/parameter_json_files/good_test_rotation_scan_parameters.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03S", "insertion_prefix": "SR03S", @@ -43,7 +43,6 @@ "test_2", "test_3" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -62,6 +61,7 @@ "phi_start": 0.0, "chi_start": 0, "x": 1.0, + "transmission_fraction": 1.0, "y": 2.0, "z": 3.0, "exposure_time": 0.1, diff --git a/tests/test_data/parameter_json_files/good_test_rotation_scan_parameters_nomove.json b/tests/test_data/parameter_json_files/good_test_rotation_scan_parameters_nomove.json index 5078bc788..8b021995b 100644 --- a/tests/test_data/parameter_json_files/good_test_rotation_scan_parameters_nomove.json +++ b/tests/test_data/parameter_json_files/good_test_rotation_scan_parameters_nomove.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03S", "insertion_prefix": "SR03S", @@ -43,7 +43,6 @@ "test_2", "test_3" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -56,6 +55,7 @@ } }, "experiment_params": { + "transmission_fraction": 1.0, "rotation_axis": "omega", "rotation_angle": 180.0, "omega_start": 0.0, diff --git a/tests/test_data/parameter_json_files/good_test_stepped_grid_scan_parameters.json b/tests/test_data/parameter_json_files/good_test_stepped_grid_scan_parameters.json index deac5b048..3ee182a2f 100644 --- a/tests/test_data/parameter_json_files/good_test_stepped_grid_scan_parameters.json +++ b/tests/test_data/parameter_json_files/good_test_stepped_grid_scan_parameters.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03S", "insertion_prefix": "SR03S", @@ -44,7 +44,6 @@ "test_2", "test_3" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -60,6 +59,7 @@ "x_steps": 5, "y_steps": 10, "z_steps": 2, + "transmission_fraction": 1.0, "x_step_size": 0.1, "y_step_size": 0.1, "z_step_size": 0.1, diff --git a/tests/test_data/parameter_json_files/good_test_wait_for_robot_load_params.json b/tests/test_data/parameter_json_files/good_test_wait_for_robot_load_params.json index 5a7a848f4..22da026fc 100644 --- a/tests/test_data/parameter_json_files/good_test_wait_for_robot_load_params.json +++ b/tests/test_data/parameter_json_files/good_test_wait_for_robot_load_params.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "zocalo_environment": "artemis", "beamline": "BL03I", @@ -21,7 +21,6 @@ 0, 0 ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 0.1, "beam_size_y": 0.1, @@ -34,6 +33,7 @@ }, "experiment_params": { "omega_start": 0, + "transmission_fraction": 1.0, "exposure_time": 0.004, "detector_distance": 255, "snapshot_dir": "/tmp", diff --git a/tests/test_data/parameter_json_files/good_test_wait_for_robot_load_params_no_energy.json b/tests/test_data/parameter_json_files/good_test_wait_for_robot_load_params_no_energy.json index 516896b4b..fa1f52b6c 100644 --- a/tests/test_data/parameter_json_files/good_test_wait_for_robot_load_params_no_energy.json +++ b/tests/test_data/parameter_json_files/good_test_wait_for_robot_load_params_no_energy.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "zocalo_environment": "artemis", "beamline": "BL03I", @@ -21,7 +21,6 @@ 0, 0 ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 0.1, "beam_size_y": 0.1, @@ -35,6 +34,7 @@ }, "experiment_params": { "omega_start": 0, + "transmission_fraction": 1.0, "exposure_time": 0.004, "detector_distance": 255, "snapshot_dir": "/tmp" diff --git a/tests/test_data/parameter_json_files/live_test_rotation_params.json b/tests/test_data/parameter_json_files/live_test_rotation_params.json index fb2cbdd9f..2262f4424 100644 --- a/tests/test_data/parameter_json_files/live_test_rotation_params.json +++ b/tests/test_data/parameter_json_files/live_test_rotation_params.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03I", "insertion_prefix": "SR03I", @@ -43,7 +43,6 @@ "test_2", "test_3" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -57,6 +56,7 @@ }, "experiment_params": { "rotation_axis": "omega", + "transmission_fraction": 1.0, "rotation_angle": 180.0, "omega_start": 0.0, "exposure_time": 0.01, diff --git a/tests/test_data/parameter_json_files/live_test_rotation_params_move_xyz.json b/tests/test_data/parameter_json_files/live_test_rotation_params_move_xyz.json index a098ba19f..d79547dbb 100644 --- a/tests/test_data/parameter_json_files/live_test_rotation_params_move_xyz.json +++ b/tests/test_data/parameter_json_files/live_test_rotation_params_move_xyz.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03I", "insertion_prefix": "SR03I", @@ -43,7 +43,6 @@ "test_2", "test_3" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -57,6 +56,7 @@ }, "experiment_params": { "rotation_axis": "omega", + "transmission_fraction": 1.0, "rotation_angle": 180.0, "omega_start": 0.0, "phi_start": 0.0, diff --git a/tests/test_data/parameter_json_files/panda_test_parameters.json b/tests/test_data/parameter_json_files/panda_test_parameters.json index 47f14ad8b..df86af6fc 100644 --- a/tests/test_data/parameter_json_files/panda_test_parameters.json +++ b/tests/test_data/parameter_json_files/panda_test_parameters.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03I", "insertion_prefix": "SR03I", @@ -44,7 +44,6 @@ "test_2", "test_3" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -60,6 +59,7 @@ "x_steps": 40, "y_steps": 20, "z_steps": 10, + "transmission_fraction": 1.0, "x_step_size": 0.1, "y_step_size": 0.1, "z_step_size": 0.1, @@ -73,6 +73,5 @@ "exposure_time": 0.1, "set_stub_offsets": true, "run_up_distance_mm": 0.1 - } } \ No newline at end of file diff --git a/tests/test_data/parameter_json_files/system_test_parameter_defaults.json b/tests/test_data/parameter_json_files/system_test_parameter_defaults.json index 4b86897d5..8ec6624cb 100644 --- a/tests/test_data/parameter_json_files/system_test_parameter_defaults.json +++ b/tests/test_data/parameter_json_files/system_test_parameter_defaults.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "zocalo_environment": "dev_artemis", "beamline": "BL03S", @@ -37,7 +37,6 @@ "test_2_z", "test_3_z" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 0.1, "beam_size_y": 0.1, @@ -54,6 +53,7 @@ } }, "experiment_params": { + "transmission_fraction": 1.0, "x_steps": 40, "y_steps": 20, "z_steps": 10, diff --git a/tests/test_data/parameter_json_files/test_internal_parameter_defaults.json b/tests/test_data/parameter_json_files/test_internal_parameter_defaults.json index d1f1fb2f1..d3be58d22 100644 --- a/tests/test_data/parameter_json_files/test_internal_parameter_defaults.json +++ b/tests/test_data/parameter_json_files/test_internal_parameter_defaults.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "zocalo_environment": "dev_artemis", "beamline": "BL03S", @@ -38,7 +38,6 @@ "test_2_z", "test_3_z" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 0.1, "beam_size_y": 0.1, @@ -55,6 +54,7 @@ } }, "experiment_params": { + "transmission_fraction": 1.0, "x_steps": 40, "y_steps": 20, "z_steps": 10, diff --git a/tests/test_data/parameter_json_files/test_parameter_defaults.json b/tests/test_data/parameter_json_files/test_parameter_defaults.json index 3b503de0f..8c2e48a2e 100644 --- a/tests/test_data/parameter_json_files/test_parameter_defaults.json +++ b/tests/test_data/parameter_json_files/test_parameter_defaults.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "zocalo_environment": "dev_artemis", "beamline": "BL03S", @@ -37,7 +37,6 @@ "test_2_z", "test_3_z" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 0.1, "beam_size_y": 0.1, @@ -54,6 +53,7 @@ } }, "experiment_params": { + "transmission_fraction": 1.0, "x_steps": 40, "y_steps": 20, "z_steps": 10, diff --git a/tests/test_data/parameter_json_files/test_parameter_defaults_2d.json b/tests/test_data/parameter_json_files/test_parameter_defaults_2d.json index 73c95edb5..85489d6bc 100644 --- a/tests/test_data/parameter_json_files/test_parameter_defaults_2d.json +++ b/tests/test_data/parameter_json_files/test_parameter_defaults_2d.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "zocalo_environment": "dev_artemis", "beamline": "BL03S", @@ -37,7 +37,6 @@ "test_2_z", "test_3_z" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 0.1, "beam_size_y": 0.1, @@ -54,6 +53,7 @@ } }, "experiment_params": { + "transmission_fraction": 1.0, "x_steps": 40, "y_steps": 20, "z_steps": 0, diff --git a/tests/test_data/parameter_json_files/test_parameters.json b/tests/test_data/parameter_json_files/test_parameters.json index 8a5f0afee..8b1822450 100644 --- a/tests/test_data/parameter_json_files/test_parameters.json +++ b/tests/test_data/parameter_json_files/test_parameters.json @@ -1,5 +1,5 @@ { - "params_version": "4.0.4", + "params_version": "5.0.0", "hyperion_params": { "beamline": "BL03S", "insertion_prefix": "SR03S", @@ -43,7 +43,6 @@ "test_2", "test_3" ], - "transmission_fraction": 1.0, "flux": 10.0, "beam_size_x": 1.0, "beam_size_y": 1.0, @@ -56,6 +55,7 @@ } }, "experiment_params": { + "transmission_fraction": 1.0, "x_steps": 5, "y_steps": 10, "z_steps": 2, diff --git a/tests/unit_tests/device_setup_plans/test_setup_panda.py b/tests/unit_tests/device_setup_plans/test_setup_panda.py index 53c7ecb2e..20cd84dfe 100644 --- a/tests/unit_tests/device_setup_plans/test_setup_panda.py +++ b/tests/unit_tests/device_setup_plans/test_setup_panda.py @@ -43,7 +43,13 @@ def count_commands(msg): smargon_speed = get_smargon_speed(0.1, 1) sim.simulate_plan( setup_panda_for_flyscan( - mock_panda, "path", PandAGridScanParams(), 1, 1, 1, smargon_speed + mock_panda, + "path", + PandAGridScanParams(transmission_fraction=0.01), + 1, + 1, + 1, + smargon_speed, ) ) elif plan == "disarm": @@ -102,6 +108,7 @@ def test_setup_panda_correctly_configures_table( x_step_size=x_step_size, x_start=x_start, run_up_distance_mm=run_up_distance_mm, + transmission_fraction=0.01, ) exposure_distance_mm = int(sample_velocity_mm_per_s * exposure_time_s) diff --git a/tests/unit_tests/experiment_plans/test_experiment_registry.py b/tests/unit_tests/experiment_plans/test_experiment_registry.py index 4cb7fc4db..bc460399f 100644 --- a/tests/unit_tests/experiment_plans/test_experiment_registry.py +++ b/tests/unit_tests/experiment_plans/test_experiment_registry.py @@ -1,4 +1,4 @@ -from dodal.parameters.experiment_parameter_base import AbstractExperimentWithBeamParams +from dodal.parameters.experiment_parameter_base import AbstractExperimentParameterBase from hyperion.experiment_plans.experiment_registry import PLAN_REGISTRY, do_nothing from hyperion.parameters.internal_parameters import InternalParameters @@ -8,7 +8,7 @@ def test_experiment_registry_param_types(): for plan in PLAN_REGISTRY.keys(): assert issubclass( PLAN_REGISTRY[plan]["experiment_param_type"], - AbstractExperimentWithBeamParams, + AbstractExperimentParameterBase, ) assert issubclass( PLAN_REGISTRY[plan]["internal_param_type"], InternalParameters diff --git a/tests/unit_tests/experiment_plans/test_pin_centre_then_xray_centre_plan.py b/tests/unit_tests/experiment_plans/test_pin_centre_then_xray_centre_plan.py index 82c116465..989796f7a 100644 --- a/tests/unit_tests/experiment_plans/test_pin_centre_then_xray_centre_plan.py +++ b/tests/unit_tests/experiment_plans/test_pin_centre_then_xray_centre_plan.py @@ -95,7 +95,6 @@ def test_when_pin_centre_xray_centre_called_then_detector_positioned( test_config_files, sim_run_engine, ): - mock_oav_callback.return_value.out_upper_left = [[1, 3], [3, 4]] mock_oav_callback.return_value.snapshot_filenames = [ ["1.png", "2.png", "3.png"], @@ -103,6 +102,7 @@ def test_when_pin_centre_xray_centre_called_then_detector_positioned( ["1.png", "2.png", "3.png"], ] mock_grid_callback.return_value.get_grid_parameters.return_value = GridScanParams( + transmission_fraction=0.01, dwell_time_ms=0, x_start=0, y1_start=0, diff --git a/tests/unit_tests/experiment_plans/test_wait_for_robot_load_then_centre.py b/tests/unit_tests/experiment_plans/test_wait_for_robot_load_then_centre.py index bb1baf6c8..62529e18e 100644 --- a/tests/unit_tests/experiment_plans/test_wait_for_robot_load_then_centre.py +++ b/tests/unit_tests/experiment_plans/test_wait_for_robot_load_then_centre.py @@ -81,7 +81,8 @@ def test_when_plan_run_then_centring_plan_run_with_expected_parameters( assert params_passed.hyperion_params.detector_params.expected_energy_ev == 11100 assert params_passed.hyperion_params.ispyb_params.current_energy_ev == 11105 assert isclose( - params_passed.hyperion_params.ispyb_params.resolution, 2.11338 # type: ignore + params_passed.hyperion_params.ispyb_params.resolution, + 2.11338, # type: ignore ) diff --git a/tests/unit_tests/parameters/plan_specific/test_rotation_internal_parameters.py b/tests/unit_tests/parameters/plan_specific/test_rotation_internal_parameters.py index bfceb1de1..1c500f033 100644 --- a/tests/unit_tests/parameters/plan_specific/test_rotation_internal_parameters.py +++ b/tests/unit_tests/parameters/plan_specific/test_rotation_internal_parameters.py @@ -14,6 +14,7 @@ def test_rotation_scan_param_validity(): test_params = RotationScanParams( + transmission_fraction=0.01, rotation_axis="omega", rotation_angle=360, image_width=0.1, diff --git a/tests/unit_tests/parameters/test_schema_validation.py b/tests/unit_tests/parameters/test_schema_validation.py index af2cf0622..20d2677cf 100644 --- a/tests/unit_tests/parameters/test_schema_validation.py +++ b/tests/unit_tests/parameters/test_schema_validation.py @@ -65,7 +65,7 @@ def test_good_params_gridparams_validates(): def test_serialised_grid_scan_params_validate(): - params = GridScanParams() + params = GridScanParams(transmission_fraction=0.01) json_params = params.json() jsonschema.validate(json.loads(json_params), grid_scan_schema, resolver=resolver)