Support scintillator safe move

pyproject.toml

@@ -57,7 +57,7 @@ dependencies = [
     "ophyd >= 1.10.5",
     "ophyd-async >= 0.14.0",
     "bluesky >= 1.14.6",
-    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@main",
+    "dls-dodal @ git+https://github.com/DiamondLightSource/dodal.git@mx-bluesky_1354_scintillator_safe_move",
 ]
 
 

src/mx_bluesky/beamlines/i04/experiment_plans/i04_grid_detect_then_xray_centre_plan.py

@@ -6,7 +6,6 @@
 import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.beamlines.i04.beamsize import Beamsize
@@ -19,6 +18,10 @@
     set_fast_grid_scan_params,
 )
 from dodal.devices.flux import Flux
+from dodal.devices.mx_phase1.aperturescatterguard import (
+    ApertureScatterguard,
+    ApertureValue,
+)
 from dodal.devices.mx_phase1.beamstop import Beamstop
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection

src/mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py

@@ -10,9 +10,9 @@
 from dodal.devices.beamlines.i04.beam_centre import CentreEllipseMethod
 from dodal.devices.beamlines.i04.max_pixel import MaxPixel
 from dodal.devices.mx_phase1.beamstop import Beamstop, BeamstopPositions
+from dodal.devices.mx_phase1.scintillator import InOut, Scintillator
 from dodal.devices.oav.oav_detector import OAV, ZoomControllerWithBeamCentres
 from dodal.devices.robot import BartRobot, PinMounted
