dls-dodal 1.65.0__py3-none-any.whl → 1.67.0__py3-none-any.whl

dodal/beamlines/i03.py

@@ -1,17 +1,14 @@
-from ophyd_async.core import Reference
+from functools import cache
+
+from ophyd_async.core import PathProvider, Reference
 from ophyd_async.fastcs.eiger import EigerDetector as FastEiger
 from ophyd_async.fastcs.panda import HDFPanda
 from yarl import URL
 
 from dodal.common.beamlines.beamline_parameters import get_beamline_parameters
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-    device_instantiation,
-    get_path_provider,
-    set_path_provider,
-)
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.udc_directory_provider import PandASubpathProvider
+from dodal.device_manager import DeviceManager
 from dodal.devices.aperturescatterguard import (
     AperturePosition,
     ApertureScatterguard,
@@ -21,7 +18,11 @@ from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.baton import Baton
 from dodal.devices.collimation_table import CollimationTable
-from dodal.devices.cryostream import CryoStream, CryoStreamGantry
+from dodal.devices.cryostream import (
+    CryoStreamGantry,
+    OxfordCryoJet,
+    OxfordCryoStream,
+)
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.diamond_filter import DiamondFilter, I03Filters
 from dodal.devices.eiger import EigerDetector
@@ -31,8 +32,10 @@ from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.i03 import Beamstop
+from dodal.devices.i03.beamsize import Beamsize
 from dodal.devices.i03.dcm import DCM
 from dodal.devices.i03.undulator_dcm import UndulatorDCM
+from dodal.devices.ipin import IPin
 from dodal.devices.motors import XYZStage
 from dodal.devices.oav.oav_detector import OAVBeamCentreFile
 from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
@@ -44,7 +47,7 @@ from dodal.devices.scintillator import Scintillator
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 from dodal.devices.webcam import Webcam
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.xspress3.xspress3 import Xspress3
@@ -69,8 +72,6 @@ BL = get_beamline_name("i03")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-set_path_provider(PandASubpathProvider())
-
 I03_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(TTL_DETECTOR=1, TTL_SHUTTER=2, TTL_XSPRESS3=3, TTL_PANDA=4),
     sources=ZebraSources(),
@@ -78,13 +79,22 @@ I03_ZEBRA_MAPPING = ZebraMapping(
 
 PREFIX = BeamlinePrefix(BL)
 
+devices = DeviceManager()
+
 
-@device_factory()
+@devices.fixture
+@cache
+def path_provider() -> PathProvider:
+    return PandASubpathProvider()
+
+
+@devices.fixture
+def daq_configuration_path() -> str:
+    return DAQ_CONFIGURATION_PATH
+
+
+@devices.factory()
 def aperture_scatterguard() -> ApertureScatterguard:
-    """Get the i03 aperture and scatterguard device, instantiate it if it hasn't already
-    been. If this is called when already instantiated in i03, it will return the existing
-    object.
-    """
     params = get_beamline_parameters()
     return ApertureScatterguard(
         aperture_prefix=f"{PREFIX.beamline_prefix}-MO-MAPT-01:",
@@ -94,37 +104,28 @@ def aperture_scatterguard() -> ApertureScatterguard:
     )
 
 
-@device_factory()
+@devices.factory()
 def attenuator() -> BinaryFilterAttenuator:
-    """Get the i03 attenuator device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return BinaryFilterAttenuator(
         prefix=f"{PREFIX.beamline_prefix}-EA-ATTN-01:",
         num_filters=16,
     )
 
 
-@device_factory()
+@devices.factory()
 def beamstop() -> Beamstop:
-    """Get the i03 beamstop device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Beamstop(
         prefix=f"{PREFIX.beamline_prefix}-MO-BS-01:",
         beamline_parameters=get_beamline_parameters(),
     )
 
 
-@device_factory()
+@devices.factory()
 def dcm() -> DCM:
-    """Get the i03 DCM device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
-@device_factory()
+@devices.factory()
 def vfm() -> FocusingMirrorWithStripes:
     return FocusingMirrorWithStripes(
         prefix=f"{PREFIX.beamline_prefix}-OP-VFM-01:",
@@ -135,7 +136,7 @@ def vfm() -> FocusingMirrorWithStripes:
     )
 
 
-@device_factory()
+@devices.factory()
 def mirror_voltages() -> MirrorVoltages:
     return MirrorVoltages(
         prefix=f"{PREFIX.beamline_prefix}-MO-PSU-01:",
@@ -143,316 +144,219 @@ def mirror_voltages() -> MirrorVoltages:
     )
 
 
-@device_factory()
+@devices.factory()
 def backlight() -> Backlight:
-    """Get the i03 backlight device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Backlight(prefix=PREFIX.beamline_prefix)
 
 
-@device_factory()
+@devices.factory()
 def detector_motion() -> DetectorMotion:
-    """Get the i03 detector motion device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return DetectorMotion(
         device_prefix=f"{PREFIX.beamline_prefix}-MO-DET-01:",
         pmac_prefix=f"{PREFIX.beamline_prefix}-MO-PMAC-02:",
     )
 
 
-@device_factory()
-def eiger(mock: bool = False) -> EigerDetector:
-    """Get the i03 Eiger device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
+@devices.v1_init(EigerDetector, prefix="BL03I-EA-EIGER-01:", wait=False)
+def eiger(eiger: EigerDetector) -> EigerDetector:
+    return eiger
 
-    return device_instantiation(
-        device_factory=EigerDetector,
-        name="eiger",
-        prefix="-EA-EIGER-01:",
-        wait=False,
-        fake=mock,
-    )
-
-
-@device_factory()
-def fastcs_eiger() -> FastEiger:
-    """Get the i03 FastCS Eiger device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
 
+@devices.factory()
+def fastcs_eiger(path_provider: PathProvider) -> FastEiger:
     return FastEiger(
         prefix=PREFIX.beamline_prefix,
-        path_provider=get_path_provider(),
+        path_provider=path_provider,
         drv_suffix="-EA-EIGER-02:",
         hdf_suffix="-EA-EIGER-01:OD:",
     )
 
 
-@device_factory()
+@devices.factory()
 def zebra_fast_grid_scan() -> ZebraFastGridScanThreeD:
-    """Get the i03 zebra_fast_grid_scan device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return ZebraFastGridScanThreeD(
         prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:",
     )
 
 
-@device_factory()
+@devices.factory()
 def panda_fast_grid_scan() -> PandAFastGridScan:
-    """Get the i03 panda_fast_grid_scan device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    This is used instead of the zebra_fast_grid_scan device when using the PandA.
-    """
+    """This is used instead of the zebra_fast_grid_scan device when using the PandA."""
     return PandAFastGridScan(prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:")
 
 
-@device_factory()
+@devices.factory()
 def oav(
     params: OAVConfigBeamCentre | None = None,
 ) -> OAVBeamCentreFile:
-    """Get the i03 OAV device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return OAVBeamCentreFile(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
     )
 
 
-@device_factory()
+@devices.factory()
 def pin_tip_detection() -> PinTipDetection:
-    """Get the i03 pin tip detection device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return PinTipDetection(f"{PREFIX.beamline_prefix}-DI-OAV-01:")
 
 
-@device_factory()
+@devices.factory()
 def smargon() -> Smargon:
-    """Get the i03 Smargon device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Smargon(f"{PREFIX.beamline_prefix}-MO-SGON-01:")
 
 
-@device_factory()
+@devices.factory()
 def s4_slit_gaps() -> S4SlitGaps:
-    """Get the i03 s4_slit_gaps device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return S4SlitGaps(f"{PREFIX.beamline_prefix}-AL-SLITS-04:")
 
 
-@device_factory()
+@devices.factory()
 def synchrotron() -> Synchrotron:
-    """Get the i03 synchrotron device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Synchrotron()
 
 
-@device_factory()
-def undulator(daq_configuration_path: str | None = None) -> Undulator:
-    """Get the i03 undulator device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
-    return Undulator(
+@devices.factory()
+def undulator(baton: Baton, daq_configuration_path: str) -> UndulatorInKeV:
+    return UndulatorInKeV(
         f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:",
-        # evaluate here not as parameter default to enable post-import mocking
-        id_gap_lookup_table_path=f"{daq_configuration_path or DAQ_CONFIGURATION_PATH}/lookup/BeamLine_Undulator_toGap.txt",
-        baton=baton(),
+        id_gap_lookup_table_path=f"{daq_configuration_path}/lookup/BeamLine_Undulator_toGap.txt",
+        baton=baton,
     )
 
 
-@device_factory()
-def undulator_dcm(daq_configuration_path: str | None = None) -> UndulatorDCM:
-    """Get the i03 undulator DCM device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
-    # evaluate here not as parameter default to enable post-import mocking
-    undulator_singleton = (
-        undulator(daq_configuration_path=daq_configuration_path)
-        if daq_configuration_path and daq_configuration_path != DAQ_CONFIGURATION_PATH
-        else undulator()
-    )
+@devices.factory()
+def undulator_dcm(
+    undulator: UndulatorInKeV, dcm: DCM, daq_configuration_path: str
+) -> UndulatorDCM:
     return UndulatorDCM(
-        undulator=undulator_singleton,
-        dcm=dcm(),
-        daq_configuration_path=daq_configuration_path or DAQ_CONFIGURATION_PATH,
+        undulator=undulator,
+        dcm=dcm,
+        daq_configuration_path=daq_configuration_path,
     )
 
 
-@device_factory()
+@devices.factory()
 def zebra() -> Zebra:
-    """Get the i03 zebra device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Zebra(
         prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
         mapping=I03_ZEBRA_MAPPING,
     )
 
 
-@device_factory()
+@devices.factory()
 def xspress3mini() -> Xspress3:
-    """Get the i03 Xspress3Mini device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Xspress3(f"{PREFIX.beamline_prefix}-EA-XSP3-01:")
 
 
-@device_factory()
-def panda() -> HDFPanda:
-    """Get the i03 panda device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
+@devices.factory()
+def panda(path_provider: PathProvider) -> HDFPanda:
     return HDFPanda(
         f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
-        path_provider=get_path_provider(),
+        path_provider=path_provider,
     )
 
 
-@device_factory()
+@devices.factory()
 def sample_shutter() -> ZebraShutter:
-    """Get the i03 sample shutter device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return ZebraShutter(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
 
 
-@device_factory()
+@devices.factory()
 def hutch_shutter() -> HutchShutter:
-    """Get the i03 hutch shutter device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return HutchShutter(f"{PREFIX.beamline_prefix}-PS-SHTR-01:")
 
 
-@device_factory()
+@devices.factory()
 def flux() -> Flux:
-    """Get the i03 flux device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Flux(f"{PREFIX.beamline_prefix}-MO-FLUX-01:")
 
 
-@device_factory()
-def xbpm_feedback() -> XBPMFeedback:
-    """Get the i03 XBPM feeback device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
-    return XBPMFeedback(f"{PREFIX.beamline_prefix}-EA-FDBK-01:", baton=baton())
+@devices.factory()
+def xbpm_feedback(baton: Baton) -> XBPMFeedback:
+    return XBPMFeedback(f"{PREFIX.beamline_prefix}-EA-FDBK-01:", baton=baton)
 
 
-@device_factory()
+@devices.factory()
 def zocalo() -> ZocaloResults:
-    """Get the i03 ZocaloResults device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return ZocaloResults(results_source=ZocaloSource.GPU)
 
 
-@device_factory()
+@devices.factory()
 def robot() -> BartRobot:
-    """Get the i03 robot device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return BartRobot(f"{PREFIX.beamline_prefix}-MO-ROBOT-01:")
 
 
-@device_factory()
+@devices.factory()
 def webcam() -> Webcam:
-    """Get the i03 webcam, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Webcam(url=URL("http://i03-webcam1/axis-cgi/jpg/image.cgi"))
 
 
-@device_factory()
+@devices.factory()
 def thawer() -> Thawer:
-    """Get the i03 thawer, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Thawer(f"{PREFIX.beamline_prefix}-EA-THAW-01")
 
 
-@device_factory()
+@devices.factory()
 def lower_gonio() -> XYZStage:
-    """Get the i03 lower gonio device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return XYZStage(f"{PREFIX.beamline_prefix}-MO-GONP-01:")
 
 
-@device_factory()
-def cryostream() -> CryoStream:
-    """Get the i03 cryostream device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
-    return CryoStream(PREFIX.beamline_prefix)
+@devices.factory()
+def cryostream() -> OxfordCryoStream:
+    return OxfordCryoStream(f"{PREFIX.beamline_prefix}-EA-CSTRM-01:")
+
+
+@devices.factory()
+def cryojet() -> OxfordCryoJet:
+    return OxfordCryoJet(f"{PREFIX.beamline_prefix}-EA-CJET-01:")
 
 
-@device_factory()
+@devices.factory()
 def cryostream_gantry() -> CryoStreamGantry:
-    """Get the i03 cryostream gantry device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return CryoStreamGantry(PREFIX.beamline_prefix)
 
 
-@device_factory()
+@devices.factory()
 def diamond_filter() -> DiamondFilter[I03Filters]:
-    """Get the i03 diamond filter device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return DiamondFilter[I03Filters](
         f"{PREFIX.beamline_prefix}-MO-FLTR-01:Y", I03Filters
     )
 
 
-@device_factory()
+@devices.factory()
 def qbpm() -> QBPM:
-    """Get the i03 qbpm device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return QBPM(f"{PREFIX.beamline_prefix}-DI-QBPM-01:")
 
 
-@device_factory()
+@devices.factory()
 def baton() -> Baton:
-    """Get the i03 baton device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return Baton(f"{PREFIX.beamline_prefix}-CS-BATON-01:")
 
 
-@device_factory()
+@devices.factory()
 def fluorescence_det_motion() -> FluorescenceDetector:
-    """Get the i03 device for moving the fluorescence detector, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return FluorescenceDetector(f"{PREFIX.beamline_prefix}-EA-FLU-01:")
 
 
-@device_factory()
-def scintillator() -> Scintillator:
-    """Get the i03 scintillator device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
+@devices.factory()
+def scintillator(aperture_scatterguard: ApertureScatterguard) -> Scintillator:
     return Scintillator(
         f"{PREFIX.beamline_prefix}-MO-SCIN-01:",
-        Reference(aperture_scatterguard()),
+        Reference(aperture_scatterguard),
         get_beamline_parameters(),
     )
 
 
-@device_factory()
+@devices.factory()
 def collimation_table() -> CollimationTable:
-    """Get the i03 device for moving the collimation table, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i03, it will return the existing object.
-    """
     return CollimationTable(prefix=f"{PREFIX.beamline_prefix}-MO-TABLE-01")
+
+
+@devices.factory()
+def beamsize(aperture_scatterguard: ApertureScatterguard) -> Beamsize:
+    return Beamsize(aperture_scatterguard)
+
+
+@devices.factory()
+def ipin() -> IPin:
+    return IPin(f"{PREFIX.beamline_prefix}-EA-PIN-01:")

dodal/beamlines/i04.py

@@ -13,6 +13,7 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
+from dodal.devices.baton import Baton
 from dodal.devices.detector import DetectorParams
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.diamond_filter import DiamondFilter, I04Filters
@@ -20,7 +21,9 @@ from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import ZebraFastGridScanThreeD
 from dodal.devices.flux import Flux
 from dodal.devices.i03.dcm import DCM
+from dodal.devices.i04.beamsize import Beamsize
 from dodal.devices.i04.constants import RedisConstants
+from dodal.devices.i04.max_pixel import MaxPixel
 from dodal.devices.i04.murko_results import MurkoResultsDevice
 from dodal.devices.i04.transfocator import Transfocator
 from dodal.devices.ipin import IPin
@@ -36,7 +39,7 @@ from dodal.devices.scintillator import Scintillator
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
@@ -141,12 +144,20 @@ def transfocator() -> Transfocator:
     return Transfocator(f"{PREFIX.beamline_prefix}-MO-FSWT-01:")
 
 
+@device_factory()
+def baton() -> Baton:
+    """Get the i04 baton device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return Baton(f"{PREFIX.beamline_prefix}-CS-BATON-01:")
+
+
 @device_factory()
 def xbpm_feedback() -> XBPMFeedback:
     """Get the i04 xbpm_feedback device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
-    return XBPMFeedback(f"{PREFIX.beamline_prefix}-EA-FDBK-01:")
+    return XBPMFeedback(f"{PREFIX.beamline_prefix}-EA-FDBK-01:", baton=baton())
 
 
 @device_factory()
@@ -228,13 +239,14 @@ def s4_slit_gaps() -> S4SlitGaps:
 
 
 @device_factory()
-def undulator() -> Undulator:
+def undulator() -> UndulatorInKeV:
     """Get the i04 undulator device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
-    return Undulator(
+    return UndulatorInKeV(
         prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
         id_gap_lookup_table_path="/dls_sw/i04/software/daq_configuration/lookup/BeamLine_Undulator_toGap.txt",
+        baton=baton(),
     )
 
 
@@ -281,6 +293,7 @@ def oav_full_screen(params: OAVConfig | None = None) -> OAVBeamCentrePV:
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         config=params or OAVConfig(ZOOM_PARAMS_FILE),
         overlay_channel=3,
+        mjpeg_prefix="XTAL",
     )
 
 
@@ -320,6 +333,8 @@ def oav_to_redis_forwarder() -> OAVToRedisForwarder:
     """
     return OAVToRedisForwarder(
         f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+        oav_roi=oav(),
+        oav_fs=oav_full_screen(),
         redis_host=RedisConstants.REDIS_HOST,
         redis_password=RedisConstants.REDIS_PASSWORD,
         redis_db=RedisConstants.MURKO_REDIS_DB,
@@ -374,3 +389,24 @@ def scintillator() -> Scintillator:
         Reference(aperture_scatterguard()),
         get_beamline_parameters(),
     )
+
+
+@device_factory()
+def max_pixel() -> MaxPixel:
+    """Get the i04 max pixel device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return MaxPixel(
+        f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+    )
+
+
+@device_factory()
+def beamsize() -> Beamsize:
+    """Get the i04 beamsize device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return Beamsize(
+        transfocator=transfocator(),
+        aperture_scatterguard=aperture_scatterguard(),
+    )

dodal/beamlines/i05.py

@@ -1,6 +1,13 @@
 from dodal.beamline_specific_utils.i05_shared import pgm as i05_pgm
-from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+)
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.insertion_device.apple2_undulator import (
+    Apple2,
+    UndulatorGap,
+    UndulatorLockedPhaseAxes,
+)
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -20,3 +27,23 @@ def synchrotron() -> Synchrotron:
 @device_factory()
 def pgm() -> PlaneGratingMonochromator:
     return i05_pgm()
+
+
+@device_factory()
+def id_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def id_phase() -> UndulatorLockedPhaseAxes:
+    return UndulatorLockedPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="PL",
+        btm_inner="PU",
+    )
+
+
+@device_factory()
+def id() -> Apple2:
+    """i05 insertion device."""
+    return Apple2(id_gap=id_gap(), id_phase=id_phase())