mx-bluesky 1.1.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

mx_bluesky/hyperion/parameters/components.py

@@ -1,253 +1,12 @@
 from __future__ import annotations
 
-import datetime
-import json
-from abc import abstractmethod
-from collections.abc import Sequence
-from enum import StrEnum
-from pathlib import Path
-from typing import SupportsInt, TypeVar
-
-from dodal.devices.aperturescatterguard import ApertureValue
-from dodal.devices.detector import (
-    DetectorParams,
-    TriggerMode,
-)
 from pydantic import (
     BaseModel,
-    ConfigDict,
     Field,
-    field_serializer,
-    field_validator,
-    model_validator,
 )
-from scanspec.core import AxesPoints
-from semver import Version
 
 from mx_bluesky.hyperion.external_interaction.config_server import FeatureFlags
-from mx_bluesky.hyperion.parameters.constants import CONST
-
-T = TypeVar("T")
-
-
-class ParameterVersion(Version):
-    @classmethod
-    def _parse(cls, version):
-        if isinstance(version, cls):
-            return version
-        return cls.parse(version)
-
-
-PARAMETER_VERSION = ParameterVersion.parse("5.1.0")
-
-
-class RotationAxis(StrEnum):
-    OMEGA = "omega"
-    PHI = "phi"
-    CHI = "chi"
-    KAPPA = "kappa"
-
-
-class XyzAxis(StrEnum):
-    X = "sam_x"
-    Y = "sam_y"
-    Z = "sam_z"
-
 
-class IspybExperimentType(StrEnum):
-    # Enum values from ispyb column data type
-    SAD = "SAD"  # at or slightly above the peak
-    SAD_INVERSE_BEAM = "SAD - Inverse Beam"
-    OSC = "OSC"  # "native" (in the absence of a heavy atom)
-    COLLECT_MULTIWEDGE = (
-        "Collect - Multiwedge"  # "poorly determined" ~ EDNA complex strategy???
-    )
-    MAD = "MAD"
-    HELICAL = "Helical"
-    MULTI_POSITIONAL = "Multi-positional"
-    MESH = "Mesh"
-    BURN = "Burn"
-    MAD_INVERSE_BEAM = "MAD - Inverse Beam"
-    CHARACTERIZATION = "Characterization"
-    DEHYDRATION = "Dehydration"
-    TOMO = "tomo"
-    EXPERIMENT = "experiment"
-    EM = "EM"
-    PDF = "PDF"
-    PDF_BRAGG = "PDF+Bragg"
-    BRAGG = "Bragg"
-    SINGLE_PARTICLE = "single particle"
-    SERIAL_FIXED = "Serial Fixed"
-    SERIAL_JET = "Serial Jet"
-    STANDARD = "Standard"  # Routine structure determination experiment
-    TIME_RESOLVED = "Time Resolved"  # Investigate the change of a system over time
-    DLS_ANVIL_HP = "Diamond Anvil High Pressure"  # HP sample environment pressure cell
-    CUSTOM = "Custom"  # Special or non-standard data collection
-    XRF_MAP = "XRF map"
-    ENERGY_SCAN = "Energy scan"
-    XRF_SPECTRUM = "XRF spectrum"
-    XRF_MAP_XAS = "XRF map xas"
-    MESH_3D = "Mesh3D"
-    SCREENING = "Screening"
-    STILL = "Still"
-    SSX_CHIP = "SSX-Chip"
-    SSX_JET = "SSX-Jet"
-
-    # Aliases for historic hyperion experiment type mapping
-    ROTATION = "SAD"
-    GRIDSCAN_2D = "mesh"
-    GRIDSCAN_3D = "Mesh3D"
-
-
-class HyperionParameters(BaseModel):
-    model_config = ConfigDict(
-        arbitrary_types_allowed=True,
-        extra="allow",
-    )
-
-    def __hash__(self) -> int:
-        return self.json().__hash__()
 
