dls-dodal 1.55.0__py3-none-any.whl → 1.56.0__py3-none-any.whl

dodal/beamlines/i03.py

@@ -1,3 +1,4 @@
+from ophyd_async.core import Reference
 from ophyd_async.fastcs.eiger import EigerDetector as FastEiger
 from ophyd_async.fastcs.panda import HDFPanda
 from yarl import URL
@@ -19,11 +20,13 @@ 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.collimation_table import CollimationTable
 from dodal.devices.cryostream import CryoStream
 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, ZebraFastGridScan
+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.i03 import Beamstop
@@ -36,6 +39,7 @@ 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
@@ -82,7 +86,8 @@ def aperture_scatterguard() -> ApertureScatterguard:
     """
     params = get_beamline_parameters()
     return ApertureScatterguard(
-        prefix=PREFIX.beamline_prefix,
+        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),
     )
@@ -115,9 +120,7 @@ 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:",
-    )
+    return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
 @device_factory()
@@ -153,7 +156,8 @@ def detector_motion() -> DetectorMotion:
     If this is called when already instantiated in i03, it will return the existing object.
     """
     return DetectorMotion(
-        prefix=PREFIX.beamline_prefix,
+        device_prefix=f"{PREFIX.beamline_prefix}-MO-DET-01:",
+        pmac_prefix=f"{PREFIX.beamline_prefix}-MO-PMAC-02:",
     )
 
 
@@ -191,9 +195,7 @@ def zebra_fast_grid_scan() -> ZebraFastGridScan:
     """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 ZebraFastGridScan(
-        prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:",
-    )
+    return ZebraFastGridScan(prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:")
 
 
 @device_factory()
@@ -202,9 +204,7 @@ def panda_fast_grid_scan() -> PandAFastGridScan:
     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.
     """
-    return PandAFastGridScan(
-        prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:",
-    )
+    return PandAFastGridScan(prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:")
 
 
 @device_factory()
@@ -225,9 +225,7 @@ 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:",
-    )
+    return PinTipDetection(f"{PREFIX.beamline_prefix}-DI-OAV-01:")
 
 
 @device_factory()
@@ -243,9 +241,7 @@ 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:",
-    )
+    return S4SlitGaps(f"{PREFIX.beamline_prefix}-AL-SLITS-04:")
 
 
 @device_factory()
@@ -280,7 +276,6 @@ def undulator_dcm(daq_configuration_path: str | None = None) -> UndulatorDCM:
         else undulator()
     )
     return UndulatorDCM(
-        prefix=PREFIX.beamline_prefix,
         undulator=undulator_singleton,
         dcm=dcm(),
         daq_configuration_path=daq_configuration_path or DAQ_CONFIGURATION_PATH,
@@ -303,9 +298,7 @@ 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:",
-    )
+    return Xspress3(f"{PREFIX.beamline_prefix}-EA-XSP3-01:")
 
 
 @device_factory()
@@ -324,9 +317,7 @@ 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:",
-    )
+    return ZebraShutter(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
 
 
 @device_factory()
@@ -334,9 +325,7 @@ 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:",
-    )
+    return Flux(f"{PREFIX.beamline_prefix}-MO-FLUX-01:")
 
 
 @device_factory()
@@ -344,9 +333,7 @@ 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(
-        PREFIX.beamline_prefix,
-    )
+    return XBPMFeedback(f"{PREFIX.beamline_prefix}-EA-FDBK-01:")
 
 
 @device_factory()
@@ -354,10 +341,7 @@ 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(
-        prefix=PREFIX.beamline_prefix,
-        results_source=ZocaloSource.GPU,
-    )
+    return ZocaloResults(results_source=ZocaloSource.GPU)
 
 
 @device_factory()
@@ -365,9 +349,7 @@ 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:",
-    )
+    return BartRobot(f"{PREFIX.beamline_prefix}-MO-ROBOT-01:")
 
 
 @device_factory()
@@ -375,9 +357,7 @@ 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"),
-    )
+    return Webcam(url=URL("http://i03-webcam1/axis-cgi/jpg/image.cgi"))
 
 
 @device_factory()
@@ -385,9 +365,7 @@ 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",
-    )
+    return Thawer(f"{PREFIX.beamline_prefix}-EA-THAW-01")
 
 
 @device_factory()
