dls-dodal 1.61.0__tar.gz → 1.63.0__tar.gz

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/.github/workflows/_test.yml

@@ -62,7 +62,6 @@ jobs:
         with:
           repository: epics-containers/example-services
           path: example-services
-          ref: '2025.8.1'
 
       - name: Run docker compose
         uses: hoverkraft-tech/compose-action@v2.3.0

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.61.0
+Version: 1.63.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

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/conftest.py

@@ -37,7 +37,7 @@ mock_paths = [
 ]
 mock_attributes_table = {
     "i03": mock_paths,
-    "i10": mock_paths,
+    "i10_optics": mock_paths,
     "i04": mock_paths,
     "s04": mock_paths,
     "i19_1": mock_paths,
@@ -106,7 +106,7 @@ async def static_path_provider(
 
 
 @pytest.fixture
-def run_engine_documents(RE: RunEngine) -> Mapping[str, list[dict]]:
+def run_engine_documents(run_engine: RunEngine) -> Mapping[str, list[dict]]:
     docs: dict[str, list[dict]] = {}
 
     def append_and_print(name, doc):
@@ -114,7 +114,7 @@ def run_engine_documents(RE: RunEngine) -> Mapping[str, list[dict]]:
             docs[name] = []
         docs[name] += [doc]
 
-    RE.subscribe(append_and_print)
+    run_engine.subscribe(append_and_print)
     return docs
 
 
@@ -126,16 +126,16 @@ def failed_status(failure: Exception) -> Status:
 
 @pytest.fixture(scope="session", autouse=True)
 async def _ensure_running_bluesky_event_loop():
-    RE = RunEngine()
+    run_engine = RunEngine()
     # make sure the event loop is thoroughly up and running before we try to create
     # any ophyd_async devices which might need it
     timeout = time.monotonic() + 1
-    while not RE.loop.is_running():
+    while not run_engine.loop.is_running():
         await asyncio.sleep(0)
         if time.monotonic() > timeout:
             raise TimeoutError("This really shouldn't happen but just in case...")
 
 
 @pytest.fixture()
-async def RE():
+async def run_engine():
     yield RunEngine()

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/docs/how-to/write-tests.md

@@ -77,19 +77,19 @@ from dodal.device.my_device import  MyDevice
 
 # RunEngine is needed to make sure there is an event loop when creating device.
 @pytest.fixture
-async def sim_my_device(RE: RunEngine) -> MyDevice:
+async def sim_my_device(run_engine: RunEngine) -> MyDevice:
     async with init_devices(mock=True):
         sim_my_device = MyDevice("TEST:")
     return sim_my_device
 
 
-def test_my_device_stage(sim_my_device: MyDevice, RE: RunEngine) -> None:
-    RE(bps.stage(sim_my_device, wait=True), wait=True)
+def test_my_device_stage(sim_my_device: MyDevice, run_engine: RunEngine) -> None:
+    run_engine(bps.stage(sim_my_device, wait=True), wait=True)
     get_mock_put(sim_my_device.signal_b).assert_called_once_with(OnOff.ON, wait=True)
 
 
-def test_my_device_unstage(sim_my_device: MyDevice, RE: RunEngine) -> None:
-    RE(bps.unstage(sim_my_device, wait=True), wait=True)
+def test_my_device_unstage(sim_my_device: MyDevice, run_engine: RunEngine) -> None:
+    run_engine(bps.unstage(sim_my_device, wait=True), wait=True)
     get_mock_put(sim_my_device.signal_b).assert_called_once_with(OnOff.OFF, wait=True)
 
 ```
@@ -97,7 +97,7 @@ def test_my_device_unstage(sim_my_device: MyDevice, RE: RunEngine) -> None:
 You should test the output of a device when the device has many signals read and you want to ensure the correct ones are read at the correct times, or when the `read` method of it or one of its signals (e.g. a DerivedSignal) requires testing. Functions are defined in `ophyd-async` to aid with this. `assert_reading` allows us to compare the readings generated from a `Readable` device to the expected results.
 
 ```Python
-async def test_my_device_read(sim_my_device: MyDevice, RE: RunEngine) -> None:
+async def test_my_device_read(sim_my_device: MyDevice, run_engine: RunEngine) -> None:
     prefix = sim_my_device.name
     await assert_reading(
         sim_my_device,

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/docs/reference/device-standards.md

@@ -112,7 +112,7 @@ Whilst it would be possible to do:
 this has potential negative side effects:
 
 * When the plan is simulated it will still set the parameter on the device
-* There may be external things attached to the RE that are tracking messages e.g. metrics. A set like this would be
+* There may be external things attached to the RunEngine that are tracking messages e.g. metrics. A set like this would be
   lost
 
 Instead you should make a soft signal:

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/pyproject.toml

@@ -23,15 +23,15 @@ dependencies = [
     "requests",
     "graypy",
     "pydantic>=2.0",
-    "opencv-python-headless",        # For pin-tip detection.
+    "opencv-python-headless",         # For pin-tip detection.
     "numpy",
     "aiofiles",
     "aiohttp",
     "redis",
     "scanspec>=0.7.3",
-    "pyzmq==26.3.0",                 # Until we can move to RHEL 8 https://github.com/DiamondLightSource/mx-bluesky/issues/1139
+    "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.
+    "daq-config-server>=v1.0.0-rc.2", # For getting Configuration settings.
 ]
 
 dynamic = ["version"]
@@ -76,7 +76,7 @@ dev = [
 
 [project.scripts]
 dodal = "dodal.__main__:main"
-save-panda = "dodal.devices.util.save_panda:main"
+save-panda = "dodal.plans.save_panda:main"
 
 [project.urls]
 GitHub = "https://github.com/DiamondLightSource/dodal"
@@ -182,6 +182,7 @@ lint.select = [
     "C4",     # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
     "E",      # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
     "F",      # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
+    "N",      # pep8-naming - https://docs.astral.sh/ruff/rules/#pep8-naming-n
     "W",      # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
     "I",      # isort - https://docs.astral.sh/ruff/rules/#isort-i
     "UP",     # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
@@ -194,7 +195,7 @@ lint.select = [
 [tool.ruff.lint.per-file-ignores]
 # By default, private member access is allowed in tests
 # See https://github.com/DiamondLightSource/python-copier-template/issues/154
-# Remove this line to forbid private member access, walrus operators, banned api in asserts in tests 
+# Remove this line to forbid private member access, walrus operators, banned api in asserts in tests
 "tests/**/*" = ["SLF001", "RUF018", "TID251"]
 "system_tests/**/*" = ["SLF001", "RUF018", "TID251"]
 ".github/**/*" = ["INP001"]
@@ -203,6 +204,10 @@ lint.select = [
 [tool.ruff.lint.flake8-tidy-imports.banned-api]
 "time.sleep".msg = "Use bps.sleep or asyncio.sleep instead. # noqa will disable this rule for that line. See https://github.com/DiamondLightSource/mx-bluesky/issues/925"
 
+[tool.ruff.lint.flake8-import-conventions.extend-aliases]
+# We often shorten "Annotated" to "A" for brevity
+"typing.Annotated" = "A"
+
 [tool.importlinter]
 root_package = "dodal"
 

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.61.0
+Version: 1.63.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

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -104,6 +104,7 @@ src/dodal/beamlines/b16.py
 src/dodal/beamlines/b18.py
 src/dodal/beamlines/b21.py
 src/dodal/beamlines/i02_1.py
+src/dodal/beamlines/i02_2.py
 src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
 src/dodal/beamlines/i05.py
@@ -111,8 +112,9 @@ src/dodal/beamlines/i05_1.py
 src/dodal/beamlines/i09.py
 src/dodal/beamlines/i09_1.py
 src/dodal/beamlines/i09_2.py
-src/dodal/beamlines/i10-1.py
 src/dodal/beamlines/i10.py
+src/dodal/beamlines/i10_1.py
+src/dodal/beamlines/i10_optics.py
 src/dodal/beamlines/i11.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i15.py
@@ -166,6 +168,7 @@ src/dodal/devices/eiger.py
 src/dodal/devices/eiger_odin.py
 src/dodal/devices/eurotherm.py
 src/dodal/devices/fast_grid_scan.py
+src/dodal/devices/fast_shutter.py
 src/dodal/devices/fluorescence_detector_motion.py
 src/dodal/devices/flux.py
 src/dodal/devices/focusing_mirror.py
@@ -197,9 +200,9 @@ src/dodal/devices/aithre_lasershaping/__init__.py
 src/dodal/devices/aithre_lasershaping/goniometer.py
 src/dodal/devices/aithre_lasershaping/laser_robot.py
 src/dodal/devices/areadetector/__init__.py
-src/dodal/devices/areadetector/plugins/CAM.py
-src/dodal/devices/areadetector/plugins/MJPG.py
 src/dodal/devices/areadetector/plugins/__init__.py
+src/dodal/devices/areadetector/plugins/cam.py
+src/dodal/devices/areadetector/plugins/mjpg.py
 src/dodal/devices/attenuator/__init__.py
 src/dodal/devices/attenuator/attenuator.py
 src/dodal/devices/attenuator/filter.py
@@ -247,6 +250,7 @@ src/dodal/devices/electron_analyser/vgscienta/region.py
 src/dodal/devices/i02_1/__init__.py
 src/dodal/devices/i02_1/fast_grid_scan.py
 src/dodal/devices/i02_1/sample_motors.py
+src/dodal/devices/i02_2/__init__.py
 src/dodal/devices/i03/__init__.py
 src/dodal/devices/i03/dcm.py
 src/dodal/devices/i03/undulator_dcm.py
@@ -257,7 +261,6 @@ src/dodal/devices/i04/transfocator.py
 src/dodal/devices/i05/__init__.py
 src/dodal/devices/i05/enums.py
 src/dodal/devices/i09/__init__.py
-src/dodal/devices/i09/dcm.py
 src/dodal/devices/i09/enums.py
 src/dodal/devices/i09_1/__init__.py
 src/dodal/devices/i09_1/enums.py
@@ -288,16 +291,21 @@ 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/i17/__init__.py
+src/dodal/devices/i17/i17_apple2.py
 src/dodal/devices/i18/__init__.py
 src/dodal/devices/i18/diode.py
+src/dodal/devices/i18/kb_mirror.py
 src/dodal/devices/i19/__init__.py
 src/dodal/devices/i19/backlight.py
 src/dodal/devices/i19/beamstop.py
-src/dodal/devices/i19/blueapi_device.py
 src/dodal/devices/i19/diffractometer.py
-src/dodal/devices/i19/hutch_access.py
-src/dodal/devices/i19/shutter.py
+src/dodal/devices/i19/mapt_configuration.py
+src/dodal/devices/i19/pin_col_stages.py
+src/dodal/devices/i19/access_controlled/__init__.py
+src/dodal/devices/i19/access_controlled/blueapi_device.py
+src/dodal/devices/i19/access_controlled/hutch_access.py
+src/dodal/devices/i19/access_controlled/shutter.py
 src/dodal/devices/i20_1/__init__.py
 src/dodal/devices/i21/__init__.py
 src/dodal/devices/i21/enums.py
@@ -412,7 +420,6 @@ tests/common/beamlines/test_beamline_utils.py
 tests/common/beamlines/test_commissioning_mode.py
 tests/common/beamlines/test_device_instantiation.py
 tests/devices/__init__.py
-tests/devices/test.png
 tests/devices/test_aperture.py
 tests/devices/test_aperture_scatterguard.py
 tests/devices/test_apple2_undulator.py
@@ -426,6 +433,7 @@ tests/devices/test_common_dcm.py
 tests/devices/test_controllers.py
 tests/devices/test_diamond_filter.py
 tests/devices/test_eiger.py
+tests/devices/test_fast_shutters.py
 tests/devices/test_focusing_mirror.py
 tests/devices/test_gridscan.py
 tests/devices/test_hutch_shutter.py
@@ -437,7 +445,6 @@ tests/devices/test_qbpm.py
 tests/devices/test_scintillator.py
 tests/devices/test_slits.py
 tests/devices/test_smargon.py
-tests/devices/test_status.py
 tests/devices/test_synchrotron.py
 tests/devices/test_tetramm.py
 tests/devices/test_thawer.py
@@ -498,9 +505,8 @@ tests/devices/i04/__init__.py
 tests/devices/i04/test_murko_results.py
 tests/devices/i04/test_transfocator.py
 tests/devices/i09/__init__.py
-tests/devices/i09/test_dcm.py
 tests/devices/i10/__init__.py
-tests/devices/i10/test_i10Apple2.py
+tests/devices/i10/test_i10_apple2.py
 tests/devices/i10/test_data/IDEnergy2GapCalibrations.csv
 tests/devices/i10/test_data/IDEnergy2PhaseCalibrations.csv
 tests/devices/i10/test_data/__init__.py
@@ -514,13 +520,16 @@ tests/devices/i11/test_mythen.py
 tests/devices/i13_1/__init__.py
 tests/devices/i13_1/test_merlin.py
 tests/devices/i15/__init__.py
-tests/devices/i15/test_dcm.py
+tests/devices/i17/__init__.py
+tests/devices/i17/test_i17_apple2.py
 tests/devices/i18/__init__.py
 tests/devices/i18/test_kb_mirror.py
 tests/devices/i19/__init__.py
 tests/devices/i19/test_backlight.py
 tests/devices/i19/test_beamstop.py
 tests/devices/i19/test_diffractometer.py
+tests/devices/i19/test_mapt.py
+tests/devices/i19/test_pin_col.py
 tests/devices/i19/test_shutter.py
 tests/devices/i22/__init__.py
 tests/devices/i22/test_dcm.py
@@ -571,7 +580,6 @@ tests/devices/util/__init__.py
 tests/devices/util/test_adjuster_plans.py
 tests/devices/util/test_beamline_specific_utils.py
 tests/devices/util/test_lookup_tables.py
-tests/devices/util/test_save_panda.py
 tests/devices/util/test_data/__init__.py
 tests/devices/util/test_data/test_beamline_dcm_roll_converter.txt
 tests/devices/util/test_data/test_beamline_dcm_roll_converter_non_monotonic.txt
@@ -593,6 +601,7 @@ tests/plans/conftest.py
 tests/plans/test_bimorph.py
 tests/plans/test_compliance.py
 tests/plans/test_configure_arm_trigger_and_disarm_detector.py
+tests/plans/test_save_panda.py
 tests/plans/test_scanspec.py
 tests/plans/test_verify_undulator_gap_plan.py
 tests/plans/test_wrapped.py

dls_dodal-1.63.0/src/dls_dodal.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+dodal = dodal.__main__:main
+save-panda = dodal.plans.save_panda:main

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.61.0'
-__version_tuple__ = version_tuple = (1, 61, 0)
+__version__ = version = '1.63.0'
+__version_tuple__ = version_tuple = (1, 63, 0)
 
-__commit_id__ = commit_id = 'gdf177058e'
+__commit_id__ = commit_id = 'g8bb309b63'

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/beamlines/__init__.py

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

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/beamlines/adsim.py

@@ -29,7 +29,9 @@ https://epics-containers.github.io/main/tutorials/launch_example.html
 And ensure that the signals are visible:
 
 ```sh
-export EPICS_CA_ADDR_LIST=127.0.0.1:5094
+export EPICS_CA_ADDR_LIST=127.0.0.1:9064
+export EPICS_CA_NAME_SERVERS=127.0.0.1:9064
+export EPICS_PVA_NAME_SERVERS=127.0.0.1:9075
 ```
 
 How to use the devices in a plan:
@@ -53,10 +55,10 @@ set_path_provider(
     )
 )
 
-RE = RunEngine()
+run_engine = RunEngine()
 d = det(connect_immediately=True)
 s = stage(connect_immediately=True)
-RE(count([d], num=10))
+run_engine(count([d], num=10))
 ```
 
 """

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/beamlines/b21.py

@@ -55,7 +55,9 @@ def mirror() -> SimpleMirror:
 
 @device_factory()
 def it() -> QDV2F:
-    return QDV2F(prefix=f"{PREFIX.beamline_prefix}-DI-PHDGN-07:PHD1:", I_suffix="I")
+    return QDV2F(
+        prefix=f"{PREFIX.beamline_prefix}-DI-PHDGN-07:PHD1:", intensity_suffix="I"
+    )
 
 
 @device_factory()

dls_dodal-1.63.0/src/dodal/beamlines/i02_2.py

@@ -0,0 +1,32 @@
+"""Beamline i02-2 is also known as VMXi, or I02I"""
+
+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.motors import XYStage
+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("i02-2")
+PREFIX = BeamlinePrefix(BL, suffix="I")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+DAQ_CONFIGURATION_PATH = "/dls_sw/i02-2/software/daq_configuration"
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    """Get the i02-2 synchrotron device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-2, it will return the existing object.
+    """
+    return Synchrotron()
+
+
+@device_factory()
+def sample_motors() -> XYStage:
+    """Get the i02-2 goniometer device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-2, it will return the existing object.
+    """
+    return XYStage(f"{PREFIX.beamline_prefix}-MO-GONIO-01:SAMPLE:")

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/beamlines/i03.py

@@ -29,6 +29,7 @@ from dodal.devices.fast_grid_scan import PandAFastGridScan, ZebraFastGridScanThr
 from dodal.devices.fluorescence_detector_motion import FluorescenceDetector
 from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
+from dodal.devices.hutch_shutter import HutchShutter
 from dodal.devices.i03 import Beamstop
 from dodal.devices.i03.dcm import DCM
 from dodal.devices.i03.undulator_dcm import UndulatorDCM
@@ -323,6 +324,14 @@ def sample_shutter() -> ZebraShutter:
     return ZebraShutter(f"{PREFIX.beamline_prefix}-EA-SHTR-01:")
 
 
+@device_factory()
+def hutch_shutter() -> HutchShutter:
+    """Get the i03 hutch shutter device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i03, it will return the existing object.
+    """
+    return HutchShutter(f"{PREFIX.beamline_prefix}-PS-SHTR-01:")
+
+
 @device_factory()
 def flux() -> Flux:
     """Get the i03 flux device, instantiate it if it hasn't already been.

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/beamlines/i04.py

@@ -234,7 +234,7 @@ def undulator() -> Undulator:
     """
     return Undulator(
         prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-        id_gap_lookup_table_path="/dls_sw/i04/software/gda/config/lookupTables/BeamLine_Undulator_toGap.txt",
+        id_gap_lookup_table_path="/dls_sw/i04/software/daq_configuration/lookup/BeamLine_Undulator_toGap.txt",
     )
 
 

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/beamlines/i09.py

@@ -2,9 +2,14 @@ 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.common_dcm import (
+    DoubleCrystalMonochromatorWithDSpacing,
+    PitchAndRollCrystal,
+    StationaryCrystal,
+)
 from dodal.devices.electron_analyser import DualEnergySource
 from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
-from dodal.devices.i09 import DCM, Grating, LensMode, PassEnergy, PsuMode
+from dodal.devices.i09 import Grating, LensMode, PassEnergy, PsuMode
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -30,8 +35,10 @@ def pgm() -> PGM:
 
 
 @device_factory()
-def dcm() -> DCM:
-    return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
+def dcm() -> DoubleCrystalMonochromatorWithDSpacing:
+    return DoubleCrystalMonochromatorWithDSpacing(
+        f"{PREFIX.beamline_prefix}-MO-DCM-01:", PitchAndRollCrystal, StationaryCrystal
+    )
 
 
 @device_factory()

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/beamlines/i09_1.py

@@ -2,9 +2,13 @@ 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.common_dcm import (
+    DoubleCrystalMonochromatorWithDSpacing,
+    PitchAndRollCrystal,
+    StationaryCrystal,
+)
 from dodal.devices.electron_analyser import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
-from dodal.devices.i09.dcm import DCM
 from dodal.devices.i09_1 import LensMode, PsuMode
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -22,8 +26,10 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def dcm() -> DCM:
-    return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
+def dcm() -> DoubleCrystalMonochromatorWithDSpacing:
+    return DoubleCrystalMonochromatorWithDSpacing(
+        f"{PREFIX.beamline_prefix}-MO-DCM-01:", PitchAndRollCrystal, StationaryCrystal
+    )
 
 
 @device_factory()

{dls_dodal-1.61.0 → dls_dodal-1.63.0}/src/dodal/beamlines/i10.py

@@ -6,17 +6,17 @@ note:
     idd == id1,    idu == id2.
 """
 
-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.current_amplifiers import CurrentAmpDet
-from dodal.devices.i10.diagnostics import I10Diagnostic, I10Diagnostic5ADet
-from dodal.devices.i10.i10_apple2 import (
-    I10Id,
+from dodal.devices.i10 import (
+    I10Diagnostic,
+    I10Diagnostic5ADet,
+    I10Slits,
+    I10SlitsDrainCurrent,
+    PiezoMirror,
 )
-from dodal.devices.i10.i10_setting_data import I10Grating
-from dodal.devices.i10.mirrors import PiezoMirror
+from dodal.devices.i10.diagnostics import I10Diagnostic, I10Diagnostic5ADet
 from dodal.devices.i10.rasor.rasor_current_amp import RasorFemto, RasorSR570
 from dodal.devices.i10.rasor.rasor_motors import (
     DetSlits,
@@ -24,9 +24,7 @@ from dodal.devices.i10.rasor.rasor_motors import (
     PaStage,
 )
 from dodal.devices.i10.rasor.rasor_scaler_cards import RasorScalerCard1
-from dodal.devices.i10.slits import I10Slits, I10SlitsDrainCurrent
 from dodal.devices.motors import XYStage, XYZStage
-from dodal.devices.pgm import PGM
 from dodal.devices.temperture_controller import (
     Lakeshore340,
 )
@@ -38,69 +36,9 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 PREFIX = BeamlinePrefix(BL)
 
-I10_CONF_CLIENT = ConfigServer(url="https://daq-config.diamond.ac.uk")
-
-
-LOOK_UPTABLE_DIR = "/dls_sw/i10/software/gda/workspace_git/gda-diamond.git/configurations/i10-shared/lookupTables/"
-
-
-@device_factory()
-def pgm() -> PGM:
-    "I10 Plane Grating Monochromator, it can change energy via pgm.energy.set(<energy>)"
-    return PGM(
-        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
-        grating=I10Grating,
-        gratingPv="NLINES2",
-    )
-
-
-@device_factory()
-def idd() -> I10Id:
-    """i10 downstream insertion device:
-    id.energy.set(<energy>) to change beamline energy.
-    id.energy.energy_offset.set(<off_set>) to change id energy offset relative to pgm.
-    id.pol.set(<polarisation>) to change polarisation.
-    id.laa.set(<linear polarisation angle>) to change polarisation angle, must be in LA mode.
-    """
-    return I10Id(
-        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-        pgm=pgm(),
-        look_up_table_dir=LOOK_UPTABLE_DIR,
-        source=("Source", "idd"),
-        config_client=I10_CONF_CLIENT,
-    )
-
-
-@device_factory()
-def idu() -> I10Id:
-    """i10 upstream insertion device:
-    id.energy.set(<energy>) to change beamline energy.
-    id.energy.energy_offset.set(<off_set>) to change id energy offset relative to pgm.
-    id.pol.set(<polarisation>) to change polarisation.
-    id.laa.set(<linear polarisation angle>) to change polarisation angle, must be in LA mode.
-    """
-    return I10Id(
-        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
-        pgm=pgm(),
-        look_up_table_dir=LOOK_UPTABLE_DIR,
-        source=("Source", "idu"),
-        config_client=I10_CONF_CLIENT,
-    )
-
-
 """Mirrors"""
 
 
-@device_factory()
-def first_mirror() -> PiezoMirror:
-    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-COL-01:")
-
-
-@device_factory()
-def switching_mirror() -> PiezoMirror:
-    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-SWTCH-01:")
-
-
 @device_factory()
 def focusing_mirror() -> PiezoMirror:
     return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCS-01:")

dls_dodal-1.63.0/src/dodal/beamlines/i10_1.py

@@ -0,0 +1,35 @@
+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.i10 import I10JDiagnostic, I10JSlits, PiezoMirror
+from dodal.devices.temperture_controller.lakeshore.lakeshore import Lakeshore336
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i10-1")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+PREFIX = BeamlinePrefix("i10", "J")
+
+
+@device_factory()
+def em_temperature_controller() -> Lakeshore336:
+    return Lakeshore336(
+        prefix=f"{PREFIX.beamline_prefix}-EA-TCTRL-41:",
+    )
+
+
+@device_factory()
+def slits() -> I10JSlits:
+    return I10JSlits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-")
+
+
+@device_factory()
+def diagnostic() -> I10JDiagnostic:
+    return I10JDiagnostic(
+        prefix=f"{PREFIX.beamline_prefix}-DI-",
+    )
+
+
+@device_factory()
+def focusing_mirror() -> PiezoMirror:
+    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCA-01:")