+class WithFeatures(BaseModel):
     features: FeatureFlags = Field(default=FeatureFlags())
-    parameter_model_version: ParameterVersion
-
-    @field_serializer("parameter_model_version")
-    def serialize_parameter_version(self, version: ParameterVersion):
-        return str(version)
-
-    @field_validator("parameter_model_version", mode="before")
-    @classmethod
-    def _validate_version(cls, version_str: str):
-        version = ParameterVersion.parse(version_str)
-        assert (
-            version >= ParameterVersion(major=PARAMETER_VERSION.major)
-        ), f"Parameter version too old! This version of hyperion uses {PARAMETER_VERSION}"
-        assert (
-            version <= ParameterVersion(major=PARAMETER_VERSION.major + 1)
-        ), f"Parameter version too new! This version of hyperion uses {PARAMETER_VERSION}"
-        return version
-
-    @classmethod
-    def from_json(cls, input: str | None):
-        assert input is not None
-        return cls(**json.loads(input))
-
-
-class WithSnapshot(BaseModel):
-    snapshot_directory: Path
-    snapshot_omegas_deg: list[float] | None = None
-
-    @property
-    def take_snapshots(self) -> bool:
-        return bool(self.snapshot_omegas_deg)
-
-
-class DiffractionExperiment(HyperionParameters, WithSnapshot):
-    """For all experiments which use beam"""
-
-    visit: str = Field(min_length=1)
-    file_name: str
-    exposure_time_s: float = Field(gt=0)
-    comment: str = Field(default="")
-    beamline: str = Field(default=CONST.I03.BEAMLINE, pattern=r"BL\d{2}[BIJS]")
-    insertion_prefix: str = Field(
-        default=CONST.I03.INSERTION_PREFIX, pattern=r"SR\d{2}[BIJS]"
-    )
-    det_dist_to_beam_converter_path: str = Field(
-        default=CONST.PARAM.DETECTOR.BEAM_XY_LUT_PATH
-    )
-    zocalo_environment: str = Field(default=CONST.ZOCALO_ENV)
-    trigger_mode: TriggerMode = Field(default=TriggerMode.FREE_RUN)
-    detector_distance_mm: float | None = Field(default=None, gt=0)
-    demand_energy_ev: float | None = Field(default=None, gt=0)
-    run_number: int | None = Field(default=None, ge=0)
-    selected_aperture: ApertureValue | None = Field(default=None)
-    transmission_frac: float = Field(default=0.1)
-    ispyb_experiment_type: IspybExperimentType
-    storage_directory: str
-
-    @model_validator(mode="before")
-    @classmethod
-    def validate_snapshot_directory(cls, values):
-        snapshot_dir = values.get(
-            "snapshot_directory", Path(values["storage_directory"], "snapshots")
-        )
-        values["snapshot_directory"] = (
-            snapshot_dir if isinstance(snapshot_dir, Path) else Path(snapshot_dir)
-        )
-        return values
-
-    @property
-    def visit_directory(self) -> Path:
-        return (
-            Path(CONST.I03.BASE_DATA_DIR) / str(datetime.date.today().year) / self.visit
-        )
-
-    @property
-    def num_images(self) -> int:
-        return 0
-
-    @property
-    @abstractmethod
-    def detector_params(self) -> DetectorParams: ...
-
-
-class WithScan(BaseModel):
-    """For experiments where the scan is known"""
-
-    @property
-    @abstractmethod
-    def scan_points(self) -> AxesPoints: ...
-
-    @property
-    @abstractmethod
-    def num_images(self) -> int: ...
-
-
-class SplitScan(BaseModel):
-    @property
-    @abstractmethod
-    def scan_indices(self) -> Sequence[SupportsInt]:
-        """Should return the first index of each scan (i.e. for each nexus file)"""
-        ...
-
-
-class WithSample(BaseModel):
-    sample_id: int
-    sample_puck: int | None = None
-    sample_pin: int | None = None
-
-
-class DiffractionExperimentWithSample(DiffractionExperiment, WithSample): ...
-
-
-class WithOavCentring(BaseModel):
-    oav_centring_file: str = Field(default=CONST.I03.OAV_CENTRING_FILE)
-
-
-class OptionalXyzStarts(BaseModel):
-    x_start_um: float | None = None
-    y_start_um: float | None = None
-    z_start_um: float | None = None
-
-
-class XyzStarts(BaseModel):
-    x_start_um: float
-    y_start_um: float
-    z_start_um: float
-
-    def _start_for_axis(self, axis: XyzAxis) -> float:
-        match axis:
-            case XyzAxis.X:
-                return self.x_start_um
-            case XyzAxis.Y:
-                return self.y_start_um
-            case XyzAxis.Z:
-                return self.z_start_um
-
-
-class OptionalGonioAngleStarts(BaseModel):
-    omega_start_deg: float | None = None
-    phi_start_deg: float | None = None
-    chi_start_deg: float | None = None
-    kappa_start_deg: float | None = None