@@ -395,19 +373,15 @@ 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:",
-    )
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-GONP-01:")
 
 
 @device_factory()
-def cryo_stream() -> CryoStream:
+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,
-    )
+    return CryoStream(PREFIX.beamline_prefix)
 
 
 @device_factory()
@@ -425,9 +399,7 @@ 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:",
-    )
+    return QBPM(f"{PREFIX.beamline_prefix}-DI-QBPM-01:")
 
 
 @device_factory()
@@ -436,3 +408,31 @@ def baton() -> Baton:
     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()
+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.
+    """
+    return Scintillator(
+        f"{PREFIX.beamline_prefix}-MO-SCIN-01:",
+        Reference(aperture_scatterguard()),
+        get_beamline_parameters(),
+    )
+
+
+@device_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")

dodal/beamlines/i04.py

@@ -70,9 +70,7 @@ def smargon() -> Smargon:
     """Get the i04 Smargon 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 Smargon(
-        f"{PREFIX.beamline_prefix}-MO-SGON-01:",
-    )
+    return Smargon(f"{PREFIX.beamline_prefix}-MO-SGON-01:")
 
 
 @device_factory()
@@ -91,9 +89,7 @@ def sample_delivery_system() -> XYZStage:
     """Get the i04 sample_delivery_system 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 XYZStage(
-        f"{PREFIX.beamline_prefix}-MO-SDE-01:",
-    )
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-SDE-01:")
 
 
 @device_factory()
@@ -101,9 +97,7 @@ def ipin() -> IPin:
     """Get the i04 ipin 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 IPin(
-        f"{PREFIX.beamline_prefix}-EA-PIN-01:",
-    )
+    return IPin(f"{PREFIX.beamline_prefix}-EA-PIN-01:")
 
 
 @device_factory()
@@ -122,9 +116,7 @@ def sample_shutter() -> ZebraShutter:
     """Get the i04 sample shutter 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 ZebraShutter(
-        f"{PREFIX.beamline_prefix}-EA-SHTR-01:",
-    )
+    return ZebraShutter(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
 
 
 @device_factory()
@@ -143,9 +135,7 @@ def transfocator() -> Transfocator:
     """Get the i04 transfocator 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 Transfocator(
-        f"{PREFIX.beamline_prefix}-MO-FSWT-01:",
-    )
+    return Transfocator(f"{PREFIX.beamline_prefix}-MO-FSWT-01:")
 
 
 @device_factory()
@@ -153,9 +143,7 @@ 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(
-        PREFIX.beamline_prefix,
-    )
+    return XBPMFeedback(f"{PREFIX.beamline_prefix}-EA-FDBK-01:")
 
 
 @device_factory()
@@ -171,9 +159,7 @@ def dcm() -> DCM:
     """Get the i04 DCM 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 DCM(
-        f"{PREFIX.beamline_prefix}-MO-DCM-01:",
-    )
+    return DCM(f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
 @device_factory()
@@ -181,9 +167,7 @@ def backlight() -> Backlight:
     """Get the i04 backlight 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 Backlight(
-        PREFIX.beamline_prefix,
-    )
+    return Backlight(PREFIX.beamline_prefix)
 
 
 @device_factory()
@@ -194,7 +178,8 @@ def aperture_scatterguard() -> ApertureScatterguard:
     """
     params = get_beamline_parameters()
     return ApertureScatterguard(
-        prefix=PREFIX.beamline_prefix,
+        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),
     )
@@ -226,9 +211,7 @@ def zebra_fast_grid_scan() -> ZebraFastGridScan:
     """Get the i04 zebra_fast_grid_scan 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 ZebraFastGridScan(
-        prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:",
-    )
+    return ZebraFastGridScan(f"{PREFIX.beamline_prefix}-MO-SGON-01:")
 
 
 @device_factory()
@@ -304,7 +287,8 @@ def detector_motion() -> DetectorMotion:
     If this is called when already instantiated in i04, it will return the existing object.
     """
     return DetectorMotion(
-        prefix=PREFIX.beamline_prefix,
+        device_prefix=f"{PREFIX.beamline_prefix}-MO-DET-01:",
+        pmac_prefix=f"{PREFIX.beamline_prefix}-MO-PMAC-02:",
     )
 
 
@@ -313,9 +297,7 @@ def thawer() -> Thawer:
     """Get the i04 thawer, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
