dls-dodal 1.59.1__tar.gz → 1.60.0__tar.gz

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.59.1
+Version: 1.60.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
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async[ca,pva]>=0.13.2
-Requires-Dist: bluesky==1.14.2
+Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
@@ -230,7 +230,6 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
-Requires-Dist: event-model>=1.23
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
 Requires-Dist: daq-config-server>=v1.0.0-rc.2

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/docs/reference/device-standards.md

@@ -26,8 +26,8 @@ Determining where in dodal a device should live can be summarised below:
 
 ## Device Best Practices
 
-Ophyd-async directory contains a [flowchart](https://blueskyproject.io/ophyd-async/main/how-to/choose-interfaces-for-devices.html) for a simplified decision tree about what interfaces
-should a given device implement. In addition to this the following guidelines are strongly recommended:
+In general, you should follow the ophyd-async [guide](https://blueskyproject.io/ophyd-async/main/how-to/choose-right-baseclass.html) for what interfaces a device should implement.
+In addition to this the following guidelines are strongly recommended:
 
 * Device should have their name as an optional str parameter with a default of ""- this allows ophyd-async to automatically name the device
 * Devices should contain only the PV suffixes that are generic for any instance of the device. See [PV Suffixes](#pv-suffixes)

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "click",
     "ophyd",
     "ophyd-async[ca,pva]>=0.13.2",
-    "bluesky==1.14.2",  # https://github.com/bluesky/bluesky/issues/1938
+    "bluesky>=1.14.5",
     "pyepics",
     "dataclasses-json",
     "pillow",
@@ -29,7 +29,6 @@ dependencies = [
     "aiohttp",
     "redis",
     "scanspec>=0.7.3",
-    "event-model>=1.23",             # Until bluesky pins it https://github.com/DiamondLightSource/dodal/issues/1278
     "pyzmq==26.3.0",                 # Until we can move to RHEL 8 https://github.com/DiamondLightSource/mx-bluesky/issues/1139
     "deepdiff",
     "daq-config-server>=v1.0.0-rc.2",# For getting Configuration settings.

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.59.1
+Version: 1.60.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
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async[ca,pva]>=0.13.2
-Requires-Dist: bluesky==1.14.2
+Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
@@ -230,7 +230,6 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
-Requires-Dist: event-model>=1.23
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
 Requires-Dist: daq-config-server>=v1.0.0-rc.2

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -115,6 +115,8 @@ src/dodal/beamlines/i10-1.py
 src/dodal/beamlines/i10.py
 src/dodal/beamlines/i11.py
 src/dodal/beamlines/i13_1.py
+src/dodal/beamlines/i15.py
+src/dodal/beamlines/i15_1.py
 src/dodal/beamlines/i17.py
 src/dodal/beamlines/i18.py
 src/dodal/beamlines/i19_1.py
@@ -273,6 +275,13 @@ src/dodal/devices/i11/spinner.py
 src/dodal/devices/i13_1/__init__.py
 src/dodal/devices/i13_1/merlin.py
 src/dodal/devices/i13_1/merlin_controller.py
+src/dodal/devices/i15/dcm.py
+src/dodal/devices/i15/focussing_mirror.py
+src/dodal/devices/i15/jack.py
+src/dodal/devices/i15/laue.py
+src/dodal/devices/i15/motors.py
+src/dodal/devices/i15/multilayer_mirror.py
+src/dodal/devices/i15/rail.py
 src/dodal/devices/i18/KBMirror.py
 src/dodal/devices/i18/diode.py
 src/dodal/devices/i19/__init__.py
@@ -485,6 +494,7 @@ tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidu.pkl
 tests/devices/i11/test_i11devices.py
 tests/devices/i11/test_mythen.py
 tests/devices/i13_1/test_merlin.py
+tests/devices/i15/test_dcm.py
 tests/devices/i18/test_kb_mirror.py
 tests/devices/i19/__init__.py
 tests/devices/i19/test_backlight.py

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,7 +1,7 @@
 click
 ophyd
 ophyd-async[ca,pva]>=0.13.2
-bluesky==1.14.2
+bluesky>=1.14.5
 pyepics
 dataclasses-json
 pillow
@@ -15,7 +15,6 @@ aiofiles
 aiohttp
 redis
 scanspec>=0.7.3
-event-model>=1.23
 pyzmq==26.3.0
 deepdiff
 daq-config-server>=v1.0.0-rc.2

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.59.1'
-__version_tuple__ = version_tuple = (1, 59, 1)
+__version__ = version = '1.60.0'
+__version_tuple__ = version_tuple = (1, 60, 0)
 
-__commit_id__ = commit_id = 'g67bd9e286'
+__commit_id__ = commit_id = 'gb3036ebaf'

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/src/dodal/beamlines/__init__.py

@@ -13,6 +13,7 @@ _BEAMLINE_NAME_OVERRIDES = {
     "b07-1": "b07_1",
     "i09-1": "i09_1",
     "i13-1": "i13_1",
+    "i15-1": "i15_1",
     "i20-1": "i20_1",
     "i19-1": "i19_1",
     "i19-2": "i19_2",

dls_dodal-1.60.0/src/dodal/beamlines/i15.py

@@ -0,0 +1,242 @@
+from ophyd_async.epics.motor import Motor
+
+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.i15.dcm import DCM
+from dodal.devices.i15.focussing_mirror import (
+    FocusingMirror,
+    FocusingMirrorHorizontal,
+    FocusingMirrorVertical,
+    FocusingMirrorWithRoll,
+)
+from dodal.devices.i15.jack import JackX, JackY
+from dodal.devices.i15.motors import UpstreamDownstreamPair
+from dodal.devices.motors import (
+    SixAxisGonioKappaPhi,
+    XYStage,
+    XYZPitchYawStage,
+    XYZStage,
+)
+from dodal.devices.slits import Slits, SlitsY
+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("i15")  # Default used when not on a live beamline
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)  # Configure logging and util functions
+set_utils_beamline(BL)
+
+"""
+Define device factory functions below this point.
+A device factory function is any function that has a return type which conforms
+to one or more Bluesky Protocols.
+"""
+
+
+@device_factory()
+def arm() -> UpstreamDownstreamPair:
+    return UpstreamDownstreamPair(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:ARM:")
+
+
+@device_factory()
+def beamstop() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-RS-ABSB-04:")
+
+
+@device_factory()
+def bs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-RS-ABSB-08:")
+
+
+@device_factory()
+def bs3() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-RS-ABSB-09:")
+
+
+@device_factory()
+def dcm() -> DCM:
+    return DCM(f"{PREFIX.beamline_prefix}-OP-DCM-01:")
+
+
+@device_factory()
+def det1z() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-DIFF-01:ARM:DETECTOR:Z")
+
+
+@device_factory()
+def det2z() -> Motor:
+    """Deliberately the same as eht2dtx"""
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-03:DETECTOR2:Z")
+
+
+@device_factory()
+def diffractometer() -> SixAxisGonioKappaPhi:
+    return SixAxisGonioKappaPhi(
+        prefix=f"{PREFIX.beamline_prefix}-MO-DIFF-01:SAMPLE:",
+        phi_infix="KPHI",
+    )
+
+
+@device_factory()
+def djack1() -> JackX:
+    return JackX(f"{PREFIX.beamline_prefix}-MO-DIFF-01:BASE:")
+
+
+@device_factory()
+def eht2dtx() -> Motor:
+    """Deliberately the same as det2z"""
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-03:DETECTOR2:Z")
+
+
+@device_factory()
+def f2x() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-RS-ABSB-10:X")
+
+
+@device_factory()
+def fs() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
+
+
+@device_factory()
+def fs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-EA-SHTR-02:")
+
+
+@device_factory()
+def hfm() -> FocusingMirrorWithRoll:
+    return FocusingMirrorWithRoll(f"{PREFIX.beamline_prefix}-OP-HFM-01:")
+
+
+@device_factory()
+def laserboard() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:")
+
+
+@device_factory()
+def obj() -> UpstreamDownstreamPair:
+    return UpstreamDownstreamPair(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OBJ:")
+
+
+@device_factory()
+def opticds() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OPTIC:DS:")
+
+
+@device_factory()
+def opticus() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-LHEAT-01:OPTIC:US:")
+
+
+@device_factory()
+def pin3() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-AL-APTR-03:")
+
+
+@device_factory()
+def pin() -> XYZPitchYawStage:
+    return XYZPitchYawStage(f"{PREFIX.beamline_prefix}-AL-APTR-02:")
+
+
+@device_factory()
+def qbpm1() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-DI-QBPM-01:")
+
+
+@device_factory()
+def qbpm2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-DI-QBPM-02:")
+
+
+@device_factory()
+def s1() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s2() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s4() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s5() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s6() -> SlitsY:
+    return SlitsY(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def s7() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-07:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def shd() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-SHEAD-01:")
+
+
+@device_factory()
+def shd2() -> XYZStage:
+    return XYZStage(f"{PREFIX.beamline_prefix}-MO-SHEAD-02:")
+
+
+@device_factory()
+def shfm() -> FocusingMirrorHorizontal:
+    return FocusingMirrorHorizontal(f"{PREFIX.beamline_prefix}-OP-MIRR-03:HFM:")
+
+
+@device_factory()
+def skb() -> JackY:
+    return JackY(f"{PREFIX.beamline_prefix}-OP-MIRR-03:BASE:")
+
+
+@device_factory()
+def svfm() -> FocusingMirrorVertical:
+    return FocusingMirrorVertical(f"{PREFIX.beamline_prefix}-OP-MIRR-03:VFM:")
+
+
+@device_factory()
+def tab2jack() -> JackX:
+    return JackX(f"{PREFIX.beamline_prefix}-MO-TABLE-03:BASE:")
+
+
+@device_factory()
+def vfm() -> FocusingMirror:
+    return FocusingMirror(f"{PREFIX.beamline_prefix}-OP-VFM-01:")
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()

dls_dodal-1.60.0/src/dodal/beamlines/i15_1.py

@@ -0,0 +1,156 @@
+from ophyd_async.epics.motor import Motor
+
+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.i15.laue import LaueMonochrometer
+from dodal.devices.i15.motors import NumberedTripleAxisStage
+from dodal.devices.i15.multilayer_mirror import MultiLayerMirror
+from dodal.devices.i15.rail import Rail
+from dodal.devices.motors import XYPhiStage, XYStage, YZStage
+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("i15-1")  # Default used when not on a live beamline
+PREFIX = BeamlinePrefix(BL, suffix="J")
+set_log_beamline(BL)  # Configure logging and util functions
+set_utils_beamline(BL)
+
+"""
+Define device factory functions below this point.
+A device factory function is any function that has a return type which conforms
+to one or more Bluesky Protocols.
+"""
+
+
+@device_factory()
+def attY() -> NumberedTripleAxisStage:
+    return NumberedTripleAxisStage(
+        f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
+        axis1_infix="STICK1",
+        axis2_infix="STICK2",
+        axis3_infix="STICK3",
+    )
+
+
+@device_factory()
+def baseY() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:Y")
+
+
+@device_factory()
+def blowerY() -> Motor:
+    """Same motor as blowerZ"""
+    return Motor(f"{PREFIX.beamline_prefix}-EA-BLOWR-01:TLATE")
+
+
+@device_factory()
+def blowerZ() -> Motor:
+    """Same motor as blowerY"""
+    return Motor(f"{PREFIX.beamline_prefix}-EA-BLOWR-01:TLATE")
+
+
+@device_factory()
+def bs2() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-SMAR-02:")
+
+
+@device_factory()
+def clean() -> XYStage:
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-ABSB-01:CLEAN:")
+
+
+@device_factory()
+def det2() -> YZStage:
+    return YZStage(f"{PREFIX.beamline_prefix}-EA-DET-02:")
+
+
+@device_factory()
+def envX() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:ENV:X")
+
+
+@device_factory()
+def f2y() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-OP-ATTN-02:Y")
+
+
+@device_factory()
+def m1() -> MultiLayerMirror:
+    return MultiLayerMirror(f"{PREFIX.beamline_prefix}-OP-MIRR-01:")
+
+
+@device_factory()
+def rail() -> Rail:
+    return Rail(f"{PREFIX.beamline_prefix}-MO-RAIL-01:")
+
+
+@device_factory(skip=True)
+def sam() -> XYPhiStage:
+    return XYPhiStage(f"{PREFIX.beamline_prefix}-MO-TABLE-01:SAMPLE:", phi_infix="PHI2")
+
+
+@device_factory()
+def slits_1() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_2() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_3() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_4() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def slits_5() -> Slits:
+    return Slits(
+        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+        x_centre="X:CENTER",
+        y_centre="Y:CENTER",
+    )
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def tth() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-MO-TABLE-01:TTH")
+
+
+@device_factory()
+def trans() -> XYPhiStage:
+    return XYPhiStage(prefix=f"{PREFIX.beamline_prefix}-MO-TABLE-01:TRANS:")
+
+
+@device_factory()
+def xtal() -> LaueMonochrometer:
+    return LaueMonochrometer(prefix=f"{PREFIX.beamline_prefix}-OP-LAUE-01:")

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/src/dodal/beamlines/i19_1.py

@@ -58,6 +58,8 @@ 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.
@@ -65,7 +67,7 @@ def zebra() -> Zebra:
     """
     return Zebra(
         mapping=I19_1_ZEBRA_MAPPING,
-        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-03:",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-02:",
     )
 
 

{dls_dodal-1.59.1 → dls_dodal-1.60.0}/src/dodal/beamlines/i19_2.py

@@ -57,7 +57,7 @@ def zebra() -> Zebra:
     """
     return Zebra(
         mapping=I19_2_ZEBRA_MAPPING,
-        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-03:",
     )
 
 

dls_dodal-1.60.0/src/dodal/devices/i15/dcm.py

@@ -0,0 +1,77 @@
+from typing import Generic, TypeVar
+
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+from dodal.devices.common_dcm import (
+    StationaryCrystal,
+)
+
+
+class ThetaYCrystal(StationaryCrystal):
+    def __init__(self, prefix):
+        with self.add_children_as_readables():
+            self.theta = Motor(prefix + "THETA")
+            self.y = Motor(prefix + "Y")
+        super().__init__(prefix)
+
+
+class ThetaRollYZCrystal(ThetaYCrystal):
+    def __init__(self, prefix):
+        with self.add_children_as_readables():
+            self.roll = Motor(prefix + "ROLL")
+            self.z = Motor(prefix + "Z")
+        super().__init__(prefix)
+
+
+Xtal_1 = TypeVar("Xtal_1", bound=StationaryCrystal)
+Xtal_2 = TypeVar("Xtal_2", bound=StationaryCrystal)
+
+
+class DualCrystalMonoSimple(StandardReadable, Generic[Xtal_1, Xtal_2]):
+    """
+    Device for simple double crystal monochromators (DCM), which only allow energy of the beam to be selected.
+
+    Features common across all DCM's should include virtual motors to set energy/wavelength and contain two crystals,
+    each of which can be movable. Some DCM's contain crystals with roll motors, and some contain crystals with roll and pitch motors.
+    This base device accounts for all combinations of this.
+
+    This device is more able to act as a parent for beamline-specific DCM's, in which any other missing signals can be added,
+    as it doesn't assume WAVELENGTH, BRAGG and OFFSET are available for all DCM deivces, as BaseDCM does.
+
+    Bluesky plans using DCM's should be typed to specify which types of crystals are required. For example, a plan
+    which only requires one crystal which can roll should be typed 'def my_plan(dcm: BaseDCM[RollCrystal, StationaryCrystal])`
+    """
+
+    def __init__(
+        self, prefix: str, xtal_1: type[Xtal_1], xtal_2: type[Xtal_2], name: str = ""
+    ) -> None:
+        with self.add_children_as_readables():
+            # Virtual motor PV's which set the physical motors so that the DCM produces requested
+            # wavelength/energy
+            self.energy_in_kev = Motor(prefix + "ENERGY")
+            self._make_crystals(prefix, xtal_1, xtal_2)
+
+        super().__init__(name)
+
+    # Prefix convention is different depending on whether there are one or two controllable crystals
+    def _make_crystals(self, prefix: str, xtal_1: type[Xtal_1], xtal_2: type[Xtal_2]):
+        if StationaryCrystal not in [xtal_1, xtal_2]:
+            self.xtal_1 = xtal_1(f"{prefix}XTAL1:")
+            self.xtal_2 = xtal_2(f"{prefix}XTAL2:")
+        else:
+            self.xtal_1 = xtal_1(prefix)
+            self.xtal_2 = xtal_2(prefix)
+
+
+class DCM(DualCrystalMonoSimple[ThetaRollYZCrystal, ThetaYCrystal]):
+    """
+    A double crystal monocromator device, used to select the beam energy.
+    """
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        with self.add_children_as_readables():
+            self.calibrated_energy_in_kev = Motor(prefix + "CAL")
+            self.x1 = Motor(prefix + "X1")
+
+        super().__init__(prefix, ThetaRollYZCrystal, ThetaYCrystal, name)