mx_bluesky/hyperion/parameters/constants.py

@@ -1,107 +1,21 @@
 import os
-from enum import Enum
 
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector import EIGER2_X_16M_SIZE
 from pydantic.dataclasses import dataclass
 
-TEST_MODE = os.environ.get("HYPERION_TEST_MODE")
-
-
-@dataclass(frozen=True)
-class SimConstants:
-    BEAMLINE = "BL03S"
-    INSERTION_PREFIX = "SR03S"
-    ZOCALO_ENV = "dev_artemis"
-    # this one is for unit tests
-    ISPYB_CONFIG = "tests/test_data/test_config.cfg"
-    # this one is for system tests
-    DEV_ISPYB_DATABASE_CFG = "/dls_sw/dasc/mariadb/credentials/ispyb-hyperion-dev.cfg"
-
-
-@dataclass(frozen=True)
-class PlanNameConstants:
-    # Robot load subplan
-    ROBOT_LOAD = "robot_load"
-    # Gridscan
-    GRID_DETECT_AND_DO_GRIDSCAN = "grid_detect_and_do_gridscan"
-    GRID_DETECT_INNER = "grid_detect"
-    GRIDSCAN_OUTER = "run_gridscan_move_and_tidy"
-    GRIDSCAN_AND_MOVE = "run_gridscan_and_move"
-    GRIDSCAN_MAIN = "run_gridscan"
-    DO_FGS = "do_fgs"
-    # Rotation scan
-    ROTATION_MULTI = "multi_rotation_wrapper"
-    ROTATION_OUTER = "rotation_scan_with_cleanup"
-    ROTATION_MAIN = "rotation_scan_main"
-
-
-@dataclass(frozen=True)
-class PlanGroupCheckpointConstants:
-    # For places to synchronise / stop and wait in plans, use as bluesky group names
-    GRID_READY_FOR_DC = "grid_ready_for_data_collection"
-    ROTATION_READY_FOR_DC = "rotation_ready_for_data_collection"
-    MOVE_GONIO_TO_START = "move_gonio_to_start"
-    READY_FOR_OAV = "ready_for_oav"
-
-
-@dataclass(frozen=True)
-class DocDescriptorNames:
-    # Robot load event descriptor
-    ROBOT_LOAD = "robot_load"
-    # For callbacks to use
-    OAV_ROTATION_SNAPSHOT_TRIGGERED = "rotation_snapshot_triggered"
-    OAV_GRID_SNAPSHOT_TRIGGERED = "snapshot_to_ispyb"
-    HARDWARE_READ_PRE = "read_hardware_for_callbacks_pre_collection"
-    HARDWARE_READ_DURING = "read_hardware_for_callbacks_during_collection"
-    ZOCALO_HW_READ = "zocalo_read_hardware_plan"
-
-
-@dataclass(frozen=True)
-class HardwareConstants:
-    OAV_REFRESH_DELAY = 0.3
-    PANDA_FGS_RUN_UP_DEFAULT = 0.17
-    CRYOJET_MARGIN_MM = 0.2
-
-
-@dataclass(frozen=True)
-class TriggerConstants:
-    ZOCALO = "trigger_zocalo_on"
-
-
-@dataclass(frozen=True)
-class GridscanParamConstants:
-    WIDTH_UM = 600.0
-    EXPOSURE_TIME_S = 0.004
-    USE_ROI = True
-    BOX_WIDTH_UM = 20.0
-    OMEGA_1 = 0.0
-    OMEGA_2 = 90.0
-
-
-@dataclass(frozen=True)
-class RotationParamConstants:
-    DEFAULT_APERTURE_POSITION = ApertureValue.LARGE
-
+from mx_bluesky.common.parameters.constants import (
+    DocDescriptorNames,
+    EnvironmentConstants,
+    ExperimentParamConstants,
+    HardwareConstants,
+    OavConstants,
+    PlanGroupCheckpointConstants,
+    PlanNameConstants,
+    SimConstants,
+    TriggerConstants,
+)
 
