dls-dodal 1.66.0__tar.gz → 1.67.0__tar.gz

{dls_dodal-1.66.0 → dls_dodal-1.67.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.66.0
+Version: 1.67.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License

{dls_dodal-1.66.0 → dls_dodal-1.67.0}/docs/how-to/create-beamline.md

@@ -23,28 +23,31 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
 
 ```python
 
+    from functools import cache
+    from pathlib import Path
+    from ophyd_async.core import PathProvider
     from ophyd_async.epics.adaravis import AravisDetector
 
-    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 CAM_SUFFIX, HDF5_SUFFIX
-    from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+    from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+    from dodal.device_manager import DeviceManager
     from dodal.devices.synchrotron import Synchrotron
     from dodal.log import set_beamline as set_log_beamline
-    from dodal.utils import BeamlinePrefix
+    from dodal.utils import BeamlinePrefix, get_beamline_name
 
     BL = get_beamline_name("s41")  # Default used when not on a live beamline
     PREFIX = BeamlinePrefix(BL)
     set_log_beamline(BL)  # Configure logging and util functions
     set_utils_beamline(BL)
 
-    # Currently we must hard-code the visit, determining the visit is WIP.
-    set_path_provider(
-        StaticVisitPathProvider(
+    devices = DeviceManager()
+    
+    @devices.fixture
+    @cache
+    def path_provider() -> PathProvider:
+        # Currently we must hard-code the visit, determining the visit is WIP.
+        return StaticVisitPathProvider(
             BL,
             # Root directory for all detectors
             Path("/dls/w41/data/YYYY/cm12345-1"),
@@ -52,7 +55,7 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
             client=RemoteDirectoryServiceClient("http://s41-control:8088/api"),
             # Else if no GDA server use a LocalDirectoryServiceClient(),
         )
-    )
+
 
     """
     Define device factory functions below this point.
@@ -63,23 +66,22 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
     """
     This decorator gives extra desirable behaviour to this factory function:
     - it may be instantiated automatically, selectively on live beamline
-        - caching and re-using the result for subsequent calls
     - it automatically names the device if no name is explicitly set
     - it may be skipped when make_all_devices is called on this module
     - it must be explicitly connected (which may be automated by tools)
         - when connected it may connect to a simulated backend
         - it may be connected concurrently (when automated by tools)
-    """"
-    @device_factory(skip = BL == "s41")
+    """
+    @devices.factory(skip = BL == "s41")
     def synchrotron() -> Synchrotron:
         return Synchrotron()
 
 
-    @device_factory()
-    def d11() -> AravisDetector:
+    @devices.factory()
+    def d11(path_provider: PathProvider) -> AravisDetector:
         return AravisDetector(
             f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
-            path_provider=get_path_provider(),
+            path_provider=path_provider,
             drv_suffix=CAM_SUFFIX,
             fileio_suffix=HDF5_SUFFIX,
         )

{dls_dodal-1.66.0 → dls_dodal-1.67.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.66.0
+Version: 1.67.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License

{dls_dodal-1.66.0 → dls_dodal-1.67.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -89,6 +89,7 @@ src/dodal/__init__.py
 src/dodal/__main__.py
 src/dodal/_version.py
 src/dodal/cli.py
+src/dodal/device_manager.py
 src/dodal/log.py
 src/dodal/utils.py
 src/dodal/beamline_specific_utils/__init__.py
@@ -157,7 +158,6 @@ src/dodal/common/beamlines/device_helpers.py
 src/dodal/devices/__init__.py
 src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
-src/dodal/devices/apple2_undulator.py
 src/dodal/devices/backlight.py
 src/dodal/devices/baton.py
 src/dodal/devices/bimorph_mirror.py
@@ -263,6 +263,7 @@ src/dodal/devices/i03/undulator_dcm.py
 src/dodal/devices/i04/__init__.py
 src/dodal/devices/i04/beamsize.py
 src/dodal/devices/i04/constants.py
+src/dodal/devices/i04/max_pixel.py
 src/dodal/devices/i04/murko_results.py
 src/dodal/devices/i04/transfocator.py
 src/dodal/devices/i05/__init__.py
@@ -275,7 +276,10 @@ src/dodal/devices/i09/enums.py
 src/dodal/devices/i09_1/__init__.py
 src/dodal/devices/i09_1/enums.py
 src/dodal/devices/i09_1_shared/__init__.py
+src/dodal/devices/i09_1_shared/hard_energy.py
 src/dodal/devices/i09_1_shared/hard_undulator_functions.py
+src/dodal/devices/i09_2_shared/__init__.py
+src/dodal/devices/i09_2_shared/i09_apple2.py
 src/dodal/devices/i10/__init__.py
 src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
@@ -315,6 +319,7 @@ src/dodal/devices/i19/diffractometer.py
 src/dodal/devices/i19/mapt_configuration.py
 src/dodal/devices/i19/pin_col_stages.py
 src/dodal/devices/i19/access_controlled/__init__.py
+src/dodal/devices/i19/access_controlled/attenuator_motor_squad.py
 src/dodal/devices/i19/access_controlled/blueapi_device.py
 src/dodal/devices/i19/access_controlled/hutch_access.py
 src/dodal/devices/i19/access_controlled/shutter.py
@@ -335,6 +340,10 @@ src/dodal/devices/i24/dual_backlight.py
 src/dodal/devices/i24/focus_mirrors.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/i24/vgonio.py
+src/dodal/devices/insertion_device/__init__.py
+src/dodal/devices/insertion_device/apple2_undulator.py
+src/dodal/devices/insertion_device/energy_motor_lookup.py
+src/dodal/devices/insertion_device/lookup_table_models.py
 src/dodal/devices/mx_phase1/__init__.py
 src/dodal/devices/mx_phase1/beamstop.py
 src/dodal/devices/oav/__init__.py
@@ -365,7 +374,6 @@ src/dodal/devices/util/__init__.py
 src/dodal/devices/util/adjuster_plans.py
 src/dodal/devices/util/epics_util.py
 src/dodal/devices/util/lookup_tables.py
-src/dodal/devices/util/lookup_tables_apple2.py
 src/dodal/devices/xspress3/__init__.py
 src/dodal/devices/xspress3/xspress3.py
 src/dodal/devices/xspress3/xspress3_channel.py
@@ -389,7 +397,7 @@ src/dodal/plans/bimorph.py
 src/dodal/plans/configure_arm_trigger_and_disarm_detector.py
 src/dodal/plans/load_panda_yaml.py
 src/dodal/plans/save_panda.py
-src/dodal/plans/scanspec.py
+src/dodal/plans/spec_path.py
 src/dodal/plans/verify_undulator_gap.py
 src/dodal/plans/wrapped.py
 src/dodal/plans/preprocessors/__init__.py
@@ -399,6 +407,8 @@ src/dodal/testing/electron_analyser/device_factory.py
 src/dodal/testing/fixtures/__init__.py
 src/dodal/testing/fixtures/run_engine.py
 src/dodal/testing/fixtures/utils.py
+src/dodal/testing/fixtures/devices/__init__.py
+src/dodal/testing/fixtures/devices/apple2.py
 system_tests/__init__.py
 system_tests/test_adsim.py
 system_tests/test_cli.py
@@ -415,6 +425,7 @@ 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_device_manager.py
 tests/test_log.py
 tests/test_utils.py
 tests/beamlines/__init__.py
@@ -438,7 +449,6 @@ tests/devices/__init__.py
 tests/devices/conftest.py
 tests/devices/test_aperture.py
 tests/devices/test_aperture_scatterguard.py
-tests/devices/test_apple2_undulator.py
 tests/devices/test_attenuator.py
 tests/devices/test_backlight.py
 tests/devices/test_bart_robot.py
@@ -521,6 +531,7 @@ tests/devices/i03/test_undulator_dcm.py
 tests/devices/i04/__init__.py
 tests/devices/i04/conftest.py
 tests/devices/i04/test_beamsize.py
+tests/devices/i04/test_max_pixel.py
 tests/devices/i04/test_murko_results.py
 tests/devices/i04/test_transfocator.py
 tests/devices/i07/IIDCalibrationTable.txt
@@ -530,9 +541,17 @@ tests/devices/i07/test_id.py
 tests/devices/i09/__init__.py
 tests/devices/i09_1/__init__.py
 tests/devices/i09_1_shared/__init__.py
+tests/devices/i09_1_shared/test_hard_energy.py
 tests/devices/i09_1_shared/test_undulator_functions.py
 tests/devices/i09_1_shared/test_data/__init__.py
 tests/devices/i09_1_shared/test_data/test_lookuptable_i09_hu.txt
+tests/devices/i09_2_shared/__init__.py
+tests/devices/i09_2_shared/test_i09_apple2.py
+tests/devices/i09_2_shared/test_data/ExpectedJIDEnergy2GapCalibrations.json
+tests/devices/i09_2_shared/test_data/ExpectedJIDEnergy2PhaseCalibrations.json
+tests/devices/i09_2_shared/test_data/JIDEnergy2GapCalibrations.csv
+tests/devices/i09_2_shared/test_data/JIDEnergy2PhaseCalibrations.csv
+tests/devices/i09_2_shared/test_data/__init__.py
 tests/devices/i10/__init__.py
 tests/devices/i10/test_i10_apple2.py
 tests/devices/i10/test_data/IDEnergy2GapCalibrations.csv
@@ -559,6 +578,8 @@ tests/devices/i19/test_diffractometer.py
 tests/devices/i19/test_mapt.py
 tests/devices/i19/test_pin_col.py
 tests/devices/i19/access_controlled/__init__.py
+tests/devices/i19/access_controlled/test_attenuator_motor_squad.py
+tests/devices/i19/access_controlled/test_attenuator_position_demand.py
 tests/devices/i19/access_controlled/test_shutter.py
 tests/devices/i22/__init__.py
 tests/devices/i22/test_dcm.py
@@ -570,6 +591,12 @@ tests/devices/i24/test_dual_backlight.py
 tests/devices/i24/test_focus_mirrors.py
 tests/devices/i24/test_pmac.py
 tests/devices/i24/test_vgonio.py
+tests/devices/insertion_device/__init__.py
+tests/devices/insertion_device/conftest.py
+tests/devices/insertion_device/test_apple2_undulator.py
+tests/devices/insertion_device/test_energy_motor_lookup.py
+tests/devices/insertion_device/test_lookup_tables_models.py
+tests/devices/insertion_device/util.py
 tests/devices/mx_phase1/__init__.py
 tests/devices/mx_phase1/test_beamstop.py
 tests/devices/oav/__init__.py
@@ -608,7 +635,6 @@ tests/devices/test_data/test_lookup_table.txt
 tests/devices/util/__init__.py
 tests/devices/util/test_adjuster_plans.py
 tests/devices/util/test_lookup_tables.py
-tests/devices/util/test_lookup_tables_apple2.py
 tests/devices/util/test_data/__init__.py
 tests/devices/util/test_data/test_beamline_dcm_roll_converter.txt
 tests/devices/util/test_data/test_beamline_dcm_roll_converter_non_monotonic.txt

{dls_dodal-1.66.0 → dls_dodal-1.67.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.66.0'
-__version_tuple__ = version_tuple = (1, 66, 0)
+__version__ = version = '1.67.0'
+__version_tuple__ = version_tuple = (1, 67, 0)
 
-__commit_id__ = commit_id = 'g400fe8430'
+__commit_id__ = commit_id = 'gdfd2eada3'

dls_dodal-1.67.0/src/dodal/beamlines/i03.py

@@ -0,0 +1,362 @@
+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 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,
+    load_positions_from_beamline_parameters,
+)
+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 (
+    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
+from dodal.devices.fast_grid_scan import PandAFastGridScan, ZebraFastGridScanThreeD
+from dodal.devices.fluorescence_detector_motion import FluorescenceDetector
+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
+from dodal.devices.oav.pin_image_recognition import PinTipDetection
+from dodal.devices.qbpm import QBPM
+from dodal.devices.robot import BartRobot
+from dodal.devices.s4_slit_gaps import S4SlitGaps
+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 UndulatorInKeV
+from dodal.devices.webcam import Webcam
+from dodal.devices.xbpm_feedback import XBPMFeedback
+from dodal.devices.xspress3.xspress3 import Xspress3
+from dodal.devices.zebra.zebra import Zebra
+from dodal.devices.zebra.zebra_constants_mapping import (
+    ZebraMapping,
+    ZebraSources,
+    ZebraTTLOutputs,
+)
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
+from dodal.devices.zocalo import ZocaloResults, ZocaloSource
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+ZOOM_PARAMS_FILE = (
+    "/dls_sw/i03/software/gda/configurations/i03-config/xml/jCameraManZoomLevels.xml"
+)
+DISPLAY_CONFIG = "/dls_sw/i03/software/gda_versions/var/display.configuration"
+DAQ_CONFIGURATION_PATH = "/dls_sw/i03/software/daq_configuration"
+
+BL = get_beamline_name("i03")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+I03_ZEBRA_MAPPING = ZebraMapping(
+    outputs=ZebraTTLOutputs(TTL_DETECTOR=1, TTL_SHUTTER=2, TTL_XSPRESS3=3, TTL_PANDA=4),
+    sources=ZebraSources(),
+)
+
+PREFIX = BeamlinePrefix(BL)
+
+devices = DeviceManager()
+
+
+@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:
+    params = get_beamline_parameters()
+    return ApertureScatterguard(
+        aperture_prefix=f"{PREFIX.beamline_prefix}-MO-MAPT-01:",
+        scatterguard_prefix=f"{PREFIX.beamline_prefix}-MO-SCAT-01:",
+        loaded_positions=load_positions_from_beamline_parameters(params),
+        tolerances=AperturePosition.tolerances_from_gda_params(params),
+    )
+
+
+@devices.factory()
+def attenuator() -> BinaryFilterAttenuator:
+    return BinaryFilterAttenuator(
+        prefix=f"{PREFIX.beamline_prefix}-EA-ATTN-01:",
+        num_filters=16,
+    )
+
+
+@devices.factory()
+def beamstop() -> Beamstop:
+    return Beamstop(
+        prefix=f"{PREFIX.beamline_prefix}-MO-BS-01:",
+        beamline_parameters=get_beamline_parameters(),
+    )
+
+
+@devices.factory()
+def dcm() -> DCM:
+    return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
+
+
+@devices.factory()
+def vfm() -> FocusingMirrorWithStripes:
+    return FocusingMirrorWithStripes(
+        prefix=f"{PREFIX.beamline_prefix}-OP-VFM-01:",
+        bragg_to_lat_lut_path=DAQ_CONFIGURATION_PATH
+        + "/lookup/BeamLineEnergy_DCM_VFM_x_converter.txt",
+        x_suffix="LAT",
+        y_suffix="VERT",
+    )
+
+
+@devices.factory()
+def mirror_voltages() -> MirrorVoltages:
+    return MirrorVoltages(
+        prefix=f"{PREFIX.beamline_prefix}-MO-PSU-01:",
+        daq_configuration_path=DAQ_CONFIGURATION_PATH,
+    )
+
+
+@devices.factory()
+def backlight() -> Backlight:
+    return Backlight(prefix=PREFIX.beamline_prefix)
+
+
+@devices.factory()
+def detector_motion() -> DetectorMotion:
+    return DetectorMotion(
+        device_prefix=f"{PREFIX.beamline_prefix}-MO-DET-01:",
+        pmac_prefix=f"{PREFIX.beamline_prefix}-MO-PMAC-02:",
+    )
+
+
+@devices.v1_init(EigerDetector, prefix="BL03I-EA-EIGER-01:", wait=False)
+def eiger(eiger: EigerDetector) -> EigerDetector:
+    return eiger
+
+
+@devices.factory()
+def fastcs_eiger(path_provider: PathProvider) -> FastEiger:
+    return FastEiger(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=path_provider,
+        drv_suffix="-EA-EIGER-02:",
+        hdf_suffix="-EA-EIGER-01:OD:",
+    )
+
+
+@devices.factory()
+def zebra_fast_grid_scan() -> ZebraFastGridScanThreeD:
+    return ZebraFastGridScanThreeD(
+        prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:",
+    )
+
+
+@devices.factory()
+def panda_fast_grid_scan() -> PandAFastGridScan:
+    """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:")
+
+
+@devices.factory()
+def oav(
+    params: OAVConfigBeamCentre | None = None,
+) -> OAVBeamCentreFile:
+    return OAVBeamCentreFile(
+        prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+        config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+    )
+
+
+@devices.factory()
+def pin_tip_detection() -> PinTipDetection:
+    return PinTipDetection(f"{PREFIX.beamline_prefix}-DI-OAV-01:")
+
+
+@devices.factory()
+def smargon() -> Smargon:
+    return Smargon(f"{PREFIX.beamline_prefix}-MO-SGON-01:")
+
+
+@devices.factory()
+def s4_slit_gaps() -> S4SlitGaps:
+    return S4SlitGaps(f"{PREFIX.beamline_prefix}-AL-SLITS-04:")
+
+
+@devices.factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@devices.factory()
+def undulator(baton: Baton, daq_configuration_path: str) -> UndulatorInKeV:
+    return UndulatorInKeV(
+        f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:",
+        id_gap_lookup_table_path=f"{daq_configuration_path}/lookup/BeamLine_Undulator_toGap.txt",
+        baton=baton,
+    )
+
+
+@devices.factory()
+def undulator_dcm(
+    undulator: UndulatorInKeV, dcm: DCM, daq_configuration_path: str
+) -> UndulatorDCM:
+    return UndulatorDCM(
+        undulator=undulator,
+        dcm=dcm,
+        daq_configuration_path=daq_configuration_path,
+    )
+
+
+@devices.factory()
+def zebra() -> Zebra:
+    return Zebra(
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
+        mapping=I03_ZEBRA_MAPPING,
+    )
+
+
+@devices.factory()
+def xspress3mini() -> Xspress3:
+    return Xspress3(f"{PREFIX.beamline_prefix}-EA-XSP3-01:")
+
+
+@devices.factory()
+def panda(path_provider: PathProvider) -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
+        path_provider=path_provider,
+    )
+
+
+@devices.factory()
+def sample_shutter() -> ZebraShutter:
+    return ZebraShutter(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
+
+
+@devices.factory()
+def hutch_shutter() -> HutchShutter:
+    return HutchShutter(f"{PREFIX.beamline_prefix}-PS-SHTR-01:")
+
+
+@devices.factory()
+def flux() -> Flux:
+    return Flux(f"{PREFIX.beamline_prefix}-MO-FLUX-01:")
+
+
+@devices.factory()
+def xbpm_feedback(baton: Baton) -> XBPMFeedback:
+    return XBPMFeedback(f"{PREFIX.beamline_prefix}-EA-FDBK-01:", baton=baton)
+
+
+@devices.factory()
+def zocalo() -> ZocaloResults:
+    return ZocaloResults(results_source=ZocaloSource.GPU)
+
+
+@devices.factory()
+def robot() -> BartRobot:
+    return BartRobot(f"{PREFIX.beamline_prefix}-MO-ROBOT-01:")
+
+
+@devices.factory()
+def webcam() -> Webcam:
+    return Webcam(url=URL("http://i03-webcam1/axis-cgi/jpg/image.cgi"))
+
+
+@devices.factory()
+def thawer() -> Thawer:
+    return Thawer(f"{PREFIX.beamline_prefix}-EA-THAW-01")
+
+
+@devices.factory()
+def lower_gonio() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-GONP-01:")
+
+
+@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:")
+
+
+@devices.factory()
+def cryostream_gantry() -> CryoStreamGantry:
+    return CryoStreamGantry(PREFIX.beamline_prefix)
+
+
+@devices.factory()
+def diamond_filter() -> DiamondFilter[I03Filters]:
+    return DiamondFilter[I03Filters](
+        f"{PREFIX.beamline_prefix}-MO-FLTR-01:Y", I03Filters
+    )
+
+
+@devices.factory()
+def qbpm() -> QBPM:
+    return QBPM(f"{PREFIX.beamline_prefix}-DI-QBPM-01:")
+
+
+@devices.factory()
+def baton() -> Baton:
+    return Baton(f"{PREFIX.beamline_prefix}-CS-BATON-01:")
+
+
+@devices.factory()
+def fluorescence_det_motion() -> FluorescenceDetector:
+    return FluorescenceDetector(f"{PREFIX.beamline_prefix}-EA-FLU-01:")
+
+
+@devices.factory()
+def scintillator(aperture_scatterguard: ApertureScatterguard) -> Scintillator:
+    return Scintillator(
+        f"{PREFIX.beamline_prefix}-MO-SCIN-01:",
+        Reference(aperture_scatterguard),
+        get_beamline_parameters(),
+    )
+
+
+@devices.factory()
+def collimation_table() -> CollimationTable:
+    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:")

{dls_dodal-1.66.0 → dls_dodal-1.67.0}/src/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
@@ -22,6 +23,7 @@ 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
@@ -142,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()
@@ -236,6 +246,7 @@ def undulator() -> UndulatorInKeV:
     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(),
     )
 
 
@@ -380,6 +391,16 @@ def scintillator() -> Scintillator:
     )
 
 
+@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.

{dls_dodal-1.66.0 → dls_dodal-1.67.0}/src/dodal/beamlines/i05.py

@@ -3,7 +3,7 @@ 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.apple2_undulator import (
+from dodal.devices.insertion_device.apple2_undulator import (
     Apple2,
     UndulatorGap,
     UndulatorLockedPhaseAxes,