-from dodal.devices.scintillator import InOut, Scintillator
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.zebra.zebra_controlled_shutter import (
     ZebraShutter,

src/mx_bluesky/common/device_setup_plans/manipulate_sample.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 import bluesky.plan_stubs as bps
-from dodal.devices.aperturescatterguard import (
+from dodal.devices.backlight import Backlight, InOut
+from dodal.devices.detector.detector_motion import DetectorMotion
+from dodal.devices.mx_phase1.aperturescatterguard import (
     ApertureScatterguard,
     ApertureValue,
 )
-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
 

src/mx_bluesky/common/device_setup_plans/robot_load_unload.py

@@ -3,8 +3,11 @@
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from bluesky.utils import MsgGenerator
-from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.motors import XYZStage
+from dodal.devices.mx_phase1.aperturescatterguard import (
+    ApertureScatterguard,
+    ApertureValue,
+)
 from dodal.devices.robot import SAMPLE_LOCATION_EMPTY, BartRobot
 from dodal.devices.smargon import CombinedMove, Smargon, StubPosition
 from dodal.plan_stubs.motor_utils import MoveTooLargeError, home_and_reset_wrapper

src/mx_bluesky/common/experiment_plans/beamstop_check.py

@@ -2,12 +2,15 @@
 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.aperturescatterguard import (
+    ApertureScatterguard,
+    ApertureValue,
+)
 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

src/mx_bluesky/common/experiment_plans/change_aperture_then_move_plan.py

@@ -1,6 +1,9 @@
 import bluesky.plan_stubs as bps
 import numpy
-from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
+from dodal.devices.mx_phase1.aperturescatterguard import (
+    ApertureScatterguard,
+    ApertureValue,
+)
 from dodal.devices.smargon import Smargon, StubPosition
 
 from mx_bluesky.common.device_setup_plans.manipulate_sample import move_x_y_z

src/mx_bluesky/common/experiment_plans/inner_plans/read_hardware.py

@@ -4,12 +4,12 @@
 
 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.mx_phase1.aperturescatterguard import ApertureScatterguard
 from dodal.devices.s4_slit_gaps import S4SlitGaps
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron

src/mx_bluesky/common/experiment_plans/oav_snapshot_plan.py

@@ -3,8 +3,11 @@
 
 from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator
-from dodal.devices.aperturescatterguard import ApertureScatterguard, ApertureValue
 from dodal.devices.backlight import Backlight, InOut
+from dodal.devices.mx_phase1.aperturescatterguard import (
+    ApertureScatterguard,
+    ApertureValue,
+)
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.smargon import Smargon

src/mx_bluesky/common/parameters/components.py

@@ -7,11 +7,11 @@
 from pathlib import Path
 from typing import Literal, Self, SupportsInt, cast
 
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector import (
     DetectorParams,
     TriggerMode,
 )
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureValue
 from pydantic import (
     BaseModel,
     ConfigDict,

src/mx_bluesky/common/parameters/constants.py

@@ -1,8 +1,8 @@
 import os
 from enum import Enum, StrEnum
 
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector import EIGER2_X_16M_SIZE
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureValue
 from dodal.devices.zocalo.zocalo_constants import ZOCALO_ENV as ZOCALO_ENV_FROM_DODAL
 from dodal.utils import get_beamline_name
 from pydantic.dataclasses import dataclass

src/mx_bluesky/common/parameters/device_composites.py

@@ -1,7 +1,4 @@
 import pydantic
-from dodal.devices.aperturescatterguard import (
-    ApertureScatterguard,
-)
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.beamsize.beamsize import BeamsizeBase
@@ -12,6 +9,9 @@
     ZebraFastGridScanThreeD,
 )
 from dodal.devices.flux import Flux
+from dodal.devices.mx_phase1.aperturescatterguard import (
+    ApertureScatterguard,
+)
 from dodal.devices.mx_phase1.beamstop import Beamstop
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection

src/mx_bluesky/common/parameters/gridscan.py

@@ -3,13 +3,13 @@
 from abc import abstractmethod
 from typing import Generic, TypeVar
 
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector.det_dim_constants import EIGER2_X_9M_SIZE, EIGER2_X_16M_SIZE
 from dodal.devices.detector.detector import DetectorParams
 from dodal.devices.fast_grid_scan import (
     GridScanParamsCommon,
     ZebraGridScanParamsThreeD,
 )
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureValue
 from dodal.utils import get_beamline_name
 from pydantic import Field, PrivateAttr
 from scanspec.core import Path as ScanPath

src/mx_bluesky/common/parameters/rotation.py

@@ -6,8 +6,8 @@
 from typing import Annotated, Any, Self
 
 from annotated_types import Len
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.detector import DetectorParams
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureValue
 from dodal.devices.zebra.zebra import (
     RotationDirection,
 )

src/mx_bluesky/hyperion/blueapi_plans/__init__.py

@@ -8,9 +8,9 @@
 from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator
 from dodal.common import inject
-from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.detector.detector_motion import DetectorMotion, ShutterState
 from dodal.devices.motors import XYZStage
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureScatterguard
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import Smargon
 

src/mx_bluesky/hyperion/experiment_plans/robot_load_and_change_energy.py

@@ -10,13 +10,13 @@
 import pydantic
 from blueapi.core import BlueskyContext
 from bluesky.utils import Msg
-from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight, InOut
 from dodal.devices.beamlines.i03.dcm import DCM
 from dodal.devices.beamlines.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.motors import XYZStage
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureScatterguard
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.robot import BartRobot, SampleLocation
 from dodal.devices.smargon import Smargon

src/mx_bluesky/hyperion/experiment_plans/robot_load_then_centre_plan.py

@@ -7,7 +7,6 @@
 from blueapi.core import BlueskyContext
 from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator
-from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.beamlines.i03 import Beamstop
@@ -20,6 +19,7 @@
 from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.motors import XYZStage
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureScatterguard
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.robot import BartRobot, SampleLocation

src/mx_bluesky/hyperion/experiment_plans/rotation_scan_plan.py

@@ -3,7 +3,6 @@
 import pydantic
 from blueapi.core import BlueskyContext
 from bluesky.utils import MsgGenerator
-from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.beamlines.i03 import Beamstop
@@ -12,6 +11,7 @@
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.flux import Flux
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureScatterguard
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVParameters
 from dodal.devices.robot import BartRobot

src/mx_bluesky/hyperion/experiment_plans/udc_default_state.py

@@ -4,7 +4,6 @@
 from dodal.common.beamlines.beamline_parameters import (
     get_beamline_parameters,
 )
-from dodal.devices.aperturescatterguard import ApertureValue
 from dodal.devices.collimation_table import CollimationTable
 from dodal.devices.cryostream import (
     CryoStreamGantry,
@@ -16,11 +15,12 @@
 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.aperturescatterguard import ApertureValue
 from dodal.devices.mx_phase1.beamstop import BeamstopPositions
+from dodal.devices.mx_phase1.scintillator import InOut as ScinInOut
+from dodal.devices.mx_phase1.scintillator import Scintillator, move_scintillator_safely
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.robot import BartRobot, PinMounted
-from dodal.devices.scintillator import InOut as ScinInOut
-from dodal.devices.scintillator import Scintillator
 from dodal.devices.smargon import Smargon
 from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutterState
 
@@ -79,7 +79,7 @@ def move_to_udc_default_state(devices: UDCDefaultDevices):
             devices.hutch_shutter, ShutterDemand.OPEN, group=_GROUP_PRE_BEAMSTOP_CHECK
         )
 
-    yield from bps.abs_set(devices.scintillator.selected_pos, ScinInOut.OUT, wait=True)
+    yield from move_scintillator_safely(devices.scintillator, ScinInOut.OUT)
 
     yield from bps.abs_set(
         devices.fluorescence_det_motion.pos,

src/mx_bluesky/hyperion/in_process_runner.py

@@ -5,9 +5,9 @@
 from blueapi.core import BlueskyContext
 from bluesky import plan_stubs as bps
 from bluesky.utils import MsgGenerator, RequestAbort
-from dodal.devices.aperturescatterguard import ApertureScatterguard
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.motors import XYZStage
+from dodal.devices.mx_phase1.aperturescatterguard import ApertureScatterguard
 from dodal.devices.robot import BartRobot
 from dodal.devices.smargon import Smargon
 

src/mx_bluesky/hyperion/parameters/device_composites.py

@@ -1,9 +1,6 @@
 from __future__ import annotations
 
 import pydantic
-from dodal.devices.aperturescatterguard import (
-    ApertureScatterguard,
-)
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.beamlines.i03.beamsize import Beamsize
@@ -14,6 +11,9 @@
     ZebraFastGridScanThreeD,
 )
 from dodal.devices.flux import Flux
+from dodal.devices.mx_phase1.aperturescatterguard import (
+    ApertureScatterguard,
+)
 from dodal.devices.robot import BartRobot
 from dodal.devices.s4_slit_gaps import S4SlitGaps
 from dodal.devices.synchrotron import Synchrotron