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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.45.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.45.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.45.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.45.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.45.0 → dls_dodal-1.46.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -136,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
@@ -166,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
@@ -197,6 +196,8 @@ 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
@@ -324,6 +325,7 @@ 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
@@ -361,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
@@ -383,7 +384,6 @@ 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
@@ -407,6 +407,9 @@ 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/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.45.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.45.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.45.0'
-__version_tuple__ = version_tuple = (1, 45, 0)
+__version__ = version = '1.46.0'
+__version_tuple__ = version_tuple = (1, 46, 0)

{dls_dodal-1.45.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.45.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.45.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.45.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(

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

@@ -0,0 +1,95 @@
+from pathlib import Path
+
+from ophyd_async.epics.adpilatus import PilatusDetector
+
+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 HDF5_SUFFIX
+from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.motors import SixAxisGonio
+from dodal.devices.oav.pin_image_recognition import PinTipDetection
+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.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name, get_hostname
+
+BL = get_beamline_name("i23")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/tmp"),
+        client=LocalDirectoryServiceClient(),
+    )
+)
+
+PREFIX = BeamlinePrefix(BL)
+
+I23_ZEBRA_MAPPING = ZebraMapping(
+    outputs=ZebraTTLOutputs(TTL_DETECTOR=1, TTL_SHUTTER=4),
+    sources=ZebraSources(),
+    AND_GATE_FOR_AUTO_SHUTTER=2,
+)
+
+
+def _is_i23_machine():
+    """
+    Devices using PVA can only connect from i23 machines, due to the absence of
+    PVA gateways at present.
+    """
+    hostname = get_hostname()
+    return hostname.startswith("i23-ws") or hostname.startswith("i23-control")
+
+
+@device_factory(skip=lambda: not _is_i23_machine())
+def oav_pin_tip_detection() -> PinTipDetection:
+    """Get the i23 OAV pin-tip detection device."""
+
+    return PinTipDetection(
+        f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+        "pin_tip_detection",
+    )
+
+
+@device_factory()
+def shutter() -> ZebraShutter:
+    """Get the i23 zebra controlled shutter."""
+    return ZebraShutter(f"{PREFIX.beamline_prefix}-EA-SHTR-01:", "shutter")
+
+
+@device_factory()
+def gonio() -> SixAxisGonio:
+    """Get the i23 goniometer"""
+    return SixAxisGonio(f"{PREFIX.beamline_prefix}-MO-GONIO-01:")
+
+
+@device_factory()
+def zebra() -> Zebra:
+    """Get the i23 zebra"""
+    return Zebra(
+        name="zebra",
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:ZEBRA:",
+        mapping=I23_ZEBRA_MAPPING,
+    )
+
+
+@device_factory()
+def pilatus() -> PilatusDetector:
+    """Get the i23 pilatus"""
+    return PilatusDetector(
+        prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
+        path_provider=get_path_provider(),
+        drv_suffix="cam1:",
+        fileio_suffix=HDF5_SUFFIX,
+    )

{dls_dodal-1.45.0 → dls_dodal-1.46.0}/src/dodal/beamlines/p38.py

@@ -16,7 +16,7 @@ from dodal.common.crystal_metadata import (
 )
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 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.linkam3 import Linkam3
 from dodal.devices.pressure_jump_cell import PressureJumpCell
@@ -143,8 +143,8 @@ def hfm() -> FocusingMirror:
 
 
 @device_factory(mock=True)
