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

dodal/beamlines/i06.py

@@ -0,0 +1,62 @@
+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.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("i06")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def idd_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def idd_phase() -> UndulatorLockedPhaseAxes:
+    return UndulatorLockedPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="PL",
+        btm_inner="PU",
+    )
+
+
+@device_factory()
+def idd() -> Apple2:
+    """i06 downstream insertion device."""
+    return Apple2(id_gap=idd_gap(), id_phase=idd_phase())
+
+
+@device_factory()
+def idu_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:")
+
+
+@device_factory()
+def idu_phase() -> UndulatorLockedPhaseAxes:
+    return UndulatorLockedPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
+        top_outer="PL",
+        btm_inner="PU",
+    )
+
+
+@device_factory()
+def idu() -> Apple2:
+    """i06 upstream insertion device."""
+    return Apple2(id_gap=idd_gap(), id_phase=idd_phase())

dodal/beamlines/i07.py

@@ -1,6 +1,8 @@
 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.i07.dcm import DCM
+from dodal.devices.i07.id import InsertionDevice
+from dodal.devices.undulator import UndulatorOrder
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -19,3 +21,21 @@ def dcm() -> DCM:
         "dcm",
     )
     return dcm
+
+
+@device_factory()
+def harmonic() -> UndulatorOrder:
+    return UndulatorOrder("harmonic")
+
+
+@device_factory()
+def id() -> InsertionDevice:
+    """Get the i07 undulator device, instantiate it if it hasn't already been.
+    If this is called when already instantiated it will return the existing object.
+    """
+    return InsertionDevice(
+        "id",
+        f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        harmonic(),
+        id_gap_lookup_table_path="/dls_sw/i07/software/gda/config/lookupTables/IIDCalibrationTable.txt",
+    )

dodal/beamlines/i09_1.py

@@ -10,8 +10,13 @@ from dodal.devices.common_dcm import (
 from dodal.devices.electron_analyser import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.i09_1 import LensMode, PsuMode
+from dodal.devices.i09_1_shared.hard_energy import HardEnergy, HardInsertionDeviceEnergy
+from dodal.devices.i09_1_shared.hard_undulator_functions import (
+    calculate_energy_i09_hu,
+    calculate_gap_i09_hu,
+)
 from dodal.devices.synchrotron import Synchrotron
-from dodal.devices.undulator import UndulatorOrder
+from dodal.devices.undulator import UndulatorInMm, UndulatorOrder
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -40,7 +45,7 @@ def energy_source() -> EnergySource:
 
 # Connect will work again after this work completed
 # https://jira.diamond.ac.uk/browse/I09-651
-@device_factory()
+@device_factory(skip=True)
 def analyser() -> SpecsDetector[LensMode, PsuMode]:
     return SpecsDetector[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
@@ -50,6 +55,30 @@ def analyser() -> SpecsDetector[LensMode, PsuMode]:
     )
 
 
+@device_factory()
+def undulator() -> UndulatorInMm:
+    return UndulatorInMm(prefix=f"{BeamlinePrefix(BL).insertion_prefix}-MO-SERVC-01:")
+
+
 @device_factory()
 def harmonics() -> UndulatorOrder:
-    return UndulatorOrder(name="harmonics")
+    return UndulatorOrder()
+
+
+@device_factory()
+def hu_id_energy() -> HardInsertionDeviceEnergy:
+    return HardInsertionDeviceEnergy(
+        undulator_order=harmonics(),
+        undulator=undulator(),
+        lut={},  # ToDo https://github.com/DiamondLightSource/sm-bluesky/issues/239
+        gap_to_energy_func=calculate_energy_i09_hu,
+        energy_to_gap_func=calculate_gap_i09_hu,
+    )
+
+
+@device_factory()
+def hu_energy() -> HardEnergy:
+    return HardEnergy(
+        dcm=dcm(),
+        undulator_energy=hu_id_energy(),
+    )

dodal/beamlines/i09_2.py

@@ -1,18 +1,39 @@
+from pathlib import Path
+
+from daq_config_server.client import ConfigServer
+
 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.i09.enums import Grating
+from dodal.devices.i09_2_shared.i09_apple2 import (
+    J09_GAP_POLY_DEG_COLUMNS,
+    J09_PHASE_POLY_DEG_COLUMNS,
+    J09Apple2Controller,
+)
+from dodal.devices.insertion_device.apple2_undulator import (
     Apple2,
+    BeamEnergy,
+    InsertionDeviceEnergy,
+    InsertionDevicePolarisation,
     UndulatorGap,
     UndulatorPhaseAxes,
 )
-from dodal.devices.i09.enums import Grating
+from dodal.devices.insertion_device.energy_motor_lookup import (
+    ConfigServerEnergyMotorLookup,
+)
+from dodal.devices.insertion_device.lookup_table_models import LookupTableColumnConfig
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
+J09_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
+LOOK_UPTABLE_DIR = "/dls_sw/i09-2/software/gda/workspace_git/gda-diamond.git/configurations/i09-2-shared/lookupTables/"
+GAP_LOOKUP_FILE_NAME = "JIDEnergy2GapCalibrations.csv"
+PHASE_LOOKUP_FILE_NAME = "JIDEnergy2PhaseCalibrations.csv"
+
 BL = get_beamline_name("i09-2")
 PREFIX = BeamlinePrefix(BL, suffix="J")
 set_log_beamline(BL)
@@ -55,3 +76,37 @@ def jid() -> Apple2:
         id_gap=jid_gap(),
         id_phase=jid_phase(),
     )
