mx-bluesky 1.4.1a0__py3-none-any.whl → 1.4.2__py3-none-any.whl

mx_bluesky/beamlines/i24/serial/write_nexus.py

@@ -3,7 +3,6 @@ import pathlib
 import pprint
 import time
 from datetime import datetime
-from typing import Literal
 
 import requests
 
@@ -13,43 +12,49 @@ from mx_bluesky.beamlines.i24.serial.parameters import (
     ExtruderParameters,
     FixedTargetParameters,
 )
-from mx_bluesky.beamlines.i24.serial.setup_beamline import Eiger, caget, cagetstring
+from mx_bluesky.beamlines.i24.serial.setup_beamline import Eiger, caget
 
 
 def call_nexgen(
     chip_prog_dict: dict | None,
-    start_time: datetime,
     parameters: ExtruderParameters | FixedTargetParameters,
-    wavelength: float,
-    expt_type: Literal["fixed-target", "extruder"] = "fixed-target",
+    wavelength_in_a: float,
+    beam_center_in_pix: tuple[float, float],
+    start_time: datetime | None = None,
 ):
-    det_type = parameters.detector_name
-    print(f"det_type: {det_type}")
+    """Call the nexus writer by sending a request to nexgen-server.
 
+    Args:
+        chip_prog_dict (dict | None): Dictionary containing most of the information \
+            passed to the program runner for the collection. Only used for fixed target.
+        start_time
+        parameters (SerialAndLaserExperiment): Collection parameters.
+        wavelength_in_a (float): Wavelength, in A.
+        beam_center_in_pix (list[float]): Beam center position on detector, in pixels.
+        start_time (datetime, optional): Collection start time.
+
+    Raises:
+        ValueError: For a wrong experiment type passed (either unknwon or not matched \
+            to parameter model).
+
+    """
     current_chip_map = None
-    if expt_type == "fixed-target" and isinstance(parameters, FixedTargetParameters):
-        if not (
-            parameters.map_type == MappingType.NoMap
-            or parameters.chip.chip_type == ChipType.Custom
-        ):
-            # NOTE Nexgen server is still on nexgen v0.7.2 (fully working for ssx)
-            # Will need to be updated, for correctness sake map needs to be None.
-            current_chip_map = "/dls_sw/i24/scripts/fastchips/litemaps/currentchip.map"
-        pump_status = bool(parameters.pump_repeat)
-        total_numb_imgs = parameters.total_num_images
-    elif expt_type == "extruder" and isinstance(parameters, ExtruderParameters):
-        # chip_prog_dict should be None for extruder (passed as input for now)
-        total_numb_imgs = parameters.num_images
-        pump_status = parameters.pump_status
-    else:
-        raise ValueError(f"{expt_type=} not recognised")
+    match parameters:
+        case FixedTargetParameters():
+            if not (
+                parameters.map_type == MappingType.NoMap
+                or parameters.chip.chip_type == ChipType.Custom
+            ):
+                # For nexgen >= 0.9.10
+                current_chip_map = parameters.chip_map
+            pump_status = bool(parameters.pump_repeat)
+            total_numb_imgs = parameters.total_num_images
+        case ExtruderParameters():
+            total_numb_imgs = parameters.num_images
+            pump_status = parameters.pump_status
 
-    filename_prefix = cagetstring(Eiger.pv.filenameRBV)
-    meta_h5 = (
-        pathlib.Path(parameters.visit)
-        / parameters.directory
-        / f"{filename_prefix}_meta.h5"
-    )
+    filename_prefix = parameters.filename
+    meta_h5 = parameters.visit / parameters.directory / f"{filename_prefix}_meta.h5"
     t0 = time.time()
     max_wait = 60  # seconds
     SSX_LOGGER.info(f"Watching for {meta_h5}")