-@dataclass(frozen=True)
-class DetectorParamConstants:
-    BEAM_XY_LUT_PATH = (
-        "tests/test_data/test_det_dist_converter.txt"
-        if TEST_MODE
-        else "/dls_sw/i03/software/daq_configuration/lookup/DetDistToBeamXYConverter.txt"
-    )
-
-
-@dataclass(frozen=True)
-class ExperimentParamConstants:
-    DETECTOR = DetectorParamConstants()
-    GRIDSCAN = GridscanParamConstants()
-    ROTATION = RotationParamConstants()
-
-
-_test_oav_file = "tests/test_data/test_OAVCentring.json"
-_live_oav_file = "/dls_sw/i03/software/daq_configuration/json/OAVCentring_hyperion.json"
+TEST_MODE = os.environ.get("HYPERION_TEST_MODE")
 
 
 @dataclass(frozen=True)
@@ -110,16 +24,22 @@ class I03Constants:
     BEAMLINE = "BL03S" if TEST_MODE else "BL03I"
     DETECTOR = EIGER2_X_16M_SIZE
     INSERTION_PREFIX = "SR03S" if TEST_MODE else "SR03I"
-    OAV_CENTRING_FILE = _test_oav_file if TEST_MODE else _live_oav_file
+    OAV_CENTRING_FILE = OavConstants.OAV_CONFIG_JSON
     SHUTTER_TIME_S = 0.06
     USE_PANDA_FOR_GRIDSCAN = False
-    USE_GPU_FOR_GRIDSCAN_ANALYSIS = False
     THAWING_TIME = 20
-    USE_CPU_AND_GPU_ZOCALO = False
+    SET_STUB_OFFSETS = False
+
+    # Turns on GPU processing for zocalo and logs a comparison between GPU and CPU-
+    # processed results. GPU results never used in analysis for now
+    COMPARE_CPU_AND_GPU_ZOCALO = False
 
 
 @dataclass(frozen=True)
 class HyperionConstants:
+    DESCRIPTORS = DocDescriptorNames()
+    TRIGGER = TriggerConstants()
+    ZOCALO_ENV = EnvironmentConstants.ZOCALO_ENV
     HARDWARE = HardwareConstants()
     I03 = I03Constants()
     PARAM = ExperimentParamConstants()
@@ -136,23 +56,7 @@ class HyperionConstants:
     )
     GRAYLOG_PORT = 12232
     PARAMETER_SCHEMA_DIRECTORY = "src/hyperion/parameters/schemas/"
-    ZOCALO_ENV = "dev_artemis" if TEST_MODE else "artemis"
+    LOG_FILE_NAME = "hyperion.log"
 
 
 CONST = HyperionConstants()
