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

mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py

@@ -52,7 +52,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
@@ -70,7 +70,7 @@ def standard_read_hardware_during_collection(
         aperture_scatterguard,
         attenuator.actual_transmission,
         flux.flux_reading,
-        dcm.energy_in_kev,
+        dcm.energy_in_keV,
         detector.bit_depth,
     ]
     yield from read_hardware_plan(

mx_bluesky/common/experiment_plans/inner_plans/udc_default_state.py

@@ -1,13 +1,15 @@
 import bluesky.plan_stubs as bps
 import pydantic
+from bluesky.utils import MsgGenerator
 from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.collimation_table import CollimationTable
-from dodal.devices.cryostream import CryoStream
+from dodal.devices.cryostream import CryoStream, CryoStreamGantry, CryoStreamSelection
 from dodal.devices.cryostream import InOut as CryoInOut
 from dodal.devices.fluorescence_detector_motion import (
     FluorescenceDetector,
 )
 from dodal.devices.fluorescence_detector_motion import InOut as FlouInOut
+from dodal.devices.hutch_shutter import HutchShutter, ShutterDemand
 from dodal.devices.mx_phase1.beamstop import Beamstop, BeamstopPositions
 from dodal.devices.scintillator import InOut as ScinInOut
 from dodal.devices.scintillator import Scintillator
@@ -16,15 +18,18 @@ from dodal.devices.scintillator import Scintillator
 @pydantic.dataclasses.dataclass(config={"arbitrary_types_allowed": True})
 class UDCDefaultDevices:
     cryostream: CryoStream
+    cryostream_gantry: CryoStreamGantry
     fluorescence_det_motion: FluorescenceDetector
     beamstop: Beamstop
     scintillator: Scintillator
     aperture_scatterguard: ApertureScatterguard
     collimation_table: CollimationTable
+    hutch_shutter: HutchShutter
 
 
 def move_to_udc_default_state(devices: UDCDefaultDevices):
     """Moves beamline to known positions prior to UDC start"""
+    yield from _verify_correct_cryostream_selected(devices.cryostream_gantry)
 
     cryostream_temp = yield from bps.rd(devices.cryostream.temperature_k)
     cryostream_pressure = yield from bps.rd(devices.cryostream.back_pressure_bar)
@@ -33,6 +38,10 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
     if cryostream_pressure > devices.cryostream.MAX_PRESSURE_BAR:
         raise ValueError("Cryostream back pressure is too high, not starting UDC")
 
+    yield from bps.abs_set(
+        devices.hutch_shutter, ShutterDemand.OPEN, group="udc_default"
+    )
+
     yield from bps.abs_set(devices.scintillator.selected_pos, ScinInOut.OUT, wait=True)
 
     yield from bps.abs_set(
@@ -63,3 +72,15 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
     yield from bps.abs_set(devices.cryostream.fine, CryoInOut.IN, group="udc_default")
 
     yield from bps.wait("udc_default")
+
+
+def _verify_correct_cryostream_selected(
+    cryostream_gantry: CryoStreamGantry,
+) -> MsgGenerator:
+    cryostream_selection = yield from bps.rd(cryostream_gantry.cryostream_selector)
+    cryostream_selected = yield from bps.rd(cryostream_gantry.cryostream_selected)
+    if cryostream_selection != CryoStreamSelection.CRYOJET or cryostream_selected != 1:
+        raise ValueError(
+            f"Cryostream is not selected for use, control PV selection = {cryostream_selection}, "
+            f"current status {cryostream_selected}"
+        )

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

@@ -27,7 +27,7 @@ class OavSnapshotComposite(Protocol):
     backlight: Backlight
 
 
-def setup_beamline_for_OAV(
+def setup_beamline_for_oav(
     smargon: Smargon,
     backlight: Backlight,
     aperture_scatterguard: ApertureScatterguard,

mx_bluesky/common/external_interaction/callbacks/common/ispyb_callback_base.py

@@ -29,7 +29,7 @@ from mx_bluesky.common.external_interaction.ispyb.ispyb_utils import get_ispyb_c
 from mx_bluesky.common.parameters.components import DiffractionExperimentWithSample
 from mx_bluesky.common.parameters.constants import DocDescriptorNames
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER, set_dcgid_tag
-from mx_bluesky.common.utils.utils import convert_eV_to_angstrom
+from mx_bluesky.common.utils.utils import convert_ev_to_angstrom
 
 D = TypeVar("D")
 if TYPE_CHECKING:
@@ -43,9 +43,9 @@ def _update_based_on_energy(
 ):
     """If energy has been read as part of this reading then add it into the data
     collection info along with the other fields that depend on it."""
-    if energy_kev := doc["data"].get("dcm-energy_in_kev", None):
+    if energy_kev := doc["data"].get("dcm-energy_in_keV", None):
         energy_ev = energy_kev * 1000
-        wavelength_angstroms = convert_eV_to_angstrom(energy_ev)
+        wavelength_angstroms = convert_ev_to_angstrom(energy_ev)
         data_collection_info.wavelength = wavelength_angstroms
         data_collection_info.resolution = resolution(
             detector_params,

mx_bluesky/common/external_interaction/callbacks/common/plan_reactive_callback.py

@@ -40,7 +40,7 @@ class PlanReactiveCallback(CallbackBase):
         self.log = log
 
     def _run_activity_gated(self, name: str, func, doc, override=False):
-        # Runs `func` if self.active is True or overide is true. Override can be used
+        # Runs `func` if self.active is True or override is true. Override can be used
         # to run the function even after setting self.active to False, i.e. in the last
         # handler of a run.
 

mx_bluesky/common/external_interaction/callbacks/common/zocalo_callback.py

@@ -9,7 +9,7 @@ from dodal.devices.zocalo import ZocaloStartInfo, ZocaloTrigger
 from mx_bluesky.common.parameters.constants import (
     DocDescriptorNames,
 )
-from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMade
+from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMadeError
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER
 
 if TYPE_CHECKING:
@@ -89,7 +89,7 @@ class ZocaloCallback(CallbackBase):
                 f"Zocalo handler received stop document, for run {doc.get('run_start')}."
             )
             if not self._started_zocalo_collections:
-                raise ISPyBDepositionNotMade(
+                raise ISPyBDepositionNotMadeError(
                     f"No ISPyB IDs received by the end of {self.triggering_plan=}"
                 )
             for info in self._started_zocalo_collections:

mx_bluesky/common/external_interaction/callbacks/sample_handling/sample_handling_callback.py

@@ -12,7 +12,7 @@ from mx_bluesky.common.external_interaction.ispyb.exp_eye_store import (
     BLSampleStatus,
     ExpeyeInteraction,
 )
-from mx_bluesky.common.utils.exceptions import CrystalNotFoundException, SampleException
+from mx_bluesky.common.utils.exceptions import CrystalNotFoundError, SampleError
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER
 
 
@@ -47,7 +47,7 @@ class SampleHandlingCallback(PlanReactiveCallback):
             expeye = ExpeyeInteraction()
             if doc["exit_status"] != "success":
                 reason = doc.get("reason", "")
-                exception_type, message = SampleException.type_and_message_from_reason(
+                exception_type, message = SampleError.type_and_message_from_reason(
                     reason
                 )
                 self.log.info(
@@ -83,7 +83,7 @@ class SampleHandlingCallback(PlanReactiveCallback):
 
     def _decode_sample_status(self, exception_type: str) -> BLSampleStatus:
         match exception_type:
-            case SampleException.__name__ | CrystalNotFoundException.__name__:
+            case SampleError.__name__ | CrystalNotFoundError.__name__:
                 return BLSampleStatus.ERROR_SAMPLE
         return BLSampleStatus.ERROR_BEAMLINE
 

mx_bluesky/common/external_interaction/callbacks/xray_centre/ispyb_callback.py

@@ -40,8 +40,8 @@ from mx_bluesky.common.parameters.components import DiffractionExperimentWithSam
 from mx_bluesky.common.parameters.constants import DocDescriptorNames, PlanNameConstants
 from mx_bluesky.common.parameters.gridscan import GridCommon
 from mx_bluesky.common.utils.exceptions import (
-    ISPyBDepositionNotMade,
-    SampleException,
+    ISPyBDepositionNotMadeError,
+    SampleError,
 )
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER, set_dcgid_tag
 from mx_bluesky.common.utils.utils import number_of_frames_from_scan_spec
@@ -87,7 +87,7 @@ class GridscanISPyBCallback(BaseISPyBCallback):
     To use, subscribe the Bluesky RunEngine to an instance of this class.
     E.g.:
         ispyb_handler_callback = FGSISPyBCallback(parameters)
-        RE.subscribe(ispyb_handler_callback)
+        run_engine.subscribe(ispyb_handler_callback)
     Or decorate a plan using bluesky.preprocessors.subs_decorator.
 
     See: https://blueskyproject.io/bluesky/callbacks.html#ways-to-invoke-callbacks
@@ -303,8 +303,10 @@ class GridscanISPyBCallback(BaseISPyBCallback):
                 f"with uid: {self.uid_to_finalize_on}."
             )
             if self.ispyb_ids == IspybIds():
-                raise ISPyBDepositionNotMade("ispyb was not initialised at run start")
-            exception_type, message = SampleException.type_and_message_from_reason(
+                raise ISPyBDepositionNotMadeError(
+                    "ispyb was not initialised at run start"
+                )
+            exception_type, message = SampleError.type_and_message_from_reason(
                 doc.get("reason", "")
             )
             if exception_type:

mx_bluesky/common/external_interaction/callbacks/xray_centre/nexus_callback.py

@@ -33,7 +33,7 @@ class GridscanNexusFileCallback(PlanReactiveCallback):
     To use, subscribe the Bluesky RunEngine to an instance of this class.
     E.g.:
         nexus_file_handler_callback = NexusFileCallback(parameters)
-        RE.subscribe(nexus_file_handler_callback)
+        run_engine.subscribe(nexus_file_handler_callback)
     Or decorate a plan using bluesky.preprocessors.subs_decorator.
 
     See: https://blueskyproject.io/bluesky/callbacks.html#ways-to-invoke-callbacks
@@ -89,7 +89,7 @@ class GridscanNexusFileCallback(PlanReactiveCallback):
                     nexus_writer.beam,
                     nexus_writer.attenuator,
                 ) = create_beam_and_attenuator_parameters(
-                    data["dcm-energy_in_kev"],
+                    data["dcm-energy_in_keV"],
                     data["flux-flux_reading"],
                     data["attenuator-actual_transmission"],
                 )

mx_bluesky/common/external_interaction/config_server.py

@@ -10,7 +10,7 @@ from pydantic import TypeAdapter
 from mx_bluesky.common.parameters.constants import (
     GDA_DOMAIN_PROPERTIES_PATH,
     FeatureSetting,
-    FeatureSettingources,
+    FeatureSettingSources,
     OavConstants,
 )
 from mx_bluesky.common.utils.log import LOGGER
@@ -25,7 +25,7 @@ T = TypeVar("T", bound=FeatureSetting)
 class MXConfigClient(ConfigServer, Generic[T]):
     def __init__(
         self,
-        feature_sources: type[FeatureSettingources],
+        feature_sources: type[FeatureSettingSources],
         feature_dc: type[T],
         url: str = "https://daq-config.diamond.ac.uk",
     ):

mx_bluesky/common/external_interaction/ispyb/exp_eye_store.py

@@ -11,7 +11,7 @@ from mx_bluesky.common.external_interaction.ispyb.ispyb_utils import (
     get_current_time_string,
     get_ispyb_config,
 )
-from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMade
+from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMadeError
 
 RobotActionID = int
 
@@ -40,7 +40,9 @@ def _send_and_get_response(auth, url, data, send_func) -> dict:
             resp_txt = str(response.json())
         except JSONDecodeError:
             resp_txt = str(response)
-        raise ISPyBDepositionNotMade(f"Could not write {data} to {url}: {resp_txt}")
+        raise ISPyBDepositionNotMadeError(
+            f"Could not write {data} to {url}: {resp_txt}"
+        )
     return response.json()
 
 

mx_bluesky/common/external_interaction/ispyb/ispyb_store.py

@@ -5,7 +5,6 @@ from dataclasses import asdict
 from typing import TYPE_CHECKING
 
 import ispyb
-import ispyb.sqlalchemy
 import numpy as np
 from ispyb.connector.mysqlsp.main import ISPyBMySQLSPConnector as Connector
 from ispyb.sp.mxacquisition import MXAcquisition

mx_bluesky/common/external_interaction/nexus/nexus_utils.py

@@ -11,7 +11,7 @@ from nexgen.nxs_utils.axes import TransformationType
 from numpy.typing import DTypeLike
 
 from mx_bluesky.common.utils.log import NEXUS_LOGGER
-from mx_bluesky.common.utils.utils import convert_eV_to_angstrom
+from mx_bluesky.common.utils.utils import convert_ev_to_angstrom
 
 
 class AxisDirection(Enum):
@@ -158,6 +158,6 @@ def create_beam_and_attenuator_parameters(
         tuple[Beam, Attenuator]: Descriptions of the beam and attenuator for nexgen.
     """
     return (
-        Beam(wavelength=convert_eV_to_angstrom(energy_kev * 1000), flux=flux),
+        Beam(wavelength=convert_ev_to_angstrom(energy_kev * 1000), flux=flux),
         Attenuator(transmission=transmission_fraction),
     )

mx_bluesky/common/external_interaction/nexus/write_nexus.py

@@ -87,7 +87,7 @@ class NexusWriter:
         vds_shape = self.data_shape
 
         for filename in [self.nexus_file, self.master_file]:
-            NXmx_Writer = NXmxFileWriter(
+            nxmx_writer = NXmxFileWriter(
                 filename,
                 self.goniometer,
                 self.detector,
@@ -96,12 +96,12 @@ class NexusWriter:
                 self.attenuator,
                 self.full_num_of_images,
             )
-            NXmx_Writer.write(
+            nxmx_writer.write(
                 image_filename=f"{self.data_filename}",
                 start_time=start_time,
                 est_end_time=est_end_time,
             )
-            NXmx_Writer.write_vds(
+            nxmx_writer.write_vds(
                 vds_offset=self.start_index, vds_shape=vds_shape, vds_dtype=bit_depth
             )
 

mx_bluesky/common/parameters/constants.py

@@ -166,6 +166,6 @@ class Status(Enum):
 class FeatureSetting: ...  # List of features and their default values. Subclasses must also be a pydantic dataclass
 
 
-class FeatureSettingources(
+class FeatureSettingSources(
     StrEnum
 ): ...  # List of features and the name of that property in domain.properties

mx_bluesky/common/parameters/gridscan.py

@@ -109,7 +109,7 @@ class SpecifiedGrid(GridCommon, XyzStarts, WithScan, Generic[GridScanParamType])
 
     @property
     @abstractmethod
-    def FGS_params(self) -> GridScanParamType: ...
+    def fast_gridscan_params(self) -> GridScanParamType: ...
 
     def do_set_stub_offsets(self, value: bool):
         self._set_stub_offsets = value
@@ -167,7 +167,7 @@ class SpecifiedThreeDGridScan(
     grid2_omega_deg: float = Field(default=GridscanParamConstants.OMEGA_2)
 
     @property
-    def FGS_params(self) -> ZebraGridScanParamsThreeD:
+    def fast_gridscan_params(self) -> ZebraGridScanParamsThreeD:
         return ZebraGridScanParamsThreeD(
             x_steps=self.x_steps,
             y_steps=self.y_steps,

mx_bluesky/common/utils/exceptions.py

@@ -7,20 +7,22 @@ from bluesky.preprocessors import contingency_wrapper
 from bluesky.utils import Msg
 
 
-class WarningException(Exception):
+class WarningError(
+    Exception
+):  # see https://github.com/DiamondLightSource/mx-bluesky/issues/1394 on naming
     """An exception used when we want to warn GDA of a
     problem but continue with UDC anyway"""
 
     pass
 
 
-class ISPyBDepositionNotMade(Exception):
+class ISPyBDepositionNotMadeError(Exception):
     """Raised when the ISPyB or Zocalo callbacks can't access ISPyB deposition numbers."""
 
     pass
 
 
-class SampleException(WarningException):
+class SampleError(WarningError):
     """An exception which identifies an issue relating to the sample."""
 
     def __str__(self):
@@ -36,7 +38,7 @@ class SampleException(WarningException):
 T = TypeVar("T")
 
 
-class CrystalNotFoundException(SampleException):
+class CrystalNotFoundError(SampleError):
     """Raised if grid detection completed normally but no crystal was found."""
 
     def __init__(self, *args):
@@ -49,7 +51,7 @@ def catch_exception_and_warn(
     *args,
     **kwargs,
 ) -> Generator[Msg, None, T]:
-    """A plan wrapper to catch a specific exception and instead raise a WarningException,
+    """A plan wrapper to catch a specific exception and instead raise a WarningError,
     so that UDC is not halted
 
     Example usage:
@@ -58,12 +60,12 @@ def catch_exception_and_warn(
         ...
     yield from catch_exception_and_warn(ExceptionA, plan_which_can_raise_exception_a, **args, **kwargs)'
 
-    This will catch ExceptionA raised by the plan and instead raise a WarningException
+    This will catch ExceptionA raised by the plan and instead raise a WarningError
     """
 
     def warn_if_exception_matches(exception: Exception):
         if isinstance(exception, exception_to_catch):
-            raise SampleException(str(exception)) from exception
+            raise SampleError(str(exception)) from exception
         yield from null()
 
     return (

mx_bluesky/common/utils/log.py

@@ -10,11 +10,11 @@ from dodal.log import (
     integrate_bluesky_and_ophyd_logging,
     set_up_all_logging_handlers,
 )
-from dodal.log import LOGGER as dodal_logger
+from dodal.log import LOGGER as DODAL_LOGGER
 
 LOGGER = logging.getLogger("MX-Bluesky")
 LOGGER.setLevel("DEBUG")
-LOGGER.parent = dodal_logger
+LOGGER.parent = DODAL_LOGGER
 
 ISPYB_ZOCALO_CALLBACK_LOGGER = logging.getLogger("ISPyB and Zocalo callbacks")
 ISPYB_ZOCALO_CALLBACK_LOGGER.setLevel(logging.DEBUG)
@@ -68,7 +68,7 @@ def do_default_logging_setup(
     and bluesky and ophyd-async are optionally included."""
     logging_path, debug_logging_path = _get_logging_dirs(dev_mode)
     handlers = set_up_all_logging_handlers(
-        dodal_logger,
+        DODAL_LOGGER,
         logging_path,
         file_name,
         dev_mode,
@@ -78,7 +78,7 @@ def do_default_logging_setup(
     )
 
     if integrate_all_logs:
-        integrate_bluesky_and_ophyd_logging(dodal_logger)
+        integrate_bluesky_and_ophyd_logging(DODAL_LOGGER)
 
     handlers["graylog_handler"].addFilter(tag_filter)
 

mx_bluesky/common/utils/tracing.py

@@ -11,18 +11,18 @@ from opentelemetry.sdk.trace.export import BatchSpanProcessor
 def setup_tracing(service_name: str = "Hyperion"):
     resource = Resource(attributes={SERVICE_NAME: service_name})
 
-    traceProvider = TracerProvider(resource=resource)
+    trace_provider = TracerProvider(resource=resource)
     processor = BatchSpanProcessor(
         OTLPSpanExporter(endpoint="http://0.0.0.0:4318/v1/traces")
     )
-    traceProvider.add_span_processor(processor)
-    trace.set_tracer_provider(traceProvider)
+    trace_provider.add_span_processor(processor)
+    trace.set_tracer_provider(trace_provider)
 
     reader = PeriodicExportingMetricReader(
         OTLPMetricExporter(endpoint="http://0.0.0.0:4318/v1/metrics")
     )
-    meterProvider = MeterProvider(resource=resource, metric_readers=[reader])
-    metrics.set_meter_provider(meterProvider)
+    meter_provider = MeterProvider(resource=resource, metric_readers=[reader])
+    metrics.set_meter_provider(meter_provider)
 
 
 TRACER = trace.get_tracer(__name__)

mx_bluesky/common/utils/utils.py

@@ -4,23 +4,23 @@ from math import asin
 from scanspec.core import AxesPoints, Axis
 from scipy.constants import physical_constants
 
-hc_in_eV_and_Angstrom: float = (
+hc_in_ev_and_angstrom: float = (
     physical_constants["speed of light in vacuum"][0]
     * physical_constants["Planck constant in eV/Hz"][0]
     * 1e10  # Angstroms per metre
 )
 
 
-def interconvert_eV_Angstrom(wavelength_or_energy: float) -> float:
-    return hc_in_eV_and_Angstrom / wavelength_or_energy
+def interconvert_ev_angstrom(wavelength_or_energy: float) -> float:
+    return hc_in_ev_and_angstrom / wavelength_or_energy
 
 
-def convert_eV_to_angstrom(hv: float) -> float:
-    return interconvert_eV_Angstrom(hv)
+def convert_ev_to_angstrom(hv: float) -> float:
+    return interconvert_ev_angstrom(hv)
 
 
-def convert_angstrom_to_eV(wavelength: float) -> float:
-    return interconvert_eV_Angstrom(wavelength)
+def convert_angstrom_to_ev(wavelength: float) -> float:
+    return interconvert_ev_angstrom(wavelength)
 
 
 def number_of_frames_from_scan_spec(scan_points: AxesPoints[Axis]):
@@ -37,6 +37,6 @@ def energy_to_bragg_angle(energy_kev: float, d_a: float) -> float:
     Returns:
         The bragg angle in degrees
     """
-    wavelength_a = convert_eV_to_angstrom(energy_kev * 1000)
+    wavelength_a = convert_ev_to_angstrom(energy_kev * 1000)
     d = d_a
     return asin(wavelength_a / (2 * d)) * 180 / math.pi

mx_bluesky/hyperion/__main__.py

@@ -22,7 +22,7 @@ from mx_bluesky.common.utils.log import (
 from mx_bluesky.hyperion.baton_handler import run_forever
 from mx_bluesky.hyperion.experiment_plans.experiment_registry import (
     PLAN_REGISTRY,
-    PlanNotFound,
+    PlanNotFoundError,
 )
 from mx_bluesky.hyperion.external_interaction.agamemnon import (
     compare_params,
@@ -48,16 +48,16 @@ from mx_bluesky.hyperion.utils.context import setup_context
 def compose_start_args(context: BlueskyContext, plan_name: str, action: Actions):
     experiment_registry_entry = PLAN_REGISTRY.get(plan_name)
     if experiment_registry_entry is None:
-        raise PlanNotFound(f"Experiment plan '{plan_name}' not found in registry.")
+        raise PlanNotFoundError(f"Experiment plan '{plan_name}' not found in registry.")
 
     experiment_internal_param_type = experiment_registry_entry.get("param_type")
     plan = context.plan_functions.get(plan_name)
     if experiment_internal_param_type is None:
-        raise PlanNotFound(
+        raise PlanNotFoundError(
             f"Corresponding internal param type for '{plan_name}' not found in registry."
         )
     if plan is None:
-        raise PlanNotFound(
+        raise PlanNotFoundError(
             f"Experiment plan '{plan_name}' not found in context. Context has {context.plan_functions.keys()}"
         )
     try:
@@ -115,7 +115,7 @@ class StopOrStatus(Resource):
         status_and_message = StatusAndMessage(Status.FAILED, f"{action} not understood")
         if action == Actions.STATUS.value:
             LOGGER.debug(
-                f"Runner received status request - state of the runner object is: {self.runner.__dict__} - state of the RE is: {self.runner.RE.__dict__}"
+                f"Runner received status request - state of the runner object is: {self.runner.__dict__} - state of the run_engine is: {self.runner.run_engine.__dict__}"
             )
             status_and_message = self.runner.current_status
         return asdict(status_and_message)

mx_bluesky/hyperion/baton_handler.py

@@ -9,6 +9,7 @@ from bluesky.utils import MsgGenerator, RunEngineInterrupted
 from dodal.common.beamlines.commissioning_mode import set_commissioning_signal
 from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.baton import Baton
+from dodal.devices.detector.detector_motion import DetectorMotion, ShutterState
 from dodal.devices.motors import XYZStage
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import Smargon
@@ -38,7 +39,7 @@ from mx_bluesky.hyperion.external_interaction.agamemnon import (
 from mx_bluesky.hyperion.external_interaction.alerting.constants import Subjects
 from mx_bluesky.hyperion.parameters.components import Wait
 from mx_bluesky.hyperion.parameters.load_centre_collect import LoadCentreCollect
-from mx_bluesky.hyperion.plan_runner import PlanException, PlanRunner
+from mx_bluesky.hyperion.plan_runner import PlanError, PlanRunner
 from mx_bluesky.hyperion.utils.context import (
     clear_all_device_caches,
     setup_devices,
@@ -53,7 +54,7 @@ def run_forever(runner: PlanRunner):
         while True:
             try:
                 run_udc_when_requested(runner.context, runner)
-            except PlanException as e:
+            except PlanError as e:
                 LOGGER.info(
                     "Caught exception during plan execution, stopped and waiting for baton.",
                     exc_info=e,
@@ -64,7 +65,7 @@ def run_forever(runner: PlanRunner):
         # RunEngine.abort() will have been called and we will get RunEngineInterrupted
         LOGGER.info(
             f"RunEngine was interrupted. Runner state is {runner.current_status}, "
-            f"run engine is {runner.RE.state}"
+            f"run engine is {runner.run_engine.state}"
         )
 
 
@@ -93,7 +94,7 @@ def run_udc_when_requested(context: BlueskyContext, runner: PlanRunner):
         * A user requests the baton away from Hyperion
         * Hyperion releases the baton when Agamemnon has no more instructions
         * The RunEngine raises a RequestAbort exception, most likely due to a shutdown command
-        * A plan raises an exception not of type WarningException (which is then wrapped as a PlanException)
+        * A plan raises an exception not of type WarningError (which is then wrapped as a PlanError)
         Args:
             baton: The baton device
             runner: The runner
@@ -109,7 +110,7 @@ def run_udc_when_requested(context: BlueskyContext, runner: PlanRunner):
                 baton, runner, current_visit
             )
         if current_visit:
-            yield from _perform_robot_unload(runner.context, current_visit)
+            yield from _clean_up_udc(runner.context, current_visit)
 
     def release_baton() -> MsgGenerator:
         # If hyperion has given up the baton itself we need to also release requested
@@ -145,13 +146,13 @@ def _initialise_udc(context: BlueskyContext, dev_mode: bool):
 
 def _wait_for_hyperion_requested(baton: Baton):
     LOGGER.debug("Hyperion waiting for baton...")
-    SLEEP_PER_CHECK = 0.1
+    sleep_per_check = 0.1
     while True:
         requested_user = yield from bps.rd(baton.requested_user)
         if requested_user == HYPERION_USER:
             LOGGER.debug("Baton requested for Hyperion")
             break
-        yield from bps.sleep(SLEEP_PER_CHECK)
+        yield from bps.sleep(sleep_per_check)
 
 
 def _fetch_and_process_agamemnon_instruction(
@@ -239,11 +240,17 @@ def _unrequest_baton(baton: Baton) -> MsgGenerator[str]:
     return requested_user
 
 
-def _perform_robot_unload(context: BlueskyContext, visit: str) -> MsgGenerator:
+def _clean_up_udc(context: BlueskyContext, visit: str) -> MsgGenerator:
+    cleanup_group = "cleanup"
     robot = find_device_in_context(context, "robot", BartRobot)
     smargon = find_device_in_context(context, "smargon", Smargon)
     aperture_scatterguard = find_device_in_context(
         context, "aperture_scatterguard", ApertureScatterguard
     )
     lower_gonio = find_device_in_context(context, "lower_gonio", XYZStage)
+    detector_motion = find_device_in_context(context, "detector_motion", DetectorMotion)
+    yield from bps.abs_set(
+        detector_motion.shutter, ShutterState.CLOSED, group=cleanup_group
+    )
     yield from robot_unload(robot, smargon, aperture_scatterguard, lower_gonio, visit)
+    yield from bps.wait(cleanup_group)