mx-bluesky 1.5.10__py3-none-any.whl → 1.5.12__py3-none-any.whl

mx_bluesky/beamlines/i24/serial/write_nexus.py

@@ -37,7 +37,7 @@ def call_nexgen(
     Raises:
         ValueError: For a wrong experiment type passed (either unknown or not matched \
             to parameter model).
-        HTTPError: For a problem with reponse from server
+        HTTPError: For a problem with response from server
 
     """
     current_chip_map = None
@@ -55,7 +55,7 @@ def call_nexgen(
             total_numb_imgs = parameters.num_images
             pump_status = parameters.pump_status
 
-    filename_prefix = cagetstring(Eiger.pv.filenameRBV)
+    filename_prefix = cagetstring(Eiger.PV.filename_rbv)
     meta_h5 = parameters.visit / parameters.directory / f"{filename_prefix}_meta.h5"
     t0 = time.time()
     max_wait = 60  # seconds
@@ -71,7 +71,7 @@ def call_nexgen(
         SSX_LOGGER.warning(f"Giving up waiting for {meta_h5} after {max_wait} seconds")
         return
 
-    bit_depth = int(caget(Eiger.pv.bit_depth))
+    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}"
     )
@@ -109,7 +109,7 @@ def submit_to_server(
     Raises:
         ValueError: For a wrong experiment type passed (either unknown or not matched \
             to parameter model).
-        HTTPError: For a problem with reponse from server
+        HTTPError: For a problem with response from server
 
     """
     access_token = pathlib.Path("/scratch/ssx_nexgen.key").read_text().strip()

mx_bluesky/common/device_setup_plans/gonio.py

@@ -0,0 +1,28 @@
+import numpy as np
+from bluesky import plan_stubs as bps
+from bluesky.utils import FailedStatus
+from dodal.devices.motors import XYZOmegaStage
+from ophyd_async.epics.motor import MotorLimitsError
+
+from mx_bluesky.common.utils.exceptions import SampleError
+
+
+def move_gonio_warn_on_out_of_range(
+    gonio: XYZOmegaStage,
+    position: np.ndarray | list[float] | tuple[float, float, float],
+):
+    """
+    Throws a SampleException if the specified position is out of range for the
+    gonio. Otherwise moves to that position. The check is from ophyd-async
+    """
+    try:
+        yield from bps.mv(
+            gonio.x, position[0], gonio.y, position[1], gonio.z, position[2]
+        )
+    except FailedStatus as fs:
+        if isinstance(fs.__cause__, MotorLimitsError):
+            raise SampleError(
+                "Pin tip centring failed - pin too long/short/bent and out of range"
+            ) from fs.__cause__
+        else:
+            raise fs

mx_bluesky/common/device_setup_plans/manipulate_sample.py

@@ -8,6 +8,7 @@ from dodal.devices.aperturescatterguard import (
 from dodal.devices.backlight import Backlight, InOut
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.smargon import CombinedMove, Smargon
+from dodal.devices.thawer import OnOff, Thawer
 
 from mx_bluesky.common.parameters.constants import PlanGroupCheckpointConstants
 from mx_bluesky.common.utils.log import LOGGER
@@ -19,9 +20,13 @@ def setup_sample_environment(
     aperture_scatterguard: ApertureScatterguard,
     aperture_position_gda_name: str | None,
     backlight: Backlight,
+    thawer: Thawer,
     group="setup_senv",
 ):
-    """Move the aperture into required position, move out the backlight."""
+    """Move the aperture into required position, move out the backlight so that it
+    doesn't cause a shadow on the detector and turn off thawing so it doesn't vibrate
+    the pin."""
+
     yield from bps.abs_set(backlight, InOut.OUT, group=group)
 
     aperture_value = (
@@ -33,6 +38,8 @@ def setup_sample_environment(
         aperture_scatterguard, aperture_value, group=group
     )
 
+    yield from bps.abs_set(thawer, OnOff.OFF, group=group)
+
 
 def move_aperture_if_required(
     aperture_scatterguard: ApertureScatterguard,

mx_bluesky/common/device_setup_plans/robot_load_unload.py

@@ -117,7 +117,7 @@ def robot_unload(
         yield from bps.save()
 
         def _unload():
-            yield from bps.trigger(robot.unload, wait=True)
+            yield from bps.abs_set(robot, None, wait=True)
             yield from wait_for_smargon_not_disabled(smargon)
 
         gonio_finished = yield from do_plan_while_lower_gonio_at_home(

mx_bluesky/common/device_setup_plans/setup_oav.py

@@ -28,6 +28,11 @@ def setup_pin_tip_detection_params(
         pin_tip_detect_device.preprocess_ksize, parameters.preprocess_K_size
     )
 
+    # sets iteration for blur
+    yield from set_using_group(
+        pin_tip_detect_device.preprocess_iterations, parameters.preprocess_iter
+    )
+
     # Canny edge detect - lower
     yield from set_using_group(
         pin_tip_detect_device.canny_lower_threshold,
@@ -40,6 +45,9 @@ def setup_pin_tip_detection_params(
         parameters.canny_edge_upper_threshold,
     )
 
+    # "Open" morphological operation
+    yield from set_using_group(pin_tip_detect_device.open_ksize, parameters.open_ksize)
+
     # "Close" morphological operation
     yield from set_using_group(
         pin_tip_detect_device.close_ksize, parameters.close_ksize

mx_bluesky/common/device_setup_plans/setup_zebra_and_shutter.py

@@ -183,11 +183,6 @@ def setup_zebra_for_rotation(
 
     ttl_detector = ttl_input_for_detector_to_use or zebra.mapping.outputs.TTL_DETECTOR
 
-    if not isinstance(direction, RotationDirection):
-        raise ValueError(
-            "Disallowed rotation direction provided to Zebra setup plan. "
-            "Use RotationDirection.POSITIVE or RotationDirection.NEGATIVE."
-        )
     yield from bps.abs_set(zebra.pc.dir, direction.value, group=group)
     LOGGER.info("ZEBRA SETUP: START")
     # Set gate start, adjust for shutter opening time if necessary

mx_bluesky/common/device_setup_plans/xbpm_feedback.py

@@ -6,7 +6,9 @@ from mx_bluesky.common.utils.log import LOGGER
 
 
 def unpause_xbpm_feedback_and_set_transmission_to_1(
-    xbpm_feedback: XBPMFeedback, attenuator: BinaryFilterAttenuator
+    xbpm_feedback: XBPMFeedback,
+    attenuator: BinaryFilterAttenuator,
+    timeout_for_stable: float = 0,
 ):
     """Turns the XBPM feedback back on and sets transmission to 1 so that it keeps the
     beam aligned whilst not collecting.
@@ -15,8 +17,13 @@ def unpause_xbpm_feedback_and_set_transmission_to_1(
         xbpm_feedback (XBPMFeedback): The XBPM device that is responsible for keeping
                                       the beam in position
         attenuator (BinaryFilterAttenuator): The attenuator used to set transmission
+        timeout_for_stable: If specified and non-zero, specifies the time in seconds to wait for
+            feedback to stabilise, otherwise we do not wait.
     """
     yield from bps.mv(xbpm_feedback.pause_feedback, Pause.RUN, attenuator, 1.0)
+    if timeout_for_stable:
+        yield from bps.trigger(xbpm_feedback, group="feedback")
+        yield from bps.wait(group="feedback", timeout=timeout_for_stable)
 
 
 def check_and_pause_feedback(

mx_bluesky/common/experiment_plans/beamstop_check.py

@@ -0,0 +1,229 @@
+import pydantic
+from bluesky import plan_stubs as bps
+from bluesky.utils import MsgGenerator
+from dodal.common.beamlines.beamline_parameters import GDABeamlineParameters
+from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
+from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
+from dodal.devices.backlight import Backlight
+from dodal.devices.baton import Baton
+from dodal.devices.detector.detector_motion import DetectorMotion, ShutterState
+from dodal.devices.ipin import IPin, IPinGain
+from dodal.devices.mx_phase1.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.xbpm_feedback import XBPMFeedback
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter, ZebraShutterState
+from ophyd_async.core import InOut
+
+from mx_bluesky.common.device_setup_plans.xbpm_feedback import (
+    unpause_xbpm_feedback_and_set_transmission_to_1,
+)
+from mx_bluesky.common.utils.exceptions import BeamlineCheckFailureError
+from mx_bluesky.common.utils.log import LOGGER
+
+_GROUP_PRE_BEAMSTOP_OUT_CHECK = "pre_background_check"
+_GROUP_POST_BEAMSTOP_OUT_CHECK = "post_background_check"
+_PARAM_IPIN_THRESHOLD = "ipin_threshold"
+
+_FEEDBACK_TIMEOUT_S = 10
+
+
+@pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
+class BeamstopCheckDevices:
+    aperture_scatterguard: ApertureScatterguard
+    attenuator: BinaryFilterAttenuator
+    backlight: Backlight
+    baton: Baton
+    beamstop: Beamstop
+    detector_motion: DetectorMotion
+    ipin: IPin
+    sample_shutter: ZebraShutter
+    xbpm_feedback: XBPMFeedback
+
+
+class SampleCurrentBelowThresholdError(BeamlineCheckFailureError): ...
+
+
+class BeamstopNotInPositionError(BeamlineCheckFailureError): ...
+
+
+class BeamObstructedError(BeamlineCheckFailureError): ...
+
+
+def move_beamstop_in_and_verify_using_diode(
+    devices: BeamstopCheckDevices,
+    beamline_parameters: GDABeamlineParameters,
+    detector_min_z_mm: float,
+    detector_max_z_mm: float,
+) -> MsgGenerator:
+    """
+    Move the beamstop into the data collection position, checking the beam current
+    via the diode on the detector shutter, first with the beamstop out and then with
+    the beamstop in.
+    These checks aim to ensure that
+       * The beam is not obstructed by something other than the beamstop
+       * The beamstop has been successfully moved and is intercepting the beam
+
+    As a side-effect, this plan also does the following things:
+        * Move the detector z-axis in range
+        * Move the backlight out
+        * Unpauses feedback
+        * Sets xmission to 100%
+        * Sets IPin gain to 10^4 low noise
+        * Moves aperture scatterguard to OUT_OF_BEAM if it is currently in beam
+
+    Implementation note:
+        Some checks are repeated here such as closing the sample shutter, so that at a
+        future point this plan may be run independently of the udc default state script
+        if desired.
+    Note on commissioning mode:
+        When commissioning mode is enabled, the beamstop check will execute normally except
+        where it expects beam to be present, the absence of beam will be ignored.
+    Args:
+        devices: The device composite containing the necessary devices
+        beamline_parameters: A mapping containing the beamlineParameters
+        detector_min_z_mm: Detector minimum distance at which beamstop is effective
+        detector_max_z_mm: Detector maximum distance at which beamstop is effective
+    Raises:
+        SampleCurrentBelowThresholdError: If we do not have sufficient sample current to perform
+            the check.
+        BeamstopNotInPositionError: If the ipin current is too high, indicating that the
+            beamstop is not in the correct position.
+        BeamObstructedError: If the ipin current is too low after the first check
+            with the beamstop out, indicating a likely obstruction.
+    """
+    LOGGER.info("Performing beamstop check...")
+    commissioning_mode_enabled = yield from bps.rd(devices.baton.commissioning)
+    beamstop_threshold_uA = beamline_parameters[_PARAM_IPIN_THRESHOLD]  # noqa: N806
+
+    yield from _start_moving_detector_if_needed(
+        devices, detector_min_z_mm, detector_max_z_mm, _GROUP_POST_BEAMSTOP_OUT_CHECK
+    )
+    yield from _pre_beamstop_out_check_actions(devices)
+    yield from _beamstop_out_check(
+        devices, beamstop_threshold_uA, commissioning_mode_enabled
+    )
+    yield from _post_beamstop_out_check_actions(devices, _GROUP_POST_BEAMSTOP_OUT_CHECK)
+    yield from _beamstop_in_check(devices, beamstop_threshold_uA)
+
+
+def _pre_beamstop_out_check_actions(devices: BeamstopCheckDevices):
+    # Re-verify that the sample shutter is closed
+    yield from bps.abs_set(devices.sample_shutter, ZebraShutterState.CLOSE, wait=True)
+    LOGGER.info("Unpausing feedback, transmission to 100%, wait for feedback stable...")
+    try:
+        yield from unpause_xbpm_feedback_and_set_transmission_to_1(
+            devices.xbpm_feedback,
+            devices.attenuator,
+            _FEEDBACK_TIMEOUT_S,
+        )
+    except TimeoutError as e:
+        raise SampleCurrentBelowThresholdError(
+            "Unable to perform beamstop check - xbpm feedback did not become stable "
+            " - check if beam present?"
+        ) from e
+
+    yield from bps.abs_set(
+        devices.backlight, InOut.OUT, group=_GROUP_PRE_BEAMSTOP_OUT_CHECK
+    )
+
+    yield from bps.abs_set(
+        devices.aperture_scatterguard.selected_aperture,
+        ApertureValue.OUT_OF_BEAM,
+        group=_GROUP_PRE_BEAMSTOP_OUT_CHECK,
+    )
+
+    yield from bps.abs_set(
+        devices.ipin.gain,
+        IPinGain.GAIN_10E4_LOW_NOISE,
+        group=_GROUP_PRE_BEAMSTOP_OUT_CHECK,
+    )
+    yield from bps.abs_set(
+        devices.detector_motion.shutter,
+        ShutterState.CLOSED,
+        group=_GROUP_PRE_BEAMSTOP_OUT_CHECK,
+    )
+    yield from bps.abs_set(
+        devices.beamstop.selected_pos,
+        BeamstopPositions.OUT_OF_BEAM,
+        group=_GROUP_PRE_BEAMSTOP_OUT_CHECK,
+    )
+
+    LOGGER.info("Waiting for pre-background-check motions to complete...")
+    yield from bps.wait(group=_GROUP_PRE_BEAMSTOP_OUT_CHECK)
+
+    # Check detector shutter is closed
+    detector_shutter_state = yield from bps.rd(devices.detector_motion.shutter)
+    detector_shutter_is_closed = detector_shutter_state == ShutterState.CLOSED
+    if not detector_shutter_is_closed:
+        raise RuntimeError(
+            "Unable to proceed with beamstop background check, detector shutter did not close"
+        )
+
+
+def _start_moving_detector_if_needed(
+    devices: BeamstopCheckDevices,
+    detector_min_z_mm: float,
+    detector_max_z_mm: float,
+    group: str = None,
+):
+    detector_current_z = yield from bps.rd(devices.detector_motion.z)
+    target_z = max(min(detector_current_z, detector_max_z_mm), detector_min_z_mm)
+    if detector_current_z != target_z:
+        LOGGER.info(
+            f"Detector distance {detector_current_z}mm outside acceptable range for diode "
+            f"check {detector_min_z_mm} <= z <= {detector_max_z_mm}, moving it."
+        )
+        yield from bps.abs_set(devices.detector_motion.z, target_z, group=group)
+
+
+def _post_beamstop_out_check_actions(devices: BeamstopCheckDevices, group: str):
+    yield from bps.abs_set(
+        devices.beamstop.selected_pos,
+        BeamstopPositions.DATA_COLLECTION,
+        group=group,
+    )
+
+    LOGGER.info("Waiting for detector motion to complete...")
+    yield from bps.wait(group=group)
+
+
+def _beamstop_out_check(
+    devices: BeamstopCheckDevices,
+    beamstop_threshold_uA: float,  # noqa: N803
+    commissioning_mode_enabled: bool,
+):
+    ipin_beamstop_out_uA = yield from _check_ipin(devices)  # noqa: N806
+
+    LOGGER.info(f"Beamstop out ipin = {ipin_beamstop_out_uA}uA")
+    if ipin_beamstop_out_uA < beamstop_threshold_uA:
+        msg = (
+            f"IPin current {ipin_beamstop_out_uA}uA below threshold "
+            f"{beamstop_threshold_uA} with beamstop out - check "
+            f"that beam is not obstructed."
+        )
+        if commissioning_mode_enabled:
+            LOGGER.warning(msg + " - commissioning mode enabled - ignoring this")
+        else:
+            raise BeamObstructedError(msg)
+
+
+def _beamstop_in_check(devices: BeamstopCheckDevices, beamstop_threshold_uA: float):  # noqa: N803
+    ipin_in_beam_uA = yield from _check_ipin(devices)  # noqa: N806
+    if ipin_in_beam_uA > beamstop_threshold_uA:
+        raise BeamstopNotInPositionError(
+            f"Ipin is too high at {ipin_in_beam_uA} - check that beamstop is "
+            f"in the correct position."
+        )
+
+
+def _check_ipin(devices: BeamstopCheckDevices):
+    try:
+        yield from bps.abs_set(
+            devices.sample_shutter, ZebraShutterState.OPEN, wait=True
+        )
+        yield from bps.sleep(1)  # wait for reading to settle
+
+        return (yield from bps.rd(devices.ipin.pin_readback))  # noqa: N806
+    finally:
+        yield from bps.abs_set(
+            devices.sample_shutter, ZebraShutterState.CLOSE, wait=True
+        )

mx_bluesky/common/experiment_plans/common_flyscan_xray_centre_plan.py

@@ -37,8 +37,8 @@ from mx_bluesky.common.parameters.constants import (
 from mx_bluesky.common.parameters.device_composites import FlyScanEssentialDevices
 from mx_bluesky.common.parameters.gridscan import SpecifiedThreeDGridScan
 from mx_bluesky.common.utils.exceptions import (
-    CrystalNotFoundException,
-    SampleException,
+    CrystalNotFoundError,
+    SampleError,
 )
 from mx_bluesky.common.utils.log import LOGGER
 from mx_bluesky.common.utils.tracing import TRACER
@@ -77,7 +77,7 @@ def generic_tidy(xrc_composite: FlyScanEssentialDevices, wait=True) -> MsgGenera
     yield from bps.wait(group)
 
 
-def construct_beamline_specific_FGS_features(
+def construct_beamline_specific_fast_gridscan_features(
     setup_trigger_plan: Callable[..., MsgGenerator],
     tidy_plan: Callable[..., MsgGenerator],
     set_flyscan_params_plan: Callable[..., MsgGenerator],
@@ -235,7 +235,7 @@ def _fetch_xrc_results_from_zocalo(
             flyscan_results = [_generate_dummy_xrc_result(parameters)]
         else:
             LOGGER.warning("No X-ray centre received")
-            raise CrystalNotFoundException()
+            raise CrystalNotFoundError()
     yield from _fire_xray_centre_result_event(flyscan_results)
 
 
@@ -276,9 +276,11 @@ def run_gridscan(
         yield from beamline_specific.set_flyscan_params_plan()
     except FailedStatus as e:
         if isinstance(e.__cause__, GridScanInvalidError):
-            raise SampleException(
+            raise SampleError(
                 "Scan invalid - gridscan not valid for detected pin position"
             ) from e
+        else:
+            raise e
 
     LOGGER.info("Waiting for arming to finish")
     yield from bps.wait(PlanGroupCheckpointConstants.GRID_READY_FOR_DC)
@@ -301,7 +303,7 @@ def run_gridscan(
 def _xrc_result_in_boxes_to_result_in_mm(
     xrc_result: XrcResult, parameters: SpecifiedThreeDGridScan
 ) -> XRayCentreResult:
-    fgs_params = parameters.FGS_params
+    fgs_params = parameters.fast_gridscan_params
     xray_centre = fgs_params.grid_position_to_motor_position(
         np.array(xrc_result["centre_of_mass"])
     )

mx_bluesky/common/experiment_plans/common_grid_detect_then_xray_centre_plan.py

@@ -29,7 +29,7 @@ from mx_bluesky.common.experiment_plans.oav_grid_detection_plan import (
     grid_detection_plan,
 )
 from mx_bluesky.common.experiment_plans.oav_snapshot_plan import (
-    setup_beamline_for_OAV,
+    setup_beamline_for_oav,
 )
 from mx_bluesky.common.external_interaction.callbacks.common.grid_detection_callback import (
     GridDetectionCallback,
@@ -123,7 +123,7 @@ def detect_grid_and_do_gridscan(
 
     grid_params_callback = GridDetectionCallback()
 
-    yield from setup_beamline_for_OAV(
+    yield from setup_beamline_for_oav(
         composite.smargon,
         composite.backlight,
         composite.aperture_scatterguard,

mx_bluesky/common/experiment_plans/inner_plans/do_fgs.py

@@ -46,7 +46,7 @@ def _wait_for_zocalo_to_stage_then_do_fgs(
     LOGGER.info("Waiting for Zocalo device queue to have been cleared...")
     yield from bps.wait(ZOCALO_STAGE_GROUP)
 
-    # Triggers Zocalo if RE is subscribed to ZocaloCallback
+    # Triggers Zocalo if run_engine is subscribed to ZocaloCallback
     yield from read_hardware_for_zocalo(detector)
     LOGGER.info("Wait for all moves with no assigned group")
     yield from bps.wait()

mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py

@@ -4,13 +4,14 @@ import bluesky.plan_stubs as bps
 from bluesky.protocols import Readable
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
+from dodal.devices.beamsize.beamsize import BeamsizeBase
 from dodal.devices.common_dcm import DoubleCrystalMonochromator
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.flux import Flux
 from dodal.devices.s4_slit_gaps import S4SlitGaps
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 
 from mx_bluesky.common.parameters.constants import (
     DocDescriptorNames,
@@ -40,7 +41,7 @@ def read_hardware_for_zocalo(detector: EigerDetector):
 
 
 def standard_read_hardware_pre_collection(
-    undulator: Undulator,
+    undulator: UndulatorInKeV,
     synchrotron: Synchrotron,
     s4_slit_gaps: S4SlitGaps,
     dcm: DoubleCrystalMonochromator,
@@ -52,7 +53,7 @@ def standard_read_hardware_pre_collection(
         synchrotron.synchrotron_mode,
         s4_slit_gaps,
         smargon,
-        dcm.energy_in_kev,
+        dcm.energy_in_keV,
     ]
     yield from read_hardware_plan(
         signals_to_read_pre_flyscan, DocDescriptorNames.HARDWARE_READ_PRE
@@ -65,13 +66,15 @@ def standard_read_hardware_during_collection(
     flux: Flux,
     dcm: DoubleCrystalMonochromator,
     detector: EigerDetector,
+    beamsize: BeamsizeBase,
 ):
     signals_to_read_during_collection = [
         aperture_scatterguard,
         attenuator.actual_transmission,
         flux.flux_reading,
-        dcm.energy_in_kev,
+        dcm.energy_in_keV,
         detector.bit_depth,
+        beamsize,
     ]
     yield from read_hardware_plan(
         signals_to_read_during_collection, DocDescriptorNames.HARDWARE_READ_DURING

mx_bluesky/common/experiment_plans/inner_plans/write_sample_status.py

@@ -6,7 +6,7 @@ import bluesky.preprocessors as bpp
 from mx_bluesky.common.external_interaction.callbacks.sample_handling.sample_handling_callback import (
     SampleHandlingCallback,
 )
-from mx_bluesky.common.utils.exceptions import SampleException
+from mx_bluesky.common.utils.exceptions import SampleError
 
 
 class SampleStatusExceptionType(StrEnum):
@@ -27,7 +27,7 @@ def deposit_sample_error(exception_type: SampleStatusExceptionType, sample_id: i
         if exception_type == SampleStatusExceptionType.BEAMLINE:
             raise AssertionError()
         elif exception_type == SampleStatusExceptionType.SAMPLE:
-            raise SampleException
+            raise SampleError
 
     yield from _inner()
 

mx_bluesky/common/experiment_plans/oav_snapshot_plan.py

@@ -24,10 +24,9 @@ class OavSnapshotComposite(Protocol):
     smargon: Smargon
     oav: OAV
     aperture_scatterguard: ApertureScatterguard
-    backlight: Backlight
 
 
-def setup_beamline_for_OAV(
+def setup_beamline_for_oav(
     smargon: Smargon,
     backlight: Backlight,
     aperture_scatterguard: ApertureScatterguard,