-def dcm() -> DoubleCrystalMonochromator:
-    return DoubleCrystalMonochromator(
+def dcm() -> DCM:
+    return DCM(
         temperature_prefix=f"{PREFIX.beamline_prefix}-DI-DCM-01:",
         crystal_1_metadata=make_crystal_metadata_from_material(
             MaterialsEnum.Si, (1, 1, 1)

{dls_dodal-1.45.0 → dls_dodal-1.46.0}/src/dodal/common/beamlines/beamline_utils.py

@@ -162,3 +162,8 @@ def set_path_provider(provider: PathProvider):
 
 def get_path_provider() -> PathProvider:
     return PATH_PROVIDER
+
+
+def clear_path_provider() -> None:
+    global PATH_PROVIDER
+    del PATH_PROVIDER

dls_dodal-1.46.0/src/dodal/devices/common_dcm.py

@@ -0,0 +1,77 @@
+from typing import Generic, TypeVar
+
+from ophyd_async.core import (
+    StandardReadable,
+)
+from ophyd_async.epics.core import epics_signal_r
+from ophyd_async.epics.motor import Motor
+
+
+class StationaryCrystal(StandardReadable):
+    def __init__(self, prefix):
+        super().__init__(prefix)
+
+
+class RollCrystal(StationaryCrystal):
+    def __init__(self, prefix):
+        with self.add_children_as_readables():
+            self.roll_in_mrad = Motor(prefix + "ROLL")
+        super().__init__(prefix)
+
+
+class PitchAndRollCrystal(StationaryCrystal):
+    def __init__(self, prefix):
+        with self.add_children_as_readables():
+            self.pitch_in_mrad = Motor(prefix + "PITCH")
+            self.roll_in_mrad = Motor(prefix + "ROLL")
+        super().__init__(prefix)
+
+
+Xtal_1 = TypeVar("Xtal_1", bound=StationaryCrystal)
+Xtal_2 = TypeVar("Xtal_2", bound=StationaryCrystal)
+
+
+class BaseDCM(StandardReadable, Generic[Xtal_1, Xtal_2]):
+    """
+    Common device for the double crystal monochromator (DCM), used to select the energy of the beam.
+
+    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 should act as a parent for beamline-specific DCM's, in which any other missing signals can be added.
+
+    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.wavelength_in_a = Motor(prefix + "WAVELENGTH")
+
+            # Real motors
+            self.bragg_in_degrees = Motor(prefix + "BRAGG")
+            # Offset ensures that the beam exits the DCM at the same point, regardless of energy.
+            self.offset_in_mm = Motor(prefix + "OFFSET")
+
+            self.crystal_metadata_d_spacing_a = epics_signal_r(
+                float, prefix + "DSPACING:RBV"
+            )
+
+            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)

{dls_dodal-1.45.0/src/dodal/devices → dls_dodal-1.46.0/src/dodal/devices/i03}/dcm.py

@@ -1,5 +1,5 @@
 import numpy as np
-from ophyd_async.core import Array1D, StandardReadable, soft_signal_r_and_setter
+from ophyd_async.core import Array1D, soft_signal_r_and_setter
 from ophyd_async.epics.core import epics_signal_r
 from ophyd_async.epics.motor import Motor
 
@@ -8,9 +8,14 @@ from dodal.common.crystal_metadata import (
     MaterialsEnum,
     make_crystal_metadata_from_material,
 )
+from dodal.devices.common_dcm import (
+    BaseDCM,
+    PitchAndRollCrystal,
+    StationaryCrystal,
+)
 
 
-class DCM(StandardReadable):
+class DCM(BaseDCM[PitchAndRollCrystal, StationaryCrystal]):
     """
     A double crystal monochromator (DCM), used to select the energy of the beam.
 
@@ -30,13 +35,7 @@ class DCM(StandardReadable):
             MaterialsEnum.Si, (1, 1, 1)
         )
         with self.add_children_as_readables():
-            self.bragg_in_degrees = Motor(prefix + "BRAGG")
-            self.roll_in_mrad = Motor(prefix + "ROLL")
-            self.offset_in_mm = Motor(prefix + "OFFSET")
             self.perp_in_mm = Motor(prefix + "PERP")
-            self.energy_in_kev = Motor(prefix + "ENERGY")
-            self.pitch_in_mrad = Motor(prefix + "PITCH")
-            self.wavelength = Motor(prefix + "WAVELENGTH")
 
             # temperatures
             self.xtal1_temp = epics_signal_r(float, prefix + "TEMP1")
@@ -58,7 +57,4 @@ class DCM(StandardReadable):
                 Array1D[np.uint64],
                 initial_value=reflection_array,
             )
-            self.crystal_metadata_d_spacing = epics_signal_r(
-                float, prefix + "DSPACING:RBV"
-            )
-        super().__init__(name)
+        super().__init__(prefix, PitchAndRollCrystal, StationaryCrystal, name)

{dls_dodal-1.45.0/src/dodal/devices → dls_dodal-1.46.0/src/dodal/devices/i03}/undulator_dcm.py

@@ -4,10 +4,9 @@ from bluesky.protocols import Movable
 from ophyd_async.core import AsyncStatus, Reference, StandardReadable
 
 from dodal.common.beamlines.beamline_parameters import get_beamline_parameters
-
-from ..log import LOGGER
-from .dcm import DCM
-from .undulator import Undulator
+from dodal.devices.i03.dcm import DCM
+from dodal.devices.undulator import Undulator
+from dodal.log import LOGGER
 
 ENERGY_TIMEOUT_S: float = 30.0
 
@@ -23,6 +22,9 @@ class UndulatorDCM(StandardReadable, Movable[float]):
     Calling unulator_dcm.set(energy) will move the DCM motor, perform a table lookup
     and move the Undulator gap motor if needed. So the set method can be thought of as
     a comprehensive way to set beam energy.
+
+    This class will be removed in the future. Use the separate Undulator and DCM devices
+    instead. See https://github.com/DiamondLightSource/dodal/issues/1092
     """
 
     def __init__(

{dls_dodal-1.45.0 → dls_dodal-1.46.0}/src/dodal/devices/i13_1/merlin.py

@@ -23,10 +23,9 @@ class Merlin(StandardDetector):
         super().__init__(
             MerlinController(self.drv),
             adcore.ADHDFWriter(
-                self.hdf,
-                path_provider,
-                lambda: self.name,
-                adcore.ADBaseDatasetDescriber(self.drv),
+                fileio=self.hdf,
+                path_provider=path_provider,
+                dataset_describer=adcore.ADBaseDatasetDescriber(self.drv),
             ),
             config_sigs=(self.drv.acquire_period, self.drv.acquire_time),
             name=name,

{dls_dodal-1.45.0 → dls_dodal-1.46.0}/src/dodal/devices/i13_1/merlin_controller.py

@@ -37,7 +37,7 @@ class MerlinController(ADBaseController):
             DEFAULT_TIMEOUT + await self.driver.acquire_time.get_value()
         )
         await asyncio.gather(
-            self.driver.num_images.set(trigger_info.total_number_of_triggers),
+            self.driver.num_images.set(trigger_info.total_number_of_exposures),
             self.driver.image_mode.set(ADImageMode.MULTIPLE),
         )
 

{dls_dodal-1.45.0 → dls_dodal-1.46.0}/src/dodal/devices/i22/dcm.py

@@ -5,7 +5,6 @@ from bluesky.protocols import Reading
 from event_model.documents.event_descriptor import DataKey
 from ophyd_async.core import (
     Array1D,
-    StandardReadable,
     StandardReadableFormat,
     soft_signal_r_and_setter,
 )
@@ -13,13 +12,18 @@ from ophyd_async.epics.core import epics_signal_r
 from ophyd_async.epics.motor import Motor
 
 from dodal.common.crystal_metadata import CrystalMetadata
+from dodal.devices.common_dcm import (
+    BaseDCM,
+    PitchAndRollCrystal,
+    RollCrystal,
+)
 
 # Conversion constant for energy and wavelength, taken from the X-Ray data booklet
 # Converts between energy in KeV and wavelength in angstrom
 _CONVERSION_CONSTANT = 12.3984
 
 
-class DoubleCrystalMonochromator(StandardReadable):
+class DCM(BaseDCM[RollCrystal, PitchAndRollCrystal]):
     """
     A double crystal monochromator (DCM), used to select the energy of the beam.
 
@@ -39,13 +43,7 @@ class DoubleCrystalMonochromator(StandardReadable):
     ) -> None:
         with self.add_children_as_readables():
             # Positionable Parameters