-
-
-class Actions(Enum):
-    START = "start"
-    STOP = "stop"
-    SHUTDOWN = "shutdown"
-    STATUS = "status"
-
-
-class Status(Enum):
-    WARN = "Warn"
-    FAILED = "Failed"
-    SUCCESS = "Success"
-    BUSY = "Busy"
-    ABORTING = "Aborting"
-    IDLE = "Idle"

mx_bluesky/hyperion/parameters/gridscan.py

@@ -14,30 +14,35 @@ from pydantic import Field, PrivateAttr
 from scanspec.core import Path as ScanPath
 from scanspec.specs import Line, Static
 
-from mx_bluesky.hyperion.parameters.components import (
+from mx_bluesky.common.parameters.components import (
     DiffractionExperimentWithSample,
     IspybExperimentType,
     OptionalGonioAngleStarts,
     SplitScan,
-    WithOavCentring,
+    WithOptionalEnergyChange,
     WithScan,
     XyzStarts,
 )
+from mx_bluesky.common.parameters.constants import GridscanParamConstants
+from mx_bluesky.hyperion.parameters.components import WithFeatures
 from mx_bluesky.hyperion.parameters.constants import CONST, I03Constants
+from mx_bluesky.hyperion.parameters.robot_load import RobotLoadAndEnergyChange
 
 
+# This will be restructed once Once https://github.com/DiamondLightSource/mx-bluesky/issues/323#issue-2500957290 is further along
+# to handle slightly different parameters between different beamline implementations
 class GridCommon(
-    DiffractionExperimentWithSample, OptionalGonioAngleStarts, WithOavCentring
+    DiffractionExperimentWithSample,
+    OptionalGonioAngleStarts,
+    WithFeatures,
 ):
     grid_width_um: float = Field(default=CONST.PARAM.GRIDSCAN.WIDTH_UM)
     exposure_time_s: float = Field(default=CONST.PARAM.GRIDSCAN.EXPOSURE_TIME_S)
     use_roi_mode: bool = Field(default=CONST.PARAM.GRIDSCAN.USE_ROI)
     panda_runup_distance_mm: float = Field(
-        default=CONST.HARDWARE.PANDA_FGS_RUN_UP_DEFAULT
+        default=GridscanParamConstants.PANDA_RUN_UP_DISTANCE_MM
     )
-    use_panda: bool = Field(default=CONST.I03.USE_PANDA_FOR_GRIDSCAN)
-    use_gpu: bool = Field(default=CONST.I03.USE_GPU_FOR_GRIDSCAN_ANALYSIS)
-    use_cpu_and_gpu_zocalo: bool = Field(default=CONST.I03.USE_CPU_AND_GPU_ZOCALO)
+
     ispyb_experiment_type: IspybExperimentType = Field(
         default=IspybExperimentType.GRIDSCAN_3D
     )
@@ -70,12 +75,13 @@ class GridCommon(
             use_roi_mode=self.use_roi_mode,
             det_dist_to_beam_converter_path=self.det_dist_to_beam_converter_path,
             trigger_mode=self.trigger_mode,
-            enable_dev_shm=self.use_gpu,
+            enable_dev_shm=self.features.compare_cpu_and_gpu_zocalo,
             **optional_args,
         )
 
 
-class GridScanWithEdgeDetect(GridCommon): ...
+class GridScanWithEdgeDetect(GridCommon):
+    box_size_um: float = Field(default=CONST.PARAM.GRIDSCAN.BOX_WIDTH_UM)
 
 
 class PinTipCentreThenXrayCentre(GridCommon):
@@ -85,6 +91,10 @@ class PinTipCentreThenXrayCentre(GridCommon):
 class RobotLoadThenCentre(GridCommon):
     thawing_time: float = Field(default=CONST.I03.THAWING_TIME)
 
+    def robot_load_params(self):
+        my_params = self.model_dump()
+        return RobotLoadAndEnergyChange(**my_params)
+
     def pin_centre_then_xray_centre_params(self):
         my_params = self.model_dump()
         del my_params["thawing_time"]
@@ -99,11 +109,10 @@ class SpecifiedGridScan(GridCommon, XyzStarts, WithScan):
     ...
 
 
-class ThreeDGridScan(SpecifiedGridScan, SplitScan):
+class ThreeDGridScan(SpecifiedGridScan, SplitScan, WithOptionalEnergyChange):
     """Parameters representing a so-called 3D grid scan, which consists of doing a
     gridscan in X and Y, followed by one in X and Z."""
 
-    demand_energy_ev: float | None = Field(default=None)
     grid1_omega_deg: float = Field(default=CONST.PARAM.GRIDSCAN.OMEGA_1)  # type: ignore
     grid2_omega_deg: float = Field(default=CONST.PARAM.GRIDSCAN.OMEGA_2)
     x_step_size_um: float = Field(default=CONST.PARAM.GRIDSCAN.BOX_WIDTH_UM)

mx_bluesky/hyperion/parameters/load_centre_collect.py

@@ -0,0 +1,50 @@
+from typing import TypeVar
+
+from pydantic import BaseModel, model_validator
+
+from mx_bluesky.common.parameters.components import (
+    MxBlueskyParameters,
+    WithSample,
+    WithVisit,
+)
+from mx_bluesky.hyperion.parameters.gridscan import (
+    RobotLoadThenCentre,
+)
+from mx_bluesky.hyperion.parameters.rotation import MultiRotationScan
+
+T = TypeVar("T", bound=BaseModel)
+
+
+def construct_from_values(parent_context: dict, key: str, t: type[T]) -> T:
+    values = dict(parent_context)
+    values |= values[key]
+    return t(**values)
+
+
+class LoadCentreCollect(MxBlueskyParameters, WithVisit, WithSample):
+    """Experiment parameters to perform the combined robot load,
+    pin-tip centre and rotation scan operations."""
+
+    robot_load_then_centre: RobotLoadThenCentre
+    multi_rotation_scan: MultiRotationScan
+
+    @model_validator(mode="before")
+    @classmethod
+    def validate_model(cls, values):
+        allowed_keys = (
+            LoadCentreCollect.model_fields.keys()
+            | RobotLoadThenCentre.model_fields.keys()
+            | MultiRotationScan.model_fields.keys()
+        )
+        disallowed_keys = values.keys() - allowed_keys
+        assert (
+            disallowed_keys == set()
+        ), f"Unexpected fields found in LoadCentreCollect {disallowed_keys}"
+
+        values["robot_load_then_centre"] = construct_from_values(
+            values, "robot_load_then_centre", RobotLoadThenCentre
+        )
+        values["multi_rotation_scan"] = construct_from_values(
+            values, "multi_rotation_scan", MultiRotationScan
+        )
+        return values

mx_bluesky/hyperion/parameters/robot_load.py

@@ -0,0 +1,16 @@
+from pydantic import Field
+
+from mx_bluesky.common.parameters.components import (
+    MxBlueskyParameters,
+    WithOptionalEnergyChange,
+    WithSample,
+    WithSnapshot,
+    WithVisit,
+)
+from mx_bluesky.hyperion.parameters.constants import CONST
+
+
+class RobotLoadAndEnergyChange(
+    MxBlueskyParameters, WithSample, WithSnapshot, WithOptionalEnergyChange, WithVisit
+):
+    thawing_time: float = Field(default=CONST.I03.THAWING_TIME)

mx_bluesky/hyperion/parameters/rotation.py

@@ -17,7 +17,7 @@ from scanspec.core import AxesPoints
 from scanspec.core import Path as ScanPath
 from scanspec.specs import Line
 
-from mx_bluesky.hyperion.parameters.components import (
+from mx_bluesky.common.parameters.components import (
     DiffractionExperimentWithSample,
     IspybExperimentType,
     OptionalGonioAngleStarts,
@@ -115,12 +115,16 @@ class MultiRotationScan(RotationExperiment, SplitScan):
 
     def _single_rotation_scan(self, scan: RotationScanPerSweep) -> RotationScan:
         # self has everything from RotationExperiment
-        params = self.model_dump()
-        del params["rotation_scans"]
+        allowed_keys = RotationScan.model_fields.keys()
+        params_dump = self.model_dump()
         # provided `scan` has everything from RotationScanPerSweep
-        params.update(scan.model_dump())
+        scan_dump = scan.model_dump()
+        rotation_scan_kv_pairs = {
+            k: v for k, v in (params_dump | scan_dump).items() if k in allowed_keys
+        }
         # together they have everything for RotationScan
-        return RotationScan(**params)
+        rotation_scan = RotationScan(**rotation_scan_kv_pairs)
+        return rotation_scan
 
     @model_validator(mode="after")
     @classmethod

mx_bluesky/hyperion/utils/utils.py

@@ -1,3 +1,6 @@
+import math
+from math import asin
+
 from scanspec.core import AxesPoints, Axis
 from scipy.constants import physical_constants
 
@@ -23,3 +26,17 @@ def convert_angstrom_to_eV(wavelength: float) -> float:
 def number_of_frames_from_scan_spec(scan_points: AxesPoints[Axis]):
     ax = list(scan_points.keys())[0]
     return len(scan_points[ax])
+
+
+def energy_to_bragg_angle(energy_kev: float, d_a: float) -> float:
+    """Compute the bragg angle given the energy in kev.
+
+    Args:
+        energy_kev:  The energy in keV
+        d_a:         The lattice spacing in Angstroms
+    Returns:
+        The bragg angle in degrees
+    """
+    wavelength_a = convert_eV_to_angstrom(energy_kev * 1000)
+    d = d_a
+    return asin(wavelength_a / (2 * d)) * 180 / math.pi

mx_bluesky/hyperion/utils/validation.py

@@ -8,7 +8,7 @@ from unittest.mock import patch
 import bluesky.preprocessors as bpp
 from bluesky.run_engine import RunEngine
 from dodal.beamlines import i03
-from dodal.devices.oav.oav_parameters import OAVConfigParams
+from dodal.devices.oav.oav_parameters import OAVConfig
 from ophyd_async.core import set_mock_value
 
 from mx_bluesky.hyperion.device_setup_plans.read_hardware_for_setup import (
@@ -23,8 +23,8 @@ from mx_bluesky.hyperion.external_interaction.callbacks.rotation.nexus_callback
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.rotation import RotationScan
 
-DISPLAY_CONFIGURATION = "tests/devices/unit_tests/test_display.configuration"
-ZOOM_LEVELS_XML = "tests/devices/unit_tests/test_jCameraManZoomLevels.xml"
+DISPLAY_CONFIGURATION = "tests/test_data/test_display.configuration"
+ZOOM_LEVELS_XML = "tests/test_data/test_jCameraManZoomLevels.xml"
 TEST_DATA_DIRECTORY = Path("tests/test_data/nexus_files/rotation")
 TEST_METAFILE = "ins_8_5_meta.h5.gz"
 FAKE_DATAFILE = "../fake_data.h5"
@@ -94,15 +94,14 @@ def fake_create_rotation_devices():
     robot = i03.robot(fake_with_ophyd_sim=True)
     oav = i03.oav(
         fake_with_ophyd_sim=True,
-        params=OAVConfigParams(
-            zoom_params_file=ZOOM_LEVELS_XML, display_config=DISPLAY_CONFIGURATION
+        params=OAVConfig(
+            zoom_params_file=ZOOM_LEVELS_XML, display_config_file=DISPLAY_CONFIGURATION
         ),
     )
     xbpm_feedback = i03.xbpm_feedback(fake_with_ophyd_sim=True)
 
     set_mock_value(smargon.omega.max_velocity, 131)
     set_mock_value(dcm.energy_in_kev.user_readback, 12700)
-    oav.zoom_controller.fvst.sim_put("1.0x")  # type: ignore
 
     return RotationScanComposite(
         attenuator=attenuator,