+
+
+@device_factory()
+def jid_controller() -> J09Apple2Controller:
+    """J09 insertion device controller."""
+    return J09Apple2Controller(
+        apple2=jid(),
+        gap_energy_motor_lut=ConfigServerEnergyMotorLookup(
+            lut_config=LookupTableColumnConfig(poly_deg=J09_GAP_POLY_DEG_COLUMNS),
+            config_client=J09_CONF_CLIENT,
+            path=Path(LOOK_UPTABLE_DIR, GAP_LOOKUP_FILE_NAME),
+        ),
+        phase_energy_motor_lut=ConfigServerEnergyMotorLookup(
+            lut_config=LookupTableColumnConfig(poly_deg=J09_PHASE_POLY_DEG_COLUMNS),
+            config_client=J09_CONF_CLIENT,
+            path=Path(LOOK_UPTABLE_DIR, PHASE_LOOKUP_FILE_NAME),
+        ),
+    )
+
+
+@device_factory()
+def jid_energy() -> InsertionDeviceEnergy:
+    return InsertionDeviceEnergy(id_controller=jid_controller())
+
+
+@device_factory()
+def jid_polarisation() -> InsertionDevicePolarisation:
+    return InsertionDevicePolarisation(id_controller=jid_controller())
+
+
+@device_factory()
+def energy_jid() -> BeamEnergy:
+    """Beam energy."""
+    return BeamEnergy(id_energy=jid_energy(), mono=pgm().energy)

dodal/beamlines/i10_optics.py

@@ -6,18 +6,12 @@ note:
     idd == id1,    idu == id2.
 """
 
+from pathlib import Path
+
 from daq_config_server.client import ConfigServer
 
 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 (
-    BeamEnergy,
-    InsertionDeviceEnergy,
-    InsertionDevicePolarisation,
-    UndulatorGap,
-    UndulatorJawPhase,
-    UndulatorPhaseAxes,
-)
 from dodal.devices.i10 import (
     I10SharedDiagnostic,
     I10SharedSlits,
@@ -32,6 +26,23 @@ from dodal.devices.i10.i10_apple2 import (
 
 # Imports taken from i10 while we work out how to deal with split end stations
 from dodal.devices.i10.i10_setting_data import I10Grating
+from dodal.devices.insertion_device.apple2_undulator import (
+    BeamEnergy,
+    InsertionDeviceEnergy,
+    InsertionDevicePolarisation,
+    UndulatorGap,
+    UndulatorJawPhase,
+    UndulatorPhaseAxes,
+)
+from dodal.devices.insertion_device.energy_motor_lookup import (
+    ConfigServerEnergyMotorLookup,
+)
+from dodal.devices.insertion_device.lookup_table_models import (
+    DEFAULT_GAP_FILE,
+    DEFAULT_PHASE_FILE,
+    LookupTableColumnConfig,
+    Source,
+)
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -42,8 +53,6 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 PREFIX = BeamlinePrefix(BL)
 
-LOOK_UPTABLE_DIR = "/dls_sw/i10/software/blueapi/scratch/i10-config/lookupTables/"
-
 
 @device_factory()
 def synchrotron() -> Synchrotron:
@@ -115,11 +124,21 @@ def idd() -> I10Apple2:
 @device_factory()
 def idd_controller() -> I10Apple2Controller:
     """I10 downstream insertion device controller."""
+    source = Source(column="Source", value="idd")
+    idd_gap_energy_motor_lut = ConfigServerEnergyMotorLookup(
+        config_client=I10_CONF_CLIENT,
+        lut_config=LookupTableColumnConfig(source=source),
+        path=Path(LOOK_UPTABLE_DIR, DEFAULT_GAP_FILE),
+    )
+    idd_phase_energy_motor_lut = ConfigServerEnergyMotorLookup(
+        config_client=I10_CONF_CLIENT,
+        lut_config=LookupTableColumnConfig(source=source),
+        path=Path(LOOK_UPTABLE_DIR, DEFAULT_PHASE_FILE),
+    )
     return I10Apple2Controller(
         apple2=idd(),
-        lookuptable_dir=LOOK_UPTABLE_DIR,
-        source=("Source", "idd"),
-        config_client=I10_CONF_CLIENT,
+        gap_energy_motor_lut=idd_gap_energy_motor_lut,
+        phase_energy_motor_lut=idd_phase_energy_motor_lut,
     )
 
 
@@ -179,11 +198,21 @@ def idu() -> I10Apple2:
 @device_factory()
 def idu_controller() -> I10Apple2Controller:
     """I10 upstream insertion device controller."""
-    return I10Apple2Controller(
-        apple2=idu(),
-        lookuptable_dir=LOOK_UPTABLE_DIR,
-        source=("Source", "idu"),
+    source = Source(column="Source", value="idu")
+    idu_gap_energy_motor_lut = ConfigServerEnergyMotorLookup(
+        config_client=I10_CONF_CLIENT,
+        lut_config=LookupTableColumnConfig(source=source),
+        path=Path(LOOK_UPTABLE_DIR, DEFAULT_GAP_FILE),
+    )
+    idu_phase_energy_motor_lut = ConfigServerEnergyMotorLookup(
         config_client=I10_CONF_CLIENT,
+        lut_config=LookupTableColumnConfig(source=source),
+        path=Path(LOOK_UPTABLE_DIR, DEFAULT_PHASE_FILE),
+    )
+    return I10Apple2Controller(
+        apple2=idd(),
+        gap_energy_motor_lut=idu_gap_energy_motor_lut,
+        phase_energy_motor_lut=idu_phase_energy_motor_lut,
     )
 
 

dodal/beamlines/i17.py

@@ -7,7 +7,8 @@ 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.i17.i17_apple2 import I17Apple2Controller
+from dodal.devices.insertion_device.apple2_undulator import (
     Apple2,
     Apple2Controller,
     BeamEnergy,
@@ -16,7 +17,8 @@ from dodal.devices.apple2_undulator import (
     UndulatorGap,
     UndulatorPhaseAxes,
 )
-from dodal.devices.i17.i17_apple2 import I17Apple2Controller
+from dodal.devices.insertion_device.energy_motor_lookup import EnergyMotorLookup
+from dodal.devices.insertion_device.lookup_table_models import LookupTable
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -76,7 +78,9 @@ def id() -> Apple2:
 def id_controller() -> Apple2Controller:
     """I17 insertion device controller with dummy energy to motor_converter."""
     return I17Apple2Controller(
-        apple2=id(), energy_to_motor_converter=lambda energy, pol: (0.0, 0.0)
+        apple2=id(),
+        gap_energy_motor_lut=EnergyMotorLookup(lut=LookupTable()),
+        phase_energy_motor_lut=EnergyMotorLookup(lut=LookupTable()),
     )
 
 

dodal/beamlines/i18.py

@@ -23,7 +23,7 @@ from dodal.devices.motors import XYStage, XYZThetaStage
 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.undulator import UndulatorInKeV
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -53,8 +53,8 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def undulator() -> Undulator:
-    return Undulator(f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+def undulator() -> UndulatorInKeV:
+    return UndulatorInKeV(f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
 
 
 # See https://github.com/DiamondLightSource/dodal/issues/1180

dodal/beamlines/i19_1.py

@@ -4,6 +4,9 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
+from dodal.devices.i19.access_controlled.attenuator_motor_squad import (
+    AttenuatorMotorSquad,
+)
 from dodal.devices.i19.access_controlled.blueapi_device import HutchState
 from dodal.devices.i19.access_controlled.shutter import (
     AccessControlledShutter,
@@ -29,6 +32,8 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 
 
+I19_1_COMMISSIONING_INSTR_SESSION: str = "cm40638-5"
+
 I19_1_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(TTL_PILATUS=1),
     sources=ZebraSources(),
@@ -40,6 +45,13 @@ ZOOM_PARAMS_FILE = (
 DISPLAY_CONFIG = "/dls_sw/i19-1/software/daq_configuration/domain/display.configuration"
 
 
+@device_factory()
+def attenuator_motor_squad() -> AttenuatorMotorSquad:
+    return AttenuatorMotorSquad(
+        hutch=HutchState.EH1, instrument_session=I19_1_COMMISSIONING_INSTR_SESSION
+    )
+
+
 # Needs to wait until enum is fixed on the beamline
 # See https://github.com/DiamondLightSource/dodal/issues/1150
 @device_factory()
@@ -58,19 +70,6 @@ def oav() -> OAVBeamCentreFile:
     )
 
 
-# NOTE EH1 uses the Zebra 2 box. While a Zebra 1 box exists and is connected
-# on the beamline, it is currently not in use
-@device_factory()
-def zebra() -> Zebra:
-    """Get the i19-1 zebra device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i19-1, it will return the existing object.
-    """
-    return Zebra(
-        mapping=I19_1_ZEBRA_MAPPING,
-        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-02:",
-    )
-
-
 @device_factory()
 def shutter() -> AccessControlledShutter:
     """Get the i19-1 hutch shutter device, instantiate it if it hasn't already been.
@@ -79,7 +78,7 @@ def shutter() -> AccessControlledShutter:
     return AccessControlledShutter(
         prefix=f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
         hutch=HutchState.EH1,
-        instrument_session="cm40638-4",
+        instrument_session=I19_1_COMMISSIONING_INSTR_SESSION,
     )
 
 
@@ -89,3 +88,16 @@ def synchrotron() -> Synchrotron:
     If this is called when already instantiated in i19-1, it will return the existing object.
     """
     return Synchrotron()
+
+
+# NOTE EH1 uses the Zebra 2 box. While a Zebra 1 box exists and is connected
+# on the beamline, it is currently not in use
+@device_factory()
+def zebra() -> Zebra:
+    """Get the i19-1 zebra device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i19-1, it will return the existing object.
+    """
+    return Zebra(
+        mapping=I19_1_ZEBRA_MAPPING,
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-02:",
+    )

dodal/beamlines/i19_2.py

@@ -12,6 +12,9 @@ from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
 from dodal.common.visit import StaticVisitPathProvider
+from dodal.devices.i19.access_controlled.attenuator_motor_squad import (
+    AttenuatorMotorSquad,
+)
 from dodal.devices.i19.access_controlled.blueapi_device import HutchState
 from dodal.devices.i19.access_controlled.shutter import AccessControlledShutter
 from dodal.devices.i19.backlight import BacklightPosition
@@ -43,6 +46,7 @@ set_path_provider(
     )
 )
 
+I19_2_COMMISSIONING_INSTR_SESSION: str = "cm40639-5"
 
 I19_2_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(),
@@ -51,8 +55,18 @@ I19_2_ZEBRA_MAPPING = ZebraMapping(
 
 
 @device_factory()
-def diffractometer() -> FourCircleDiffractometer:
-    return FourCircleDiffractometer(prefix=PREFIX.beamline_prefix)
+def attenuator_motor_squad() -> AttenuatorMotorSquad:
+    return AttenuatorMotorSquad(
+        hutch=HutchState.EH2, instrument_session=I19_2_COMMISSIONING_INSTR_SESSION
+    )
+
+
+@device_factory()
+def backlight() -> BacklightPosition:
+    """Get the i19-2 backlight device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i19-2, it will return the existing object.
+    """
+    return BacklightPosition(prefix=f"{PREFIX.beamline_prefix}-EA-IOC-12:")
 
 
 @device_factory()
@@ -64,34 +78,26 @@ def beamstop() -> BeamStop:
 
 
 @device_factory()
-def zebra() -> Zebra:
-    """Get the i19-2 zebra device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i19-2, it will return the existing object.
-    """
-    return Zebra(
-        mapping=I19_2_ZEBRA_MAPPING,
-        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-03:",
-    )
+def diffractometer() -> FourCircleDiffractometer:
+    return FourCircleDiffractometer(prefix=PREFIX.beamline_prefix)
 
 
 @device_factory()
-def shutter() -> AccessControlledShutter:
-    """Get the i19-2 hutch shutter device, instantiate it if it hasn't already been.
-    If this is called when already instantiated, it will return the existing object.
-    """
-    return AccessControlledShutter(
-        prefix=f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
-        hutch=HutchState.EH2,
-        instrument_session="cm40639-4",
+def eiger() -> EigerDetector:
+    return EigerDetector(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-01:",
+        hdf_suffix="-EA-EIGER-01:OD:",
     )
 
 
 @device_factory()
-def synchrotron() -> Synchrotron:
-    """Get the i19-2 synchrotron device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i19-2, it will return the existing object.
-    """
-    return Synchrotron()
+def panda() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
+        path_provider=get_path_provider(),
+    )
 
 
 @device_factory()
@@ -104,26 +110,31 @@ def pinhole_and_collimator() -> PinholeCollimatorControl:
 
 
 @device_factory()
-def backlight() -> BacklightPosition:
-    """Get the i19-2 backlight device, instantiate it if it hasn't already been.
-    If this is called when already instantiated in i19-2, it will return the existing object.
+def shutter() -> AccessControlledShutter:
+    """Get the i19-2 hutch shutter device, instantiate it if it hasn't already been.
+    If this is called when already instantiated, it will return the existing object.
     """
-    return BacklightPosition(prefix=f"{PREFIX.beamline_prefix}-EA-IOC-12:")
+    return AccessControlledShutter(
+        prefix=f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
+        hutch=HutchState.EH2,
+        instrument_session=I19_2_COMMISSIONING_INSTR_SESSION,
+    )
 
 
 @device_factory()
-def panda() -> HDFPanda:
-    return HDFPanda(
-        prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
-        path_provider=get_path_provider(),
-    )
+def synchrotron() -> Synchrotron:
+    """Get the i19-2 synchrotron device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i19-2, it will return the existing object.
+    """
+    return Synchrotron()
 
 
 @device_factory()
-def eiger() -> EigerDetector:
-    return EigerDetector(
-        prefix=PREFIX.beamline_prefix,
-        path_provider=get_path_provider(),
-        drv_suffix="-EA-EIGER-01:",
-        hdf_suffix="-EA-EIGER-01:OD:",
+def zebra() -> Zebra:
+    """Get the i19-2 zebra device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i19-2, it will return the existing object.
+    """
+    return Zebra(
+        mapping=I19_2_ZEBRA_MAPPING,
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-03:",
     )

dodal/beamlines/i21.py

@@ -2,12 +2,12 @@ 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.i21 import Grating
+from dodal.devices.insertion_device.apple2_undulator import (
     Apple2,
     UndulatorGap,
     UndulatorPhaseAxes,
 )
-from dodal.devices.i21 import Grating
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline

dodal/beamlines/i22.py

@@ -19,11 +19,11 @@ from dodal.devices.i22.dcm import DCM
 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.motors import XYPitchStage
+from dodal.devices.motors import XYPitchStage, XYRollStage, XYStage
 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.undulator import UndulatorInKeV
 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
@@ -160,8 +160,8 @@ def dcm() -> DCM:
 
 
 @device_factory()
-def undulator() -> Undulator:
-    return Undulator(
+def undulator() -> UndulatorInKeV:
+    return UndulatorInKeV(
         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,
@@ -274,3 +274,18 @@ def ppump() -> WatsonMarlow323Pump:
 @device_factory()
 def base() -> XYPitchStage:
     return XYPitchStage(f"{PREFIX.beamline_prefix}-MO-STABL-01:")
+
+
+@device_factory()
+def bs1() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-SAXSP-01:BS1:")
+
+
+@device_factory()
+def bs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-SAXSP-01:BS2:")
+
+
+@device_factory()
+def bs3() -> XYRollStage:
+    return XYRollStage(f"{PREFIX.beamline_prefix}-MO-SAXSP-01:BS3:")

dodal/beamlines/p38.py

@@ -22,7 +22,7 @@ from dodal.devices.linkam3 import Linkam3
 from dodal.devices.pressure_jump_cell import PressureJumpCell
 from dodal.devices.slits import Slits
 from dodal.devices.tetramm import TetrammDetector
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 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
@@ -157,8 +157,8 @@ def dcm() -> DCM:
 
 
 @device_factory(mock=True)
-def undulator() -> Undulator:
-    return Undulator(
+def undulator() -> UndulatorInKeV:
+    return UndulatorInKeV(
         f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
         poles=80,
         length=2.0,