dls-dodal 1.62.0__tar.gz → 1.64.0__tar.gz

{dls_dodal-1.62.0 → dls_dodal-1.64.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.62.0 → dls_dodal-1.64.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.62.0
+Version: 1.64.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
@@ -215,7 +215,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.13.2
+Requires-Dist: ophyd-async[ca,pva]>=0.13.5
 Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -245,7 +245,7 @@ Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pyright==1.1.406; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{dls_dodal-1.62.0 → dls_dodal-1.64.0}/conftest.py

@@ -1,14 +1,10 @@
-import asyncio
 import logging
 import sys
-import time
-from collections.abc import Mapping
 from os import environ
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
 import pytest
-from bluesky.run_engine import RunEngine
 from ophyd.status import Status
 from ophyd_async.core import (
     PathInfo,
@@ -37,7 +33,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,
@@ -49,6 +45,10 @@ BANNED_PATHS = [Path("/dls"), Path("/dls_sw")]
 environ["DODAL_TEST_MODE"] = "true"
 
 
+# Add run_engine fixtures to be used in tests
+pytest_plugins = ["dodal.testing.fixtures.run_engine"]
+
+
 @pytest.fixture(autouse=True)
 def patch_open_to_prevent_dls_reads_in_tests():
     unpatched_open = open
@@ -105,37 +105,7 @@ async def static_path_provider(
     return svpp
 
 
-@pytest.fixture
-def run_engine_documents(RE: RunEngine) -> Mapping[str, list[dict]]:
-    docs: dict[str, list[dict]] = {}
-
-    def append_and_print(name, doc):
-        if name not in docs:
-            docs[name] = []
-        docs[name] += [doc]
-
-    RE.subscribe(append_and_print)
-    return docs
-
-
 def failed_status(failure: Exception) -> Status:
     status = Status()
     status.set_exception(failure)
     return status
-
-
-@pytest.fixture(scope="session", autouse=True)
-async def _ensure_running_bluesky_event_loop():
-    RE = 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():
-        await asyncio.sleep(0)
-        if time.monotonic() > timeout:
-            raise TimeoutError("This really shouldn't happen but just in case...")
-
-
-@pytest.fixture()
-async def RE():
-    yield RunEngine()

{dls_dodal-1.62.0 → dls_dodal-1.64.0}/docs/how-to/make-release.md

@@ -21,7 +21,7 @@ you will not get the option to edit the release notes.
 
 A new release will be made and the wheel and sdist uploaded to PyPI.
 
-[release]: https://github.com/DiamondLightSource/python-copier-template/releases
+[release]: https://github.com/DiamondLightSource/dodal/releases
 
 ## Deciding release numbers
 

{dls_dodal-1.62.0 → dls_dodal-1.64.0}/docs/how-to/write-tests.md

@@ -58,9 +58,11 @@ class MyDevice(StandardReadable, Stageable):
 
 In this example, we need to test the `stage` and `unstage` methods. For more complex devices, it is also a good idea to test the `read` method to confirm that we get the expected read signals back when this method is called.
 
-We use [pytest](https://docs.pytest.org/en/stable/contents.html) for writing tests in dodal. A core part of this library is the use of fixtures. A fixture is a function decorated with `@pytest.fixture` that provides setup/teardown or reusable test data for your tests. It is defined once and can be reused across multiple tests. Fixtures are mainly used to define devices and then inject them into each test.
+We use [pytest](https://docs.pytest.org/en/stable/contents.html) for writing tests in dodal. A core part of this library is the use of fixtures. A fixture is a function decorated with `@pytest.fixture` that provides setup/teardown or reusable test data for your tests. It is defined once and can be reused across multiple tests. Fixtures are mainly used to define devices and then inject them into each test. 
 
-To help set up a device, they are created with the `init_devices(mock=True)` function from `ophyd_async.core`, which automatically initialises the device in mock mode. The `RunEngine` fixture is passed when creating a device to ensure there is an event loop available when connecting signals. This fixture is defined in `dodal/tests/conftest.py`, which is a special file recognised by `pytest`. It defines fixtures that are automatically available to any test in the same directory (and its subdirectories) without needing to import them. This is useful for defining common setup code once without duplicating it across test files.
+Common fixtures, such as the `run_engine` used in the below tests, can also be defined in `dodal/tests/conftest.py`, which is a special file recognised by `pytest`. These fixtures are automatically available to any test in the same directory (and its subdirectories) without needing to import them. This is useful for defining common setup code once without duplicating it across test files.
+
+Devices are set up in the fixture using the `init_devices(mock=True)` function from `ophyd_async.core`, which automatically initialises the device in mock mode. 
 
 In order for `pytest` to detect something as a test, a function should begin with `test_*`. The test function should be self-descriptive about what it is testing, and it is acceptable (even encouraged) to have longer names for test functions for clarity.
 
@@ -75,29 +77,27 @@ from ophyd_async.testing import assert_reading, get_mock_put, partial_reading
 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() -> 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)
-
 ```
 
 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.62.0 → dls_dodal-1.64.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.62.0 → dls_dodal-1.64.0}/pyproject.toml

@@ -14,7 +14,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async[ca,pva]>=0.13.2",
+    "ophyd-async[ca,pva]>=0.13.5",
     "bluesky>=1.14.5",
     "pyepics",
     "dataclasses-json",
@@ -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"]
@@ -54,7 +54,8 @@ dev = [
     "pre-commit",
     "psutil",
     "pydata-sphinx-theme>=0.12",
-    "pyright",
+    # Pin to previous pyright until https://github.com/microsoft/pyright/issues/11060 is fixed
+    "pyright==1.1.406", 
     "pytest",
     "pytest-asyncio",
     "pytest-cov",
@@ -76,7 +77,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"
@@ -136,6 +137,8 @@ testpaths = "docs src tests system_tests"
 exclude_also = [
     '^"""', # Ignore the start/end of a file-level triple quoted docstring
 ]
+# Exclude pytest.fixtures from code coverage report
+omit = ["*/dodal/testing/fixtures/*"]
 
 [tool.coverage.run]
 data_file = "/tmp/dodal.coverage"
@@ -182,6 +185,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 +198,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 +207,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.62.0 → dls_dodal-1.64.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.62.0
+Version: 1.64.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
@@ -215,7 +215,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
-Requires-Dist: ophyd-async[ca,pva]>=0.13.2
+Requires-Dist: ophyd-async[ca,pva]>=0.13.5
 Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -245,7 +245,7 @@ Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"
 Requires-Dist: pydata-sphinx-theme>=0.12; extra == "dev"
-Requires-Dist: pyright; extra == "dev"
+Requires-Dist: pyright==1.1.406; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{dls_dodal-1.62.0 → dls_dodal-1.64.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -104,15 +104,18 @@ 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
 src/dodal/beamlines/i05_1.py
+src/dodal/beamlines/i07.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
@@ -198,9 +201,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
@@ -248,6 +251,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,11 +261,14 @@ src/dodal/devices/i04/murko_results.py
 src/dodal/devices/i04/transfocator.py
 src/dodal/devices/i05/__init__.py
 src/dodal/devices/i05/enums.py
+src/dodal/devices/i07/__init__.py
+src/dodal/devices/i07/dcm.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
+src/dodal/devices/i09_1_shared/__init__.py
+src/dodal/devices/i09_1_shared/hard_undulator_functions.py
 src/dodal/devices/i10/__init__.py
 src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
@@ -289,18 +296,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/mapt_configuration.py
 src/dodal/devices/i19/pin_col_stages.py
-src/dodal/devices/i19/shutter.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
@@ -379,6 +389,9 @@ src/dodal/testing/__init__.py
 src/dodal/testing/setup.py
 src/dodal/testing/electron_analyser/__init__.py
 src/dodal/testing/electron_analyser/device_factory.py
+src/dodal/testing/fixtures/__init__.py
+src/dodal/testing/fixtures/run_engine.py
+src/dodal/testing/fixtures/utils.py
 system_tests/__init__.py
 system_tests/test_adsim.py
 system_tests/test_cli.py
@@ -415,7 +428,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
@@ -441,7 +453,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
@@ -501,10 +512,16 @@ tests/devices/i03/test_undulator_dcm.py
 tests/devices/i04/__init__.py
 tests/devices/i04/test_murko_results.py
 tests/devices/i04/test_transfocator.py
+tests/devices/i07/__init__.py
+tests/devices/i07/test_dcm.py
 tests/devices/i09/__init__.py
-tests/devices/i09/test_dcm.py
+tests/devices/i09_1/__init__.py
+tests/devices/i09_1_shared/__init__.py
+tests/devices/i09_1_shared/test_undulator_functions.py
+tests/devices/i09_1_shared/test_data/__init__.py
+tests/devices/i09_1_shared/test_data/test_lookuptable_i09_hu.txt
 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
@@ -518,7 +535,8 @@ 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
@@ -577,7 +595,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
@@ -599,6 +616,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.64.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.62.0 → dls_dodal-1.64.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async[ca,pva]>=0.13.2
+ophyd-async[ca,pva]>=0.13.5
 bluesky>=1.14.5
 pyepics
 dataclasses-json
@@ -31,7 +31,7 @@ pipdeptree
 pre-commit
 psutil
 pydata-sphinx-theme>=0.12
-pyright
+pyright==1.1.406
 pytest
 pytest-asyncio
 pytest-cov

{dls_dodal-1.62.0 → dls_dodal-1.64.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.62.0'
-__version_tuple__ = version_tuple = (1, 62, 0)
+__version__ = version = '1.64.0'
+__version_tuple__ = version_tuple = (1, 64, 0)
 
-__commit_id__ = commit_id = 'g146f56508'
+__commit_id__ = commit_id = 'g15623816b'

{dls_dodal-1.62.0 → dls_dodal-1.64.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.62.0 → dls_dodal-1.64.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.62.0 → dls_dodal-1.64.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.64.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.62.0 → dls_dodal-1.64.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.64.0/src/dodal/beamlines/i07.py

@@ -0,0 +1,21 @@
+from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.i07.dcm import DCM
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i07")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+PREFIX = BeamlinePrefix(BL)
+
+
+@device_factory()
+def dcm() -> DCM:
+    """Instantiate DCM using two PV bases"""
+    dcm = DCM(
+        f"{PREFIX.beamline_prefix}-MO-DCM-01:",
+        f"{PREFIX.beamline_prefix}-DI-DCM-01:",
+        "dcm",
+    )
+    return dcm

{dls_dodal-1.62.0 → dls_dodal-1.64.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,13 +35,15 @@ 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()
 def energy_source() -> DualEnergySource:
-    return DualEnergySource(dcm().energy_in_ev, pgm().energy.user_readback)
+    return DualEnergySource(dcm().energy_in_eV, pgm().energy.user_readback)
 
 
 # Connect will work again after this work completed