-    return Thawer(
-        f"{PREFIX.beamline_prefix}-EA-THAW-01",
-    )
+    return Thawer(f"{PREFIX.beamline_prefix}-EA-THAW-01")
 
 
 @device_factory()
@@ -323,9 +305,7 @@ def robot() -> BartRobot:
     """Get the i04 robot 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 BartRobot(
-        f"{PREFIX.beamline_prefix}-MO-ROBOT-01:",
-    )
+    return BartRobot(f"{PREFIX.beamline_prefix}-MO-ROBOT-01:")
 
 
 @device_factory()
@@ -376,6 +356,4 @@ def pin_tip_detection() -> PinTipDetection:
     """Get the i04 pin tip detection 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 PinTipDetection(
-        f"{PREFIX.beamline_prefix}-DI-OAV-01:",
-    )
+    return PinTipDetection(f"{PREFIX.beamline_prefix}-DI-OAV-01:")

dodal/beamlines/i09.py

@@ -2,6 +2,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.electron_analyser import SelectedSource
 from dodal.devices.electron_analyser.vgscienta import VGScientaAnalyserDriverIO
 from dodal.devices.i09 import DCM, Grating, LensMode, PassEnergy, PsuMode
 from dodal.devices.pgm import PGM
@@ -38,8 +39,8 @@ def dcm() -> DCM:
 @device_factory()
 def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode, PsuMode, PassEnergy]:
     energy_sources = {
-        "source1": pgm().energy.user_readback,
-        "source2": dcm().energy_in_ev,
+        SelectedSource.SOURCE1: pgm().energy.user_readback,
+        SelectedSource.SOURCE2: dcm().energy_in_ev,
     }
     return VGScientaAnalyserDriverIO[LensMode, PsuMode, PassEnergy](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",

dodal/beamlines/i09_1.py

@@ -2,6 +2,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.electron_analyser import SelectedSource
 from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.i09.dcm import DCM
 from dodal.devices.i09_1 import LensMode, PsuMode
@@ -33,5 +34,5 @@ def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
         lens_mode_type=LensMode,
         psu_mode_type=PsuMode,
-        energy_sources={"source1": dcm().energy_in_ev},
+        energy_sources={SelectedSource.SOURCE1: dcm().energy_in_ev},
     )

dodal/beamlines/i11.py

@@ -0,0 +1,143 @@
+from pathlib import Path
+
+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 DET_SUFFIX
+from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.cryostream import OxfordCryoStream
+from dodal.devices.eurotherm import (
+    EurothermGeneral,
+    UpdatingEurothermGeneral,
+)
+from dodal.devices.i11.cyberstar_blower import (
+    AutotunedCyberstarBlower,
+    CyberstarBlower,
+)
+from dodal.devices.i11.diff_stages import (
+    DiffractometerBase,
+    DiffractometerStage,
+)
+from dodal.devices.i11.mythen import Mythen3
+from dodal.devices.i11.nx100robot import NX100Robot
+from dodal.devices.i11.spinner import Spinner
+from dodal.devices.slits import Slits
+from dodal.devices.synchrotron import Synchrotron
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i11")
+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(f"/dls/{BL}/data/2025/cm40625-3/bluesky"),
+        client=RemoteDirectoryServiceClient(f"http://{BL}-control:8088/api"),
+    )
+)
+
+
+@device_factory()
+def mythen3() -> Mythen3:
+    """Mythen3 Detector from PSI"""
+    return Mythen3(
+        prefix=f"{PREFIX.beamline_prefix}-EA-DET-07:",
+        path_provider=get_path_provider(),
+        drv_suffix=DET_SUFFIX,
+        fileio_suffix="HDF:",
+    )
+
+
+@device_factory()
+def ocs1() -> OxfordCryoStream:
+    """i11 Oxford Cryostream 700 plus without cryoshutter"""
+    return OxfordCryoStream(f"{PREFIX.beamline_prefix}-CG-CSTRM-01:")
+
+
+@device_factory()
+def ocs2() -> OxfordCryoStream:
+    """i11 Oxford Cryostream 700 standard without cryoshutter"""
+    return OxfordCryoStream(f"{PREFIX.beamline_prefix}-CG-CSTRM-02:")
+
+
+@device_factory()
+def diff_stage() -> DiffractometerStage:
+    """Stage that contains the rotation axes, theta, two_theta, delta, spos"""
+    return DiffractometerStage(prefix=f"{PREFIX.beamline_prefix}-MO-DIFF-01:")
+
+
+@device_factory()
+def diff_base() -> DiffractometerBase:
+    return DiffractometerBase(prefix=f"{PREFIX.beamline_prefix}-MO-DIFF-01:BASE:")
+
+
+@device_factory()
+def csb1() -> CyberstarBlower[UpdatingEurothermGeneral]:
+    """Cyberstar hot air blower 1 with Eurotherm Controller and updating PID"""
+    return CyberstarBlower(
+        prefix=f"{PREFIX.beamline_prefix}-EA-BLOW-01:",
+        controller_type=UpdatingEurothermGeneral,
+    )
+
+
+@device_factory()
+def csb2() -> AutotunedCyberstarBlower[EurothermGeneral]:
+    """Cyberstar hot air blower 2 with autotuneable Eurotherm Controller"""
+    return AutotunedCyberstarBlower(
+        prefix=f"{PREFIX.beamline_prefix}-EA-BLOW-02:LOOP1:",
+        controller_type=EurothermGeneral,
+    )
+
+
+@device_factory()
+def sample_robot() -> NX100Robot:
+    """The sample robot arm and carosel on i11 that moves
+    and loads samples on/off the spinner"""
+    return NX100Robot(prefix=f"{PREFIX.beamline_prefix}-EA-ROBOT-01:")
+
+
+@device_factory()
+def spinner() -> Spinner:
+    """Sample spinner for powder averaging"""
+    return Spinner(prefix=f"{PREFIX.beamline_prefix}-EA-ENV-01:")
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@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:")

dodal/beamlines/i19_1.py

@@ -77,6 +77,7 @@ def shutter() -> AccessControlledShutter:
     return AccessControlledShutter(
         prefix=f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
         hutch=HutchState.EH1,
+        instrument_session="cm40638-4",
     )
 
 

dodal/beamlines/i19_2.py

@@ -6,6 +6,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.devices.i19.beamstop import BeamStop
 from dodal.devices.i19.blueapi_device import HutchState
+from dodal.devices.i19.diffractometer import FourCircleDiffractometer
 from dodal.devices.i19.shutter import AccessControlledShutter
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.zebra.zebra import Zebra
@@ -32,6 +33,11 @@ I19_2_ZEBRA_MAPPING = ZebraMapping(
 )
 
 
+@device_factory()
+def diffractometer() -> FourCircleDiffractometer:
+    return FourCircleDiffractometer(prefix=PREFIX.beamline_prefix)
+
+
 @device_factory()
 def beamstop() -> BeamStop:
     """Get the i19-2 beamstop device, instantiate it if it hasn't already been.
@@ -59,6 +65,7 @@ def shutter() -> AccessControlledShutter:
     return AccessControlledShutter(
         prefix=f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
         hutch=HutchState.EH2,
+        instrument_session="cm40639-4",
     )
 
 

dodal/beamlines/i22.py

@@ -45,7 +45,7 @@ set_utils_beamline(BL)
 set_path_provider(
     StaticVisitPathProvider(
         BL,
-        Path("/dls/i22/data/2024/cm37271-2/bluesky"),
+        Path("/dls/i22/data/2025/cm40643-4/"),
         client=RemoteDirectoryServiceClient("http://i22-control:8088/api"),
     )
 )
@@ -279,5 +279,5 @@ def ppump() -> WatsonMarlow323Pump:
 
 
 @device_factory()
-def base_top() -> XYPitchStage:
+def base() -> XYPitchStage:
     return XYPitchStage(f"{PREFIX.beamline_prefix}-MO-STABL-01:")

dodal/beamlines/i23.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from ophyd_async.core import StrictEnum
+from ophyd_async.core import InOut, StrictEnum
 from ophyd_async.epics.adpilatus import PilatusDetector
 
 from dodal.common.beamlines.beamline_utils import (
@@ -45,8 +45,8 @@ I23_ZEBRA_MAPPING = ZebraMapping(
 
 
 class I23DetectorPositions(StrictEnum):
-    IN = "In"
-    OUT = "Out"
+    IN = InOut.IN.value
+    OUT = InOut.OUT.value
     SAMPLE_CHANGE = "sample change"