@@ -62,44 +67,38 @@ def call_nexgen(
         time.sleep(1)
     if not meta_h5.exists():
         SSX_LOGGER.warning(f"Giving up waiting for {meta_h5} after {max_wait} seconds")
-        return False
+        return
 
-    transmission = (float(caget(Eiger.pv.transmission)),)
-
-    if det_type == Eiger.name:
-        bit_depth = int(caget(Eiger.pv.bit_depth))
-        SSX_LOGGER.debug(
-            f"Call to nexgen server with the following chip definition: \n{chip_prog_dict}"
-        )
+    bit_depth = int(caget(Eiger.pv.bit_depth))
+    SSX_LOGGER.debug(
+        f"Call to nexgen server with the following chip definition: \n{chip_prog_dict}"
+    )
 
-        access_token = pathlib.Path("/scratch/ssx_nexgen.key").read_text().strip()
-        url = "https://ssx-nexgen.diamond.ac.uk/ssx_eiger/write"
-        headers = {"Authorization": f"Bearer {access_token}"}
+    access_token = pathlib.Path("/scratch/ssx_nexgen.key").read_text().strip()
+    url = "https://ssx-nexgen.diamond.ac.uk/ssx_eiger/write"
+    headers = {"Authorization": f"Bearer {access_token}"}
 
-        payload = {
-            "beamline": "i24",
-            "beam_center": [caget(Eiger.pv.beamx), caget(Eiger.pv.beamy)],
-            "chipmap": current_chip_map,
-            "chip_info": chip_prog_dict,
-            "det_dist": parameters.detector_distance_mm,
-            "exp_time": parameters.exposure_time_s,
-            "expt_type": expt_type,
-            "filename": filename_prefix,
-            "num_imgs": total_numb_imgs,
-            "pump_status": pump_status,
-            "pump_exp": parameters.laser_dwell_s,
-            "pump_delay": parameters.laser_delay_s,
-            "transmission": transmission[0],
-            "visitpath": os.fspath(meta_h5.parent),
-            "wavelength": wavelength,
-            "bit_depth": bit_depth,
-        }
-        SSX_LOGGER.info(f"Sending POST request to {url} with payload:")
-        SSX_LOGGER.info(pprint.pformat(payload))
-        response = requests.post(url, headers=headers, json=payload)
-        SSX_LOGGER.info(
-            f"Response: {response.text} (status code: {response.status_code})"
-        )
-        # the following will raise an error if the request was unsuccessful
-        return response.status_code == requests.codes.ok
-    return False
+    payload = {
+        "beamline": "i24",
+        "beam_center": beam_center_in_pix,
+        "chipmap": current_chip_map,
+        "chip_info": chip_prog_dict,
+        "det_dist": parameters.detector_distance_mm,
+        "exp_time": parameters.exposure_time_s,
+        "expt_type": parameters.nexgen_experiment_type,
+        "filename": filename_prefix,
+        "num_imgs": total_numb_imgs,
+        "pump_status": pump_status,
+        "pump_exp": parameters.laser_dwell_s,
+        "pump_delay": parameters.laser_delay_s,
+        "transmission": parameters.transmission,
+        "visitpath": os.fspath(meta_h5.parent),
+        "wavelength": wavelength_in_a,
+        "bit_depth": bit_depth,
+        "start_time": start_time,
+    }
+    SSX_LOGGER.info(f"Sending POST request to {url} with payload:")
+    SSX_LOGGER.info(pprint.pformat(payload))
+    response = requests.post(url, headers=headers, json=payload)
+    response.raise_for_status()
+    SSX_LOGGER.info(f"Response: {response.text} (status code: {response.status_code})")

mx_bluesky/common/parameters/components.py

@@ -103,12 +103,12 @@ class MxBlueskyParameters(BaseModel):
 
     @field_validator("parameter_model_version")
     @classmethod
-    def _validate_version(cls, version: Version):
+    def _validate_version(cls, version: SemanticVersion):
         assert (
-            version >= Version(major=PARAMETER_VERSION.major)
+            version >= SemanticVersion(major=PARAMETER_VERSION.major)
         ), f"Parameter version too old! This version of hyperion uses {PARAMETER_VERSION}"
         assert (
-            version <= Version(major=PARAMETER_VERSION.major + 1)
+            version <= SemanticVersion(major=PARAMETER_VERSION.major + 1)
         ), f"Parameter version too new! This version of hyperion uses {PARAMETER_VERSION}"
         return version
 

mx_bluesky/common/parameters/constants.py

@@ -19,6 +19,7 @@ class DocDescriptorNames:
     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"
+    SAMPLE_HANDLING_EXCEPTION = "sample_handling_exception"
     ZOCALO_HW_READ = "zocalo_read_hardware_plan"
     FLYSCAN_RESULTS = "flyscan_results_obtained"
 
@@ -36,6 +37,7 @@ class OavConstants:
 
 @dataclass(frozen=True)
 class PlanNameConstants:
+    LOAD_CENTRE_COLLECT = "load_centre_collect"
     # Robot load subplan
     ROBOT_LOAD = "robot_load"
     # Gridscan
@@ -45,6 +47,9 @@ class PlanNameConstants:
     GRIDSCAN_AND_MOVE = "run_gridscan_and_move"
     GRIDSCAN_MAIN = "run_gridscan"
     DO_FGS = "do_fgs"
+    # IspyB callback activation
+    ISPYB_ACTIVATION = "ispyb_activation"
+    ROBOT_LOAD_AND_SNAPSHOTS = "robot_load_and_snapshots"
     # Rotation scan
     ROTATION_MULTI = "multi_rotation_wrapper"
     ROTATION_OUTER = "rotation_scan_with_cleanup"

mx_bluesky/hyperion/device_setup_plans/dcm_pitch_roll_mirror_adjuster.py

@@ -19,6 +19,7 @@ from mx_bluesky.hyperion.utils.utils import (
 
 MIRROR_VOLTAGE_GROUP = "MIRROR_VOLTAGE_GROUP"
 DCM_GROUP = "DCM_GROUP"
+YAW_LAT_TIMEOUT_S = 30
 
 
 def _apply_and_wait_for_voltages_to_settle(
@@ -46,31 +47,42 @@ def _apply_and_wait_for_voltages_to_settle(
         for voltage_channel, required_voltage in zip(
             channels.values(), required_voltages, strict=True
         ):
-            LOGGER.debug(
+            LOGGER.info(
                 f"Applying and waiting for voltage {voltage_channel.name} = {required_voltage}"
             )
             yield from bps.abs_set(
-                voltage_channel, required_voltage, group=MIRROR_VOLTAGE_GROUP
+                voltage_channel, required_voltage, group=MIRROR_VOLTAGE_GROUP, wait=True
             )
 
-    yield from bps.wait(group=MIRROR_VOLTAGE_GROUP)
-
 
 def adjust_mirror_stripe(
     energy_kev, mirror: FocusingMirrorWithStripes, mirror_voltages: MirrorVoltages
 ):
     """Feedback should be OFF prior to entry, in order to prevent
     feedback from making unnecessary corrections while beam is being adjusted."""
-    stripe = mirror.energy_to_stripe(energy_kev)
+    mirror_config = mirror.energy_to_stripe(energy_kev)
 
     LOGGER.info(
-        f"Adjusting mirror stripe for {energy_kev}keV selecting {stripe} stripe"
+        f"Adjusting mirror stripe for {energy_kev}keV selecting {mirror_config['stripe']} stripe"
     )
-    yield from bps.abs_set(mirror.stripe, stripe, wait=True)
+    yield from bps.abs_set(mirror.stripe, mirror_config["stripe"], wait=True)
     yield from bps.trigger(mirror.apply_stripe)
 
+    # yaw, lat cannot be done simultaneously
+    LOGGER.info(f"Adjusting {mirror.name} lat to {mirror_config['lat_mm']}")
+    yield from bps.abs_set(
+        mirror.x_mm, mirror_config["lat_mm"], wait=True, timeout=YAW_LAT_TIMEOUT_S
+    )
+
+    LOGGER.info(f"Adjusting {mirror.name} yaw to {mirror_config['yaw_mrad']}")
+    yield from bps.abs_set(
+        mirror.yaw_mrad, mirror_config["yaw_mrad"], wait=True, timeout=YAW_LAT_TIMEOUT_S
+    )
+
     LOGGER.info("Adjusting mirror voltages...")
-    yield from _apply_and_wait_for_voltages_to_settle(stripe, mirror_voltages)
+    yield from _apply_and_wait_for_voltages_to_settle(
+        mirror_config["stripe"], mirror_voltages
+    )
 
 
 def adjust_dcm_pitch_roll_vfm_from_lut(
@@ -109,31 +121,9 @@ def adjust_dcm_pitch_roll_vfm_from_lut(
     yield from dcm_roll_adjuster(DCM_GROUP)
     LOGGER.info("Waiting for DCM roll adjust to complete...")
 
-    # DCM Perp pitch
-    offset_mm = undulator_dcm.dcm_fixed_offset_mm
-    LOGGER.info(f"Adjusting DCM offset to {offset_mm} mm")
-    yield from bps.abs_set(dcm.offset_in_mm, offset_mm, group=DCM_GROUP)
-
     #
-    # Adjust mirrors
+    # Adjust vfm mirror stripe and mirror voltages
     #
 
-    # No need to change HFM
-
-    # Assumption is focus mode is already set to "sample"
-    # not sure how we check this
-
     # VFM Stripe selection
     yield from adjust_mirror_stripe(energy_kev, vfm, mirror_voltages)
-    yield from bps.wait(DCM_GROUP)
-
-    # VFM Adjust - for I03 this table always returns the same value
-    vfm_lut = vfm.bragg_to_lat_lookup_table_path
-    assert vfm_lut is not None
-    vfm_x_adjuster = lookup_table_adjuster(
-        linear_interpolation_lut(vfm_lut),
-        vfm.x_mm,
-        bragg_deg,
-    )
-    LOGGER.info("Waiting for VFM Lat (Horizontal Translation) to complete...")
-    yield from vfm_x_adjuster()

mx_bluesky/hyperion/device_setup_plans/manipulate_sample.py

@@ -78,11 +78,11 @@ def move_x_y_z(
     axes are optional."""
 
     LOGGER.info(f"Moving smargon to x, y, z: {(x_mm, y_mm, z_mm)}")
-    if x_mm:
+    if x_mm is not None:
         yield from bps.abs_set(smargon.x, x_mm, group=group)
-    if y_mm:
+    if y_mm is not None:
         yield from bps.abs_set(smargon.y, y_mm, group=group)
-    if z_mm:
+    if z_mm is not None:
         yield from bps.abs_set(smargon.z, z_mm, group=group)
     if wait:
         yield from bps.wait(group)
@@ -100,11 +100,11 @@ def move_phi_chi_omega(
     axes are optional."""
 
     LOGGER.info(f"Moving smargon to phi, chi, omega: {(phi, chi, omega)}")
-    if phi:
+    if phi is not None:
         yield from bps.abs_set(smargon.phi, phi, group=group)
-    if chi:
+    if chi is not None:
         yield from bps.abs_set(smargon.chi, chi, group=group)
-    if omega:
+    if omega is not None:
         yield from bps.abs_set(smargon.omega, omega, group=group)
     if wait:
         yield from bps.wait(group)

mx_bluesky/hyperion/device_setup_plans/smargon.py

@@ -2,17 +2,17 @@ import numpy as np
 from bluesky import plan_stubs as bps
 from dodal.devices.smargon import Smargon
 
-from mx_bluesky.hyperion.exceptions import WarningException
+from mx_bluesky.hyperion.exceptions import SampleException
 
 
 def move_smargon_warn_on_out_of_range(
     smargon: Smargon, position: np.ndarray | list[float] | tuple[float, float, float]
 ):
-    """Throws a WarningException if the specified position is out of range for the
+    """Throws a SampleException if the specified position is out of range for the
     smargon. Otherwise moves to that position."""
     limits = yield from smargon.get_xyz_limits()
     if not limits.position_valid(position):
-        raise WarningException(
+        raise SampleException(
             "Pin tip centring failed - pin too long/short/bent and out of range"
         )
     yield from bps.mv(

mx_bluesky/hyperion/exceptions.py

@@ -13,9 +13,21 @@ class WarningException(Exception):
     pass
 
 
+class SampleException(WarningException):
+    """An exception which identifies an issue relating to the sample."""
+
+    pass
+
+
 T = TypeVar("T")
 
 
+class CrystalNotFoundException(SampleException):
+    """Raised if grid detection completed normally but no crystal was found."""
+
+    pass
+
+
 def catch_exception_and_warn(
     exception_to_catch: type[Exception],
     func: Callable[..., Generator[Msg, None, T]],
@@ -36,7 +48,7 @@ def catch_exception_and_warn(
 
     def warn_if_exception_matches(exception: Exception):
         if isinstance(exception, exception_to_catch):
-            raise WarningException(str(exception))
+            raise SampleException(str(exception)) from exception
         yield from null()
 
     return (

mx_bluesky/hyperion/experiment_plans/flyscan_xray_centre_plan.py

@@ -66,7 +66,7 @@ from mx_bluesky.hyperion.device_setup_plans.setup_zebra import (
 from mx_bluesky.hyperion.device_setup_plans.xbpm_feedback import (
     transmission_and_xbpm_feedback_for_collection_decorator,
 )
-from mx_bluesky.hyperion.exceptions import WarningException
+from mx_bluesky.hyperion.exceptions import CrystalNotFoundException, SampleException
 from mx_bluesky.hyperion.experiment_plans.change_aperture_then_move_plan import (
     change_aperture_then_move_to_xtal,
 )
@@ -79,14 +79,10 @@ from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.gridscan import HyperionThreeDGridScan
 from mx_bluesky.hyperion.utils.context import device_composite_from_context
 
-
-class SmargonSpeedException(Exception):
-    pass
+ZOCALO_MIN_TOTAL_COUNT_THRESHOLD = 3
 
 
-class CrystalNotFoundException(WarningException):
-    """Raised if grid detection completed normally but no crystal was found."""
-
+class SmargonSpeedException(Exception):
     pass
 
 
@@ -253,10 +249,20 @@ def run_gridscan_and_fetch_results(
             LOGGER.info("Zocalo triggered and read, interpreting results.")
             xrc_results = yield from get_full_processing_results(fgs_composite.zocalo)
             LOGGER.info(f"Got xray centres, top 5: {xrc_results[:5]}")
-            if xrc_results:
+            filtered_results = [
+                result
+                for result in xrc_results
+                if result["total_count"] >= ZOCALO_MIN_TOTAL_COUNT_THRESHOLD
+            ]
+            discarded_count = len(xrc_results) - len(filtered_results)
+            if discarded_count > 0:
+                LOGGER.info(
+                    f"Removed {discarded_count} results because below threshold"
+                )
+            if filtered_results:
                 flyscan_results = [
                     _xrc_result_in_boxes_to_result_in_mm(xr, parameters)
-                    for xr in xrc_results
+                    for xr in filtered_results
                 ]
             else:
                 LOGGER.warning("No X-ray centre received")
@@ -378,7 +384,7 @@ def wait_for_gridscan_valid(fgs_motors: FastGridScanCommon, timeout=0.5):
             LOGGER.info("Gridscan scan valid and position counter reset")
             return
         yield from bps.sleep(SLEEP_PER_CHECK)
-    raise WarningException("Scan invalid - pin too long/short/bent and out of range")
+    raise SampleException("Scan invalid - pin too long/short/bent and out of range")
 
 
 @dataclasses.dataclass

mx_bluesky/hyperion/experiment_plans/grid_detect_then_xray_centre_plan.py

@@ -144,14 +144,6 @@ def detect_grid_and_do_gridscan(
             parameters.box_size_um,
         )
 
-    if parameters.selected_aperture:
-        # Start moving the aperture/scatterguard into position without moving it in
-        yield from bps.abs_set(
-            composite.aperture_scatterguard.aperture_outside_beam,
-            parameters.selected_aperture,
-            group=CONST.WAIT.GRID_READY_FOR_DC,
-        )
-
     yield from run_grid_detection_plan(
         oav_params,
         snapshot_template,

mx_bluesky/hyperion/experiment_plans/load_centre_collect_full_plan.py

@@ -1,8 +1,11 @@
+from __future__ import annotations
+
 from collections.abc import Sequence
 
 import pydantic
-from blueapi.core import BlueskyContext, MsgGenerator
-from bluesky.preprocessors import subs_wrapper
+from blueapi.core import BlueskyContext
+from bluesky.preprocessors import run_decorator, set_run_key_decorator, subs_wrapper
+from bluesky.utils import MsgGenerator
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.smargon import Smargon
 
@@ -19,7 +22,11 @@ from mx_bluesky.hyperion.experiment_plans.rotation_scan_plan import (
     RotationScanComposite,
     multi_rotation_scan,
 )
+from mx_bluesky.hyperion.external_interaction.callbacks.sample_handling.sample_handling_callback import (
+    sample_handling_callback_decorator,
+)
 from mx_bluesky.hyperion.log import LOGGER
+from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.parameters.load_centre_collect import LoadCentreCollect
 from mx_bluesky.hyperion.utils.context import device_composite_from_context
 
@@ -53,36 +60,53 @@ def load_centre_collect_full(
     if not oav_params:
         oav_params = OAVParameters(context="xrayCentring")
 
-    flyscan_event_handler = XRayCentreEventHandler()
-    yield from subs_wrapper(
-        robot_load_then_xray_centre(composite, parameters.robot_load_then_centre),
-        flyscan_event_handler,
-    )
-
-    assert (
-        flyscan_event_handler.xray_centre_results
-    ), "Flyscan result event not received or no crystal found and exception not raised"
-
-    selection_func = flyscan_result.resolve_selection_fn(parameters.selection_params)
-    hits: Sequence[flyscan_result.XRayCentreResult] = selection_func(
-        flyscan_event_handler.xray_centre_results
+    @set_run_key_decorator(CONST.PLAN.LOAD_CENTRE_COLLECT)
+    @run_decorator(
+        md={
+            "metadata": {"sample_id": parameters.sample_id},
+            "activate_callbacks": ["SampleHandlingCallback"],
+        }
     )
-    LOGGER.info(
-        f"Selected hits {hits} using {selection_func}, args={parameters.selection_params}"
-    )
-
-    multi_rotation = parameters.multi_rotation_scan
-    rotation_template = multi_rotation.rotation_scans.copy()
-
-    multi_rotation.rotation_scans.clear()
-
-    for hit in hits:
-        for rot in rotation_template:
-            combination = rot.model_copy()
-            combination.x_start_um, combination.y_start_um, combination.z_start_um = (
-                axis * 1000 for axis in hit.centre_of_mass_mm
-            )
-            multi_rotation.rotation_scans.append(combination)
-    multi_rotation = MultiRotationScan.model_validate(multi_rotation)
-
-    yield from multi_rotation_scan(composite, multi_rotation, oav_params)
+    @sample_handling_callback_decorator()
+    def plan_with_callback_subs():
+        flyscan_event_handler = XRayCentreEventHandler()
+        yield from subs_wrapper(
+            robot_load_then_xray_centre(composite, parameters.robot_load_then_centre),
+            flyscan_event_handler,
+        )
+
+        assert flyscan_event_handler.xray_centre_results, "Flyscan result event not received or no crystal found and exception not raised"
+
+        selection_func = flyscan_result.resolve_selection_fn(
+            parameters.selection_params
+        )
+        hits: Sequence[flyscan_result.XRayCentreResult] = selection_func(
+            flyscan_event_handler.xray_centre_results
+        )
+        LOGGER.info(
+            f"Selected hits {hits} using {selection_func}, args={parameters.selection_params}"
+        )
+
+        multi_rotation = parameters.multi_rotation_scan
+        rotation_template = multi_rotation.rotation_scans.copy()
+
+        multi_rotation.rotation_scans.clear()
+
+        for hit in hits:
+            for rot in rotation_template:
+                combination = rot.model_copy()
+                (
+                    combination.x_start_um,
+                    combination.y_start_um,
+                    combination.z_start_um,
+                ) = (axis * 1000 for axis in hit.centre_of_mass_mm)
+                multi_rotation.rotation_scans.append(combination)
+        multi_rotation = MultiRotationScan.model_validate(multi_rotation)
+
+        assert (
+            multi_rotation.demand_energy_ev
+            == parameters.robot_load_then_centre.demand_energy_ev
+        ), "Setting a different energy for gridscan and rotation is not supported"
+        yield from multi_rotation_scan(composite, multi_rotation, oav_params)
+
+    yield from plan_with_callback_subs()

mx_bluesky/hyperion/experiment_plans/oav_snapshot_plan.py

@@ -3,7 +3,7 @@ from typing import Protocol
 
 from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator
-from dodal.devices.aperturescatterguard import ApertureScatterguard
+from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.backlight import Backlight, BacklightPosition
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
@@ -33,16 +33,22 @@ def setup_beamline_for_OAV(
     max_vel = yield from bps.rd(smargon.omega.max_velocity)
     yield from bps.abs_set(smargon.omega.velocity, max_vel, group=group)
     yield from bps.abs_set(backlight, BacklightPosition.IN, group=group)
-    yield from bps.trigger(aperture_scatterguard.move_out, group=group)
+    yield from bps.abs_set(
+        aperture_scatterguard,
+        ApertureValue.ROBOT_LOAD,
+        group=group,
+    )
 
 
 def oav_snapshot_plan(
     composite: OavSnapshotComposite,
     parameters: WithSnapshot,
     oav_parameters: OAVParameters,
+    wait: bool = True,
 ) -> MsgGenerator:
     if not parameters.take_snapshots:
         return
+    yield from bps.wait(group=CONST.WAIT.READY_FOR_OAV)
     yield from _setup_oav(composite, parameters, oav_parameters)
     for omega in parameters.snapshot_omegas_deg or []:
         yield from _take_oav_snapshot(composite, omega)

mx_bluesky/hyperion/experiment_plans/pin_tip_centring_plan.py

@@ -19,7 +19,7 @@ from mx_bluesky.hyperion.device_setup_plans.setup_oav import pre_centring_setup_
 from mx_bluesky.hyperion.device_setup_plans.smargon import (
     move_smargon_warn_on_out_of_range,
 )
-from mx_bluesky.hyperion.exceptions import WarningException
+from mx_bluesky.hyperion.exceptions import SampleException
 from mx_bluesky.hyperion.log import LOGGER
 from mx_bluesky.hyperion.parameters.constants import CONST
 from mx_bluesky.hyperion.utils.context import device_composite_from_context
@@ -68,7 +68,7 @@ def move_pin_into_view(
         max_steps (int, optional): The number of steps to search with. Defaults to 2.
 
     Raises:
-        WarningException: Error if the pin tip is never found
+        SampleException: Error if the pin tip is never found
 
     Returns:
         Tuple[int, int]: The location of the pin tip in pixels
@@ -105,7 +105,7 @@ def move_pin_into_view(
     tip_xy_px = yield from trigger_and_return_pin_tip(pin_tip_device)
 
     if not pin_tip_valid(tip_xy_px):
-        raise WarningException(
+        raise SampleException(
             "Pin tip centring failed - pin too long/short/bent and out of range"
         )
     else: