dls-dodal 1.44.0__tar.gz → 1.46.0__tar.gz

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.44.0
+Version: 1.46.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.10.0a1
+Requires-Dist: ophyd-async>=0.10.0a3
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/docs/reference/device-standards.rst

@@ -13,8 +13,8 @@ Where to put devices
 Dodal is written with the philosophy that Ophyd devices should be assumed to be as generic as possible. I.e. you 
 should think about where to place them in the following order:
 
-#. A device that could be used at any facility, e.g. a generic ``EpicsMotor`` or a commercial product with a 
-   standard IOC, should go in https://github.com/bluesky/ophyd-epics-devices
+#. A device that could be used at any facility, e.g. a generic ``Motor`` or a commercial product with a 
+   standard IOC, should go in https://github.com/bluesky/ophyd-async
 #. A device that may be on any beamline should go in the top level of the ``devices`` folder. If it is a quite 
    complex device (e.g. multiple files) it should have a folder of its own e.g. ``oav``
 #. A device that is very specific to a particular beamline should go in the ``devices/ixx`` folder

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/pyproject.toml

@@ -15,7 +15,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async>=0.10.0a1",
+    "ophyd-async>=0.10.0a3",
     "bluesky",
     "pyepics",
     "dataclasses-json",

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.44.0
+Version: 1.46.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async>=0.10.0a1
+Requires-Dist: ophyd-async>=0.10.0a3
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -92,9 +92,13 @@ src/dodal/beamlines/__init__.py
 src/dodal/beamlines/adsim.py
 src/dodal/beamlines/aithre.py
 src/dodal/beamlines/b01_1.py
+src/dodal/beamlines/b07.py
+src/dodal/beamlines/b07_1.py
 src/dodal/beamlines/i02_1.py
 src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
+src/dodal/beamlines/i09.py
+src/dodal/beamlines/i09_1.py
 src/dodal/beamlines/i10.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i18.py
@@ -107,6 +111,7 @@ src/dodal/beamlines/i23.py
 src/dodal/beamlines/i24.py
 src/dodal/beamlines/p38.py
 src/dodal/beamlines/p45.py
+src/dodal/beamlines/p60.py
 src/dodal/beamlines/p99.py
 src/dodal/beamlines/training_rig.py
 src/dodal/common/__init__.py
@@ -131,8 +136,8 @@ src/dodal/devices/apple2_undulator.py
 src/dodal/devices/backlight.py
 src/dodal/devices/baton.py
 src/dodal/devices/bimorph_mirror.py
+src/dodal/devices/common_dcm.py
 src/dodal/devices/cryostream.py
-src/dodal/devices/dcm.py
 src/dodal/devices/diamond_filter.py
 src/dodal/devices/eiger.py
 src/dodal/devices/eiger_odin.py
@@ -161,7 +166,6 @@ src/dodal/devices/tetramm.py
 src/dodal/devices/thawer.py
 src/dodal/devices/turbo_slit.py
 src/dodal/devices/undulator.py
-src/dodal/devices/undulator_dcm.py
 src/dodal/devices/watsonmarlow323_pump.py
 src/dodal/devices/webcam.py
 src/dodal/devices/xbpm_feedback.py
@@ -184,14 +188,18 @@ src/dodal/devices/detector/det_resolution.py
 src/dodal/devices/detector/detector.py
 src/dodal/devices/detector/detector_motion.py
 src/dodal/devices/electron_analyser/__init__.py
-src/dodal/devices/electron_analyser/base_region.py
-src/dodal/devices/electron_analyser/specs/__init__.py
-src/dodal/devices/electron_analyser/specs/specs_region.py
-src/dodal/devices/electron_analyser/vgscienta/__init__.py
-src/dodal/devices/electron_analyser/vgscienta/vgscienta_region.py
+src/dodal/devices/electron_analyser/abstract_analyser_io.py
+src/dodal/devices/electron_analyser/abstract_region.py
+src/dodal/devices/electron_analyser/specs_analyser_io.py
+src/dodal/devices/electron_analyser/specs_region.py
+src/dodal/devices/electron_analyser/vgscienta_analyser_io.py
+src/dodal/devices/electron_analyser/vgscienta_region.py
 src/dodal/devices/i03/__init__.py
 src/dodal/devices/i03/beamstop.py
+src/dodal/devices/i03/dcm.py
+src/dodal/devices/i03/undulator_dcm.py
 src/dodal/devices/i04/transfocator.py
+src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
 src/dodal/devices/i10/i10_setting_data.py
 src/dodal/devices/i10/mirrors.py
@@ -208,6 +216,7 @@ src/dodal/devices/i18/table.py
 src/dodal/devices/i18/thor_labs_stage.py
 src/dodal/devices/i19/__init__.py
 src/dodal/devices/i19/beamstop.py
+src/dodal/devices/i19/blueapi_device.py
 src/dodal/devices/i19/hutch_access.py
 src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
@@ -246,7 +255,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/motor_utils.py
 src/dodal/devices/util/test_utils.py
 src/dodal/devices/xspress3/xspress3.py
 src/dodal/devices/xspress3/xspress3_channel.py
@@ -264,6 +272,8 @@ src/dodal/plan_stubs/check_topup.py
 src/dodal/plan_stubs/data_session.py
 src/dodal/plan_stubs/motor_utils.py
 src/dodal/plan_stubs/wrapped.py
+src/dodal/plan_stubs/electron_analyser/__init__.py
+src/dodal/plan_stubs/electron_analyser/configure_controller.py
 src/dodal/plans/__init__.py
 src/dodal/plans/save_panda.py
 src/dodal/plans/scanspec.py
@@ -315,11 +325,13 @@ tests/common/beamlines/test_beamline_utils.py
 tests/common/beamlines/test_device_helpers.py
 tests/common/beamlines/test_device_instantiation.py
 tests/devices/__init__.py
+tests/devices/test_common_dcm.py
 tests/devices/test_diamond_filter.py
 tests/devices/i03/__init__.py
 tests/devices/i03/test_beamstop.py
 tests/devices/i04/__init__.py
 tests/devices/i04/test_transfocator.py
+tests/devices/i10/test_diagnostic.py
 tests/devices/i10/test_i10Apple2.py
 tests/devices/i10/lookupTables/IDEnergy2GapCalibrations.csv
 tests/devices/i10/lookupTables/IDEnergy2PhaseCalibrations.csv
@@ -351,7 +363,6 @@ tests/devices/unit_tests/test_baton.py
 tests/devices/unit_tests/test_beam_converter.py
 tests/devices/unit_tests/test_beamline_undulator_to_gap_lookup_table.txt
 tests/devices/unit_tests/test_bimorph_mirror.py
-tests/devices/unit_tests/test_dcm.py
 tests/devices/unit_tests/test_display.configuration
 tests/devices/unit_tests/test_eiger.py
 tests/devices/unit_tests/test_focusing_mirror.py
@@ -361,6 +372,7 @@ tests/devices/unit_tests/test_jCameraManZoomLevels.xml
 tests/devices/unit_tests/test_linkam3.py
 tests/devices/unit_tests/test_lookup_table.txt
 tests/devices/unit_tests/test_lookup_table_2.txt
+tests/devices/unit_tests/test_motors.py
 tests/devices/unit_tests/test_odin.py
 tests/devices/unit_tests/test_pressure_jump_cell.py
 tests/devices/unit_tests/test_qbpm.py
@@ -370,8 +382,8 @@ tests/devices/unit_tests/test_status.py
 tests/devices/unit_tests/test_synchrotron.py
 tests/devices/unit_tests/test_tetramm.py
 tests/devices/unit_tests/test_thawer.py
+tests/devices/unit_tests/test_turbo_slit.py
 tests/devices/unit_tests/test_undulator.py
-tests/devices/unit_tests/test_undulator_dcm.py
 tests/devices/unit_tests/test_utils.py
 tests/devices/unit_tests/test_watsonmarlow323_pump.py
 tests/devices/unit_tests/test_webcam.py
@@ -387,9 +399,17 @@ tests/devices/unit_tests/current_amplifier/test_sr570.py
 tests/devices/unit_tests/detector/test_det_dim_constants.py
 tests/devices/unit_tests/detector/test_det_resolution.py
 tests/devices/unit_tests/detector/test_detector.py
+tests/devices/unit_tests/electron_analyser/__init__.py
+tests/devices/unit_tests/electron_analyser/conftest.py
+tests/devices/unit_tests/electron_analyser/test_base_analayser_io.py
+tests/devices/unit_tests/electron_analyser/test_specs_analyser_io.py
 tests/devices/unit_tests/electron_analyser/test_specs_region.py
+tests/devices/unit_tests/electron_analyser/test_util.py
+tests/devices/unit_tests/electron_analyser/test_vgscienta_analyser_io.py
 tests/devices/unit_tests/electron_analyser/test_vgscienta_region.py
-tests/devices/unit_tests/electron_analyser/utils.py
+tests/devices/unit_tests/i03/__init__.py
+tests/devices/unit_tests/i03/test_dcm.py
+tests/devices/unit_tests/i03/test_undulator_dcm.py
 tests/devices/unit_tests/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
 tests/devices/unit_tests/i24/test_focus_mirrors.py

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async>=0.10.0a1
+ophyd-async>=0.10.0a3
 bluesky
 pyepics
 dataclasses-json

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.44.0'
-__version_tuple__ = version_tuple = (1, 44, 0)
+__version__ = version = '1.46.0'
+__version_tuple__ = version_tuple = (1, 46, 0)

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/__init__.py

@@ -9,6 +9,8 @@ from pathlib import Path
 # module name. Add any new beamlines whose name differs from their module name to this
 # dictionary, which maps ${BEAMLINE} to dodal.beamlines.<MODULE NAME>
 _BEAMLINE_NAME_OVERRIDES = {
+    "b07-1": "b07_1",
+    "i09-1": "i09_1",
     "i13-1": "i13_1",
     "i20-1": "i20_1",
     "i19-1": "i19_1",

dls_dodal-1.46.0/src/dodal/beamlines/b07.py

@@ -0,0 +1,27 @@
+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.specs_analyser_io import (
+    SpecsAnalyserDriverIO,
+)
+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("b07")
+PREFIX = BeamlinePrefix(BL, suffix="B")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(
+        name="analyser_driver", prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:"
+    )

dls_dodal-1.46.0/src/dodal/beamlines/b07_1.py

@@ -0,0 +1,25 @@
+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.specs_analyser_io import (
+    SpecsAnalyserDriverIO,
+)
+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("b07-1")
+PREFIX = BeamlinePrefix(BL, suffix="C")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/i03.py

@@ -18,7 +18,6 @@ from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.baton import Baton
 from dodal.devices.cryostream import CryoStream
-from dodal.devices.dcm import DCM
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.diamond_filter import DiamondFilter, I03Filters
 from dodal.devices.eiger import EigerDetector
@@ -26,6 +25,8 @@ from dodal.devices.fast_grid_scan import PandAFastGridScan, ZebraFastGridScan
 from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
 from dodal.devices.i03.beamstop import Beamstop
+from dodal.devices.i03.dcm import DCM
+from dodal.devices.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.motors import XYZPositioner
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVConfig
@@ -37,7 +38,6 @@ 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_dcm import UndulatorDCM
 from dodal.devices.webcam import Webcam
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.xspress3.xspress3 import Xspress3
@@ -113,8 +113,8 @@ def dcm() -> DCM:
     If this is called when already instantiated in i03, it will return the existing object.
     """
     return DCM(
-        f"{PREFIX.beamline_prefix}-MO-DCM-01:",
-        "dcm",
+        prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:",
+        name="dcm",
     )
 
 

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/i04.py

@@ -10,13 +10,13 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
-from dodal.devices.dcm import DCM
 from dodal.devices.detector import DetectorParams
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.diamond_filter import DiamondFilter, I04Filters
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import ZebraFastGridScan
 from dodal.devices.flux import Flux
+from dodal.devices.i03.dcm import DCM
 from dodal.devices.i04.transfocator import Transfocator
 from dodal.devices.ipin import IPin
 from dodal.devices.motors import XYZPositioner

dls_dodal-1.46.0/src/dodal/beamlines/i09.py

@@ -0,0 +1,25 @@
+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.vgscienta_analyser_io import (
+    VGScientaAnalyserDriverIO,
+)
+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("i09")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> VGScientaAnalyserDriverIO:
+    return VGScientaAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")

dls_dodal-1.46.0/src/dodal/beamlines/i09_1.py

@@ -0,0 +1,25 @@
+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.specs_analyser_io import (
+    SpecsAnalyserDriverIO,
+)
+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("i09-1")
+PREFIX = BeamlinePrefix(BL, suffix="I")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:")

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/i10.py

@@ -8,6 +8,7 @@ from dodal.devices.apple2_undulator import (
     UndulatorPhaseAxes,
 )
 from dodal.devices.current_amplifiers import CurrentAmpDet
+from dodal.devices.i10.diagnostics import I10Diagnostic, I10Diagnostic5ADet
 from dodal.devices.i10.i10_apple2 import (
     I10Apple2,
     I10Apple2PGM,
@@ -24,10 +25,9 @@ from dodal.devices.i10.rasor.rasor_motors import (
     PinHole,
 )
 from dodal.devices.i10.rasor.rasor_scaler_cards import RasorScalerCard1
-from dodal.devices.i10.slits import I10PrimarySlits, I10Slits
+from dodal.devices.i10.slits import I10Slits, I10SlitsDrainCurrent
 from dodal.devices.motors import XYZPositioner
 from dodal.devices.pgm import PGM
-from dodal.devices.slits import MinimalSlits
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -272,6 +272,9 @@ def idd_la_angle(
     )
 
 
+"""Mirrors"""
+
+
 @device_factory()
 def first_mirror() -> PiezoMirror:
     return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-COL-01:")
@@ -283,58 +286,39 @@ def switching_mirror() -> PiezoMirror:
 
 
 @device_factory()
-def slit_1() -> I10PrimarySlits:
-    return I10PrimarySlits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
-    )
+def focusing_mirror() -> PiezoMirror:
+    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCS-01:")
 
 
-@device_factory()
-def slit_2() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
-    )
+"""Optic slits"""
 
 
 @device_factory()
-def slit_3() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:",
-    )
-
-
-"""Rasor devices"""
+def slits() -> I10Slits:
+    return I10Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-")
 
 
 @device_factory()
-def focusing_mirror() -> PiezoMirror:
-    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCS-01:")
+def slits_current() -> I10SlitsDrainCurrent:
+    return I10SlitsDrainCurrent(prefix=f"{PREFIX.beamline_prefix}-")
 
 
-@device_factory()
-def slit_4() -> MinimalSlits:
-    return MinimalSlits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
-        x_gap="XSIZE",
-        y_gap="YSIZE",
-    )
+"""Diagnostics"""
 
 
 @device_factory()
-def slit_5() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+def diagnostics() -> I10Diagnostic:
+    return I10Diagnostic(
+        prefix=f"{PREFIX.beamline_prefix}-DI-",
     )
 
 
 @device_factory()
-def slit_6() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:",
-    )
+def d5a_det() -> I10Diagnostic5ADet:
+    return I10Diagnostic5ADet(prefix=f"{PREFIX.beamline_prefix}-DI-")
 
 
-"Rasor devices"
+"""Rasor devices"""
 
 
 @device_factory()

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/i18.py

@@ -12,7 +12,7 @@ from dodal.common.visit import (
     LocalDirectoryServiceClient,
     StaticVisitPathProvider,
 )
-from dodal.devices.dcm import DCM
+from dodal.devices.common_dcm import BaseDCM, PitchAndRollCrystal, RollCrystal
 from dodal.devices.i18.diode import Diode
 from dodal.devices.i18.KBMirror import KBMirror
 from dodal.devices.i18.table import Table
@@ -54,12 +54,15 @@ def undulator() -> Undulator:
     return Undulator(f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
 
 
-@device_factory()
-def dcm() -> DCM:
+# See https://github.com/DiamondLightSource/dodal/issues/1180
+@device_factory(skip=True)
+def dcm() -> BaseDCM[RollCrystal, PitchAndRollCrystal]:
     # once spacing is added Si111 d-spacing is 3.135 angsterm , and Si311 is 1.637
     # calculations are in gda/config/lookupTables/Si111/eV_Deg_converter.xml
-    return DCM(
+    return BaseDCM(
         prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:",
+        xtal_1=RollCrystal,
+        xtal_2=PitchAndRollCrystal,
     )
 
 

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/i19_1.py

@@ -5,7 +5,8 @@ from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
 from dodal.devices.i19.beamstop import BeamStop
-from dodal.devices.i19.shutter import AccessControlledShutter, HutchState
+from dodal.devices.i19.blueapi_device import HutchState
+from dodal.devices.i19.shutter import AccessControlledShutter
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVConfig
 from dodal.devices.synchrotron import Synchrotron

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/i19_2.py

@@ -5,7 +5,8 @@ from dodal.common.beamlines.beamline_utils import (
     set_beamline as set_utils_beamline,
 )
 from dodal.devices.i19.beamstop import BeamStop
-from dodal.devices.i19.shutter import AccessControlledShutter, HutchState
+from dodal.devices.i19.blueapi_device import HutchState
+from dodal.devices.i19.shutter import AccessControlledShutter
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/i20_1.py

@@ -32,7 +32,8 @@ set_path_provider(
 )
 
 
-@device_factory()
+# NOTE this is mock as we cannot move items on the beamline until we get sign-off to do so
+@device_factory(mock=True)
 def turbo_slit() -> TurboSlit:
     """
     turboslit for selecting energy from the polychromator

{dls_dodal-1.44.0 → dls_dodal-1.46.0}/src/dodal/beamlines/i22.py

@@ -18,7 +18,7 @@ from dodal.common.crystal_metadata import (
 from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.bimorph_mirror import BimorphMirror
 from dodal.devices.focusing_mirror import FocusingMirror
-from dodal.devices.i22.dcm import DoubleCrystalMonochromator
+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
@@ -141,8 +141,8 @@ def bimorph_vfm() -> BimorphMirror:
 
 
 @device_factory()
-def dcm() -> DoubleCrystalMonochromator:
-    return DoubleCrystalMonochromator(
+def dcm() -> DCM:
+    return DCM(
         prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:",
         temperature_prefix=f"{PREFIX.beamline_prefix}-DI-DCM-01:",
         crystal_1_metadata=make_crystal_metadata_from_material(