-            self.bragg = Motor(prefix + "BRAGG")
-            self.offset = Motor(prefix + "OFFSET")
             self.perp = Motor(prefix + "PERP")
-            self.energy = Motor(prefix + "ENERGY")
-            self.crystal_1_roll = Motor(prefix + "XTAL1:ROLL")
-            self.crystal_2_roll = Motor(prefix + "XTAL2:ROLL")
-            self.crystal_2_pitch = Motor(prefix + "XTAL2:PITCH")
 
             # Temperatures
             self.backplate_temp = epics_signal_r(float, temperature_prefix + "PT100-7")
@@ -93,12 +91,12 @@ class DoubleCrystalMonochromator(StandardReadable):
                 units=crystal_2_metadata.d_spacing[1],
             )
 
-        super().__init__(name)
+        super().__init__(prefix, RollCrystal, PitchAndRollCrystal, name)
 
     async def describe(self) -> dict[str, DataKey]:
         default_describe = await super().describe()
         return {
-            f"{self.name}-wavelength": DataKey(
+            f"{self.name}-wavelength_in_a": DataKey(
                 dtype="number",
                 shape=[],
                 source=self.name,
@@ -109,7 +107,7 @@ class DoubleCrystalMonochromator(StandardReadable):
 
     async def read(self) -> dict[str, Reading]:
         default_reading = await super().read()
-        energy: float = default_reading[f"{self.name}-energy"]["value"]
+        energy: float = default_reading[f"{self.name}-energy_in_kev"]["value"]
         if energy > 0.0:
             wavelength = _CONVERSION_CONSTANT / energy
         else:
@@ -117,7 +115,7 @@ class DoubleCrystalMonochromator(StandardReadable):
 
         return {
             **default_reading,
-            f"{self.name}-wavelength": Reading(
+            f"{self.name}-wavelength_in_a": Reading(
                 value=wavelength,
                 timestamp=time.time(),
             ),

{dls_dodal-1.45.0 → dls_dodal-1.46.0}/src/dodal/devices/i24/dcm.py

@@ -1,28 +1,19 @@
-from ophyd_async.core import StandardReadable
 from ophyd_async.epics.core import epics_signal_r
-from ophyd_async.epics.motor import Motor
 
+from dodal.devices.common_dcm import (
+    BaseDCM,
+    PitchAndRollCrystal,
+    RollCrystal,
+)
 
-class DCM(StandardReadable):
+
+class DCM(BaseDCM[RollCrystal, PitchAndRollCrystal]):
     """
     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():
-            # Motors
-            self.bragg_in_degrees = Motor(prefix + "-MO-DCM-01:BRAGG")
-            self.x_translation_in_mm = Motor(prefix + "-MO-DCM-01:X")
-            self.offset_in_mm = Motor(prefix + "-MO-DCM-01:OFFSET")
-            self.gap_in_mm = Motor(prefix + "-MO-DCM-01:GAP")
-            self.energy_in_kev = Motor(prefix + "-MO-DCM-01:ENERGY")
-            self.xtal1_roll = Motor(prefix + "-MO-DCM-01:XTAL1:ROLL")
-            self.xtal2_roll = Motor(prefix + "-MO-DCM-01:XTAL2:ROLL")
-            self.xtal2_pitch = Motor(prefix + "-MO-DCM-01:XTAL2:PITCH")
-
-            # Wavelength is calculated in epics from the energy
-            self.wavelength_in_a = epics_signal_r(float, prefix + "-MO-DCM-01:LAMBDA")
-
             # Temperatures
             self.xtal1_temp = epics_signal_r(float, prefix + "-DI-DCM-01:PT100-1")
             self.xtal1_heater_temp = epics_signal_r(
@@ -39,4 +30,4 @@ class DCM(StandardReadable):
             self.b1_plate_temp = epics_signal_r(float, prefix + "-DI-DCM-01:PT100-7")
             self.gap_temp = epics_signal_r(float, prefix + "-DI-DCM-01:TC-1")
 
-        super().__init__(name)
+        super().__init__(prefix + "-MO-DCM-01:", RollCrystal, PitchAndRollCrystal, name)

{dls_dodal-1.45.0 → dls_dodal-1.46.0}/src/dodal/devices/tetramm.py

@@ -244,10 +244,9 @@ class TetrammDetector(StandardDetector):
         super().__init__(
             controller,
             ADHDFWriter(
-                self.hdf,
-                path_provider,
-                lambda: self.name,
-                TetrammDatasetDescriber(controller),
+                fileio=self.hdf,
+                path_provider=path_provider,
+                dataset_describer=TetrammDatasetDescriber(controller),
                 plugins=plugins,
             ),
             config_signals,

{dls_dodal-1.45.0 → dls_dodal-1.46.0}/src/dodal/devices/turbo_slit.py

@@ -13,9 +13,9 @@ class TurboSlit(StandardReadable, Movable[float]):
     The xfine motor can move the slit in x direction at high frequencies for different scans.
     These slits can be scanned continously or in step mode.
     The relationship between the three motors is as follows:
-        - arc - position of the middle of the gap (coarse/ macro) extension
+        - arc - position of the middle of the gap in degrees (coarse/ macro) extension
         - gap - width in mm, provides energy resolution
-        - xfine selects the energy as part of the high frequency scan
+        - xfine - main scanning axis in mm, selects the energy as part of the high frequency scan
     """
 
     def __init__(self, prefix: str, name: str = ""):