dls-dodal 1.35.0__tar.gz → 1.36.1a0__tar.gz

{dls_dodal-1.35.0 → dls_dodal-1.36.1a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.35.0
+Version: 1.36.1a0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async==0.8.0a4
+Requires-Dist: ophyd-async>=0.8.0a5
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -233,11 +233,13 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: deepdiff
+Requires-Dist: scanspec>=0.7.3
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
+Requires-Dist: ophyd_async[sim]; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

dls_dodal-1.36.1a0/docs/explanations/decisions/0003-make-devices-factory.md

@@ -0,0 +1,28 @@
+# 3. Add device factory decorator with lazy connect support
+
+Date: 2024-04-26
+
+## Status
+
+Accepted
+
+## Context
+
+Device instances should be capable of being created without necessarily connecting, so long as they are connected prior to being utilised to collect data. The current method puts requirements on the init method of device classes, and does not expose all options for connecting to ophyd-async devices.
+
+## Decision
+
+DAQ members led us to this proposal:
+
+- ophyd-async: make Device.connect(mock, timeout, force=False) idempotent
+- ophyd-async: make ensure_connected(\*devices) plan stub
+- dodal: make device_factory() decorator that may construct, name, cache and connect a device
+- dodal: collect_factories() returns all device factories
+- blueapi: call collect_factories(), instantiate and connect Devices appropriately, log those that fail
+- blueapi: when plan is called, run ensure_connected on all plan args and defaults that are Devices
+
+We can then iterate on this if the parallel connect causes a broadcast storm. We could also in future add a monitor to a heartbeat PV per device in Device.connect so that it would reconnect next time it was called.
+
+## Consequences
+
+Beamlines will be converted to use the decorator, and default arguments to plans should be replaced with a non-eagerly connecting call to the initializer controlling device.

{dls_dodal-1.35.0 → dls_dodal-1.36.1a0}/pyproject.toml

@@ -15,7 +15,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async==0.8.0a4",
+    "ophyd-async >= 0.8.0a5",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -32,6 +32,7 @@ dependencies = [
     "aiohttp",
     "redis",
     "deepdiff",
+    "scanspec>=0.7.3",
 ]
 
 dynamic = ["version"]
@@ -47,6 +48,7 @@ dev = [
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
     "myst-parser",
+    "ophyd_async[sim]",
     "pipdeptree",
     "pre-commit",
     "psutil",

{dls_dodal-1.35.0 → dls_dodal-1.36.1a0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.35.0
+Version: 1.36.1a0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async==0.8.0a4
+Requires-Dist: ophyd-async>=0.8.0a5
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -233,11 +233,13 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: deepdiff
+Requires-Dist: scanspec>=0.7.3
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
+Requires-Dist: ophyd_async[sim]; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

{dls_dodal-1.35.0 → dls_dodal-1.36.1a0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ docs/assets/zocalo.png
 docs/explanations/decisions.md
 docs/explanations/decisions/0001-record-architecture-decisions.md
 docs/explanations/decisions/0002-switched-to-python-copier-template.md
+docs/explanations/decisions/0003-make-devices-factory.md
 docs/explanations/decisions/COPYME
 docs/how-to/build-docs.md
 docs/how-to/contribute.md
@@ -134,6 +135,7 @@ src/dodal/devices/logging_ophyd_device.py
 src/dodal/devices/motors.py
 src/dodal/devices/p45.py
 src/dodal/devices/pgm.py
+src/dodal/devices/pressure_jump_cell.py
 src/dodal/devices/qbpm.py
 src/dodal/devices/robot.py
 src/dodal/devices/s4_slit_gaps.py
@@ -175,10 +177,13 @@ src/dodal/devices/i22/fswitch.py
 src/dodal/devices/i22/nxsas.py
 src/dodal/devices/i24/__init__.py
 src/dodal/devices/i24/aperture.py
+src/dodal/devices/i24/beam_center.py
 src/dodal/devices/i24/beamstop.py
 src/dodal/devices/i24/dcm.py
 src/dodal/devices/i24/dual_backlight.py
+src/dodal/devices/i24/focus_mirrors.py
 src/dodal/devices/i24/i24_detector_motion.py
+src/dodal/devices/i24/pilatus_metadata.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/i24/vgonio.py
 src/dodal/devices/oav/__init__.py
@@ -212,9 +217,14 @@ src/dodal/devices/zocalo/zocalo_constants.py
 src/dodal/devices/zocalo/zocalo_interaction.py
 src/dodal/devices/zocalo/zocalo_results.py
 src/dodal/parameters/experiment_parameter_base.py
-src/dodal/plans/check_topup.py
-src/dodal/plans/data_session_metadata.py
-src/dodal/plans/motor_util_plans.py
+src/dodal/plan_stubs/__init__.py
+src/dodal/plan_stubs/check_topup.py
+src/dodal/plan_stubs/data_session.py
+src/dodal/plan_stubs/motor_utils.py
+src/dodal/plan_stubs/wrapped.py
+src/dodal/plans/__init__.py
+src/dodal/plans/scanspec.py
+src/dodal/plans/wrapped.py
 system_tests/__init__.py
 system_tests/test_aperturescatterguard_system.py
 system_tests/test_eiger_system.py
@@ -235,6 +245,7 @@ tests/fake_beamline_dependencies.py
 tests/fake_beamline_disordered_dependencies.py
 tests/fake_beamline_misbehaving_builtins.py
 tests/fake_beamline_some_devices_working.py
+tests/fake_device_factory_beamline.py
 tests/test_cli.py
 tests/test_utils.py
 tests/beamlines/__init__.py
@@ -290,6 +301,7 @@ tests/devices/unit_tests/test_linkam3.py
 tests/devices/unit_tests/test_lookup_table.txt
 tests/devices/unit_tests/test_lookup_table_2.txt
 tests/devices/unit_tests/test_odin.py
+tests/devices/unit_tests/test_pressure_jump_cell.py
 tests/devices/unit_tests/test_qbpm.py
 tests/devices/unit_tests/test_shutter.py
 tests/devices/unit_tests/test_slits.py
@@ -313,6 +325,8 @@ tests/devices/unit_tests/detector/test_det_resolution.py
 tests/devices/unit_tests/detector/test_detector.py
 tests/devices/unit_tests/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
+tests/devices/unit_tests/i24/test_focus_mirrors.py
+tests/devices/unit_tests/i24/test_pilatus_metadata.py
 tests/devices/unit_tests/i24/test_pmac.py
 tests/devices/unit_tests/i24/test_vgonio.py
 tests/devices/unit_tests/oav/__init__.py
@@ -338,8 +352,13 @@ tests/fake_zocalo/README.rst
 tests/fake_zocalo/__init__.py
 tests/fake_zocalo/__main__.py
 tests/fake_zocalo/dls_start_fake_zocalo.sh
-tests/plans/test_motor_util_plans.py
-tests/plans/test_topup_plan.py
+tests/plan_stubs/test_motor_util_plans.py
+tests/plan_stubs/test_topup_plan.py
+tests/plan_stubs/test_wrapped_stubs.py
+tests/plans/conftest.py
+tests/plans/test_compliance.py
+tests/plans/test_scanspec.py
+tests/plans/test_wrapped.py
 tests/preprocessors/test_filesystem_metadata.py
 tests/test_data/bad_beamlineParameters
 tests/test_data/i04_beamlineParameters

{dls_dodal-1.35.0 → dls_dodal-1.36.1a0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async==0.8.0a4
+ophyd-async>=0.8.0a5
 bluesky
 pyepics
 dataclasses-json
@@ -17,12 +17,14 @@ aiofiles
 aiohttp
 redis
 deepdiff
+scanspec>=0.7.3
 
 [dev]
 black
 diff-cover
 mypy
 myst-parser
+ophyd_async[sim]
 pipdeptree
 pre-commit
 psutil

{dls_dodal-1.35.0 → dls_dodal-1.36.1a0}/src/dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.35.0'
-__version_tuple__ = version_tuple = (1, 35, 0)
+__version__ = version = '1.36.1a0'
+__version_tuple__ = version_tuple = (1, 36, 1)

{dls_dodal-1.35.0 → dls_dodal-1.36.1a0}/src/dodal/beamlines/b01_1.py

@@ -4,16 +4,19 @@ from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
-    device_instantiation,
+    device_factory,
     get_path_provider,
     set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.beamlines.device_helpers import HDF5_PREFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix
 
 BL = "c01"
+PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
@@ -36,42 +39,24 @@ https://argocd.diamond.ac.uk/applications?showFavorites=false&proj=&sync=&autoSy
 """
 
 
-def panda(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> HDFPanda:
-    return device_instantiation(
-        device_factory=HDFPanda,
-        name="panda",
-        prefix="-EA-PANDA-01:",
-        wait=wait_for_connection,
-        fake=fake_with_ophyd_sim,
+@device_factory()
+def panda() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
         path_provider=get_path_provider(),
     )
 
 
-def synchrotron(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> Synchrotron:
-    return device_instantiation(
-        Synchrotron,
-        "synchrotron",
-        "",
-        wait_for_connection,
-        fake_with_ophyd_sim,
-        bl_prefix=False,
-    )
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
 
 
-def manta(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> AravisDetector:
-    return device_instantiation(
-        AravisDetector,
-        "manta",
-        "-DI-DCAM-02:",
-        wait_for_connection,
-        fake_with_ophyd_sim,
+@device_factory()
+def manta() -> AravisDetector:
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-DI-DCAM-02:",
         path_provider=get_path_provider(),
         drv_suffix="CAM:",
-        hdf_suffix="HDF5:",
+        hdf_suffix=HDF5_PREFIX,
     )

dls_dodal-1.36.1a0/src/dodal/beamlines/i22.py

@@ -0,0 +1,251 @@
+from pathlib import Path
+
+from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adpilatus import PilatusDetector
+from ophyd_async.fastcs.panda import HDFPanda
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    get_path_provider,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.beamlines.device_helpers import HDF5_PREFIX
+from dodal.common.crystal_metadata import (
+    MaterialsEnum,
+    make_crystal_metadata_from_material,
+)
+from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.focusing_mirror import FocusingMirror
+from dodal.devices.i22.dcm import DoubleCrystalMonochromator
+from dodal.devices.i22.fswitch import FSwitch
+from dodal.devices.i22.nxsas import NXSasMetadataHolder, NXSasOAV, NXSasPilatus
+from dodal.devices.linkam3 import Linkam3
+from dodal.devices.slits import Slits
+from dodal.devices.synchrotron import Synchrotron
+from dodal.devices.tetramm import TetrammDetector
+from dodal.devices.undulator import Undulator
+from dodal.devices.watsonmarlow323_pump import WatsonMarlow323Pump
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i22")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+# Currently we must hard-code the visit, determining the visit at runtime requires
+# infrastructure that is still WIP.
+# Communication with GDA is also WIP so for now we determine an arbitrary scan number
+# locally and write the commissioning directory. The scan number is not guaranteed to
+# be unique and the data is at risk - this configuration is for testing only.
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/i22/data/2024/cm37271-2/bluesky"),
+        client=RemoteDirectoryServiceClient("http://i22-control:8088/api"),
+    )
+)
+
+
+@device_factory()
+def saxs() -> PilatusDetector:
+    metadata_holder = NXSasMetadataHolder(
+        x_pixel_size=(1.72e-1, "mm"),
+        y_pixel_size=(1.72e-1, "mm"),
+        description="Dectris Pilatus3 2M",
+        type="Photon Counting Hybrid Pixel",
+        sensor_material="silicon",
+        sensor_thickness=(0.45, "mm"),
+        distance=(4711.833684146172, "mm"),
+    )
+    return NXSasPilatus(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
+        path_provider=get_path_provider(),
+        drv_suffix="CAM:",
+        hdf_suffix=HDF5_PREFIX,
+        metadata_holder=metadata_holder,
+    )
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def waxs() -> PilatusDetector:
+    metadata_holder = NXSasMetadataHolder(
+        x_pixel_size=(1.72e-1, "mm"),
+        y_pixel_size=(1.72e-1, "mm"),
+        description="Dectris Pilatus3 2M",
+        type="Photon Counting Hybrid Pixel",
+        sensor_material="silicon",
+        sensor_thickness=(0.45, "mm"),
+        distance=(175.4199417092314, "mm"),
+    )
+    return NXSasPilatus(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-03:",
+        path_provider=get_path_provider(),
+        drv_suffix="CAM:",
+        hdf_suffix=HDF5_PREFIX,
+        metadata_holder=metadata_holder,
+    )
+
+
+@device_factory()
+def i0() -> TetrammDetector:
+    return TetrammDetector(
+        prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:",
+        path_provider=get_path_provider(),
+        type="Cividec Diamond XBPM",
+    )
+
+
+@device_factory()
+def it() -> TetrammDetector:
+    return TetrammDetector(
+        prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:",
+        path_provider=get_path_provider(),
+        type="PIN Diode",
+    )
+
+
+@device_factory()
+def vfm() -> FocusingMirror:
+    return FocusingMirror(
+        prefix=f"{PREFIX.beamline_prefix}-OP-KBM-01:VFM:",
+    )
+
+
+@device_factory()
+def hfm() -> FocusingMirror:
+    return FocusingMirror(
+        prefix=f"{PREFIX.beamline_prefix}-OP-KBM-01:HFM:",
+    )
+
+
+@device_factory()
+def dcm() -> DoubleCrystalMonochromator:
+    return DoubleCrystalMonochromator(
+        prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:",
+        temperature_prefix=f"{PREFIX.beamline_prefix}-DI-DCM-01:",
+        crystal_1_metadata=make_crystal_metadata_from_material(
+            MaterialsEnum.Si, (1, 1, 1)
+        ),
+        crystal_2_metadata=make_crystal_metadata_from_material(
+            MaterialsEnum.Si, (1, 1, 1)
+        ),
+    )
+
+
+@device_factory()
+def undulator() -> Undulator:
+    return Undulator(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        id_gap_lookup_table_path="/dls_sw/i22/software/daq_configuration/lookup/BeamLine_Undulator_toGap.txt",
+        poles=80,
+        length=2.0,
+    )
+
+
+@device_factory()
+def slits_1() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:")
+
+
+@device_factory()
+def slits_2() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:")
+
+
+@device_factory()
+def slits_3() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:")
+
+
+@device_factory()
+def slits_4() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:")
+
+
+@device_factory()
+def slits_5() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:")
+
+
+@device_factory()
+def slits_6() -> Slits:
+    return Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:")
+
+
+@device_factory()
+def fswitch() -> FSwitch:
+    return FSwitch(
+        prefix=f"{PREFIX.beamline_prefix}-MO-FSWT-01:",
+        lens_geometry="paraboloid",
+        cylindrical=True,
+        lens_material="Beryllium",
+    )
+
+
+# Must document what PandAs are physically connected to
+# See: https://github.com/bluesky/ophyd-async/issues/284
+@device_factory()
+def panda1() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory(skip=True)
+def panda2() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-02:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory(skip=True)
+def panda3() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-03:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory(skip=True)
+def panda4() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-04:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory()
+def oav() -> AravisDetector:
+    metadata_holder = NXSasMetadataHolder(
+        x_pixel_size=(3.45e-3, "mm"),  # Double check this figure
+        y_pixel_size=(3.45e-3, "mm"),
+        description="AVT Mako G-507B",
+        distance=(-1.0, "m"),
+    )
+    return NXSasOAV(
+        prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+        drv_suffix="DET:",
+        hdf_suffix=HDF5_PREFIX,
+        path_provider=get_path_provider(),
+        metadata_holder=metadata_holder,
+    )
+
+
+@device_factory(skip=True)
+def linkam() -> Linkam3:
+    return Linkam3(prefix=f"{PREFIX.beamline_prefix}-EA-TEMPC-05:")
+
+
+@device_factory()
+def ppump() -> WatsonMarlow323Pump:
+    """Sample Environment Peristaltic Pump"""
+    return WatsonMarlow323Pump(f"{PREFIX.beamline_prefix}-EA-PUMP-01:")

{dls_dodal-1.35.0 → dls_dodal-1.36.1a0}/src/dodal/beamlines/i24.py

@@ -1,16 +1,16 @@
-from dodal.common.beamlines.beamline_utils import (
-    BL,
-    device_instantiation,
-)
+from dodal.common.beamlines.beamline_utils import BL, device_instantiation
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.detector import DetectorParams
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.i24.aperture import Aperture
+from dodal.devices.i24.beam_center import DetectorBeamCenter
 from dodal.devices.i24.beamstop import Beamstop
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
+from dodal.devices.i24.focus_mirrors import FocusMirrorsMode
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
+from dodal.devices.i24.pilatus_metadata import PilatusMetadata
 from dodal.devices.i24.pmac import PMAC
 from dodal.devices.i24.vgonio import VerticalGoniometer
 from dodal.devices.oav.oav_detector import OAV
@@ -70,7 +70,6 @@ def backlight(
     )
 
 
-@skip_device(lambda: BL == "s24")
 def detector_motion(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
 ) -> DetectorMotion:
@@ -151,7 +150,6 @@ def oav(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) ->
     )
 
 
-@skip_device(lambda: BL == "s24")
 def vgonio(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
 ) -> VerticalGoniometer:
@@ -180,7 +178,6 @@ def zebra(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -
     )
 
 
-@skip_device(lambda: BL == "s24")
 def shutter(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
 ) -> HutchShutter:
@@ -194,3 +191,55 @@ def shutter(
         wait_for_connection,
         fake_with_ophyd_sim,
     )
+
+
+def focus_mirrors(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> FocusMirrorsMode:
+    """Get the i24 focus mirror devise to find the beam size."""
+    return device_instantiation(
+        FocusMirrorsMode,
+        "focus_mirrors",
+        "-OP-MFM-01:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )
+
+
+def eiger_beam_center(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> DetectorBeamCenter:
+    """A device for setting/reading the beamcenter from the eiger on i24."""
+    return device_instantiation(
+        DetectorBeamCenter,
+        "eiger_bc",
+        "-EA-EIGER-01:CAM:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )
+
+
+def pilatus_beam_center(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> DetectorBeamCenter:
+    """A device for setting/reading the beamcenter from the pilatus on i24."""
+    return device_instantiation(
+        DetectorBeamCenter,
+        "pilatus_bc",
+        "-EA-PILAT-01:cam1:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )
+
+
+def pilatus_metadata(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> PilatusMetadata:
+    """A small pilatus driver device for figuring out the filename template."""
+    return device_instantiation(
+        PilatusMetadata,
+        "pilatus_meta",
+        "-EA-PILAT-01:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )