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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.63.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.63.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,
@@ -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(run_engine: 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]
-
-    run_engine.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():
-    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 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 run_engine():
-    yield RunEngine()

{dls_dodal-1.63.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.63.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,9 +77,8 @@ 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(run_engine: RunEngine) -> MyDevice:
+async def sim_my_device() -> MyDevice:
     async with init_devices(mock=True):
         sim_my_device = MyDevice("TEST:")
     return sim_my_device
@@ -91,7 +92,6 @@ def test_my_device_stage(sim_my_device: MyDevice, run_engine: RunEngine) -> None
 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.

{dls_dodal-1.63.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",
@@ -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",
@@ -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"

{dls_dodal-1.63.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.63.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.63.0 → dls_dodal-1.64.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -109,6 +109,7 @@ 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
@@ -260,10 +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/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
@@ -384,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
@@ -504,7 +512,14 @@ 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_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_i10_apple2.py
 tests/devices/i10/test_data/IDEnergy2GapCalibrations.csv

{dls_dodal-1.63.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.63.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.63.0'
-__version_tuple__ = version_tuple = (1, 63, 0)
+__version__ = version = '1.64.0'
+__version_tuple__ = version_tuple = (1, 64, 0)
 
-__commit_id__ = commit_id = 'g8bb309b63'
+__commit_id__ = commit_id = 'g15623816b'

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.63.0 → dls_dodal-1.64.0}/src/dodal/beamlines/i09.py

@@ -43,7 +43,7 @@ def dcm() -> DoubleCrystalMonochromatorWithDSpacing:
 
 @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

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

@@ -34,7 +34,7 @@ def dcm() -> DoubleCrystalMonochromatorWithDSpacing:
 
 @device_factory()
 def energy_source() -> EnergySource:
-    return EnergySource(dcm().energy_in_ev)
+    return EnergySource(dcm().energy_in_eV)
 
 
 # Connect will work again after this work completed

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/beamlines/i09_2.py

@@ -2,6 +2,11 @@ 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.apple2_undulator import (
+    Apple2,
+    UndulatorGap,
+    UndulatorPhaseAxes,
+)
 from dodal.devices.i09.enums import Grating
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -22,3 +27,28 @@ def synchrotron() -> Synchrotron:
 @device_factory()
 def pgm() -> PGM:
     return PGM(prefix=f"{PREFIX.beamline_prefix}-MO-PGM-01:", grating=Grating)
+
+
+@device_factory()
+def jid_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def jid_phase() -> UndulatorPhaseAxes:
+    return UndulatorPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="PUO",
+        top_inner="PUI",
+        btm_inner="PLI",
+        btm_outer="PLO",
+    )
+
+
+@device_factory()
+def jid() -> Apple2:
+    """I09 soft x-ray insertion device."""
+    return Apple2(
+        id_gap=jid_gap(),
+        id_phase=jid_phase(),
+    )

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/beamlines/i10_optics.py

@@ -80,22 +80,35 @@ 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 idd_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def idd_phase() -> UndulatorPhaseAxes:
+    return UndulatorPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="RPQ1",
+        top_inner="RPQ2",
+        btm_inner="RPQ3",
+        btm_outer="RPQ4",
+    )
+
+
+@device_factory()
+def idd_jaw_phase() -> UndulatorJawPhase:
+    return UndulatorJawPhase(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        move_pv="RPQ1",
+    )
+
+
 @device_factory()
 def idd() -> I10Apple2:
     """i10 downstream insertion device:"""
     return I10Apple2(
-        id_gap=UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:"),
-        id_phase=UndulatorPhaseAxes(
-            prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-            top_outer="RPQ1",
-            top_inner="RPQ2",
-            btm_inner="RPQ3",
-            btm_outer="RPQ4",
-        ),
-        id_jaw_phase=UndulatorJawPhase(
-            prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-            move_pv="RPQ1",
-        ),
+        id_gap=idd_gap(), id_phase=idd_phase(), id_jaw_phase=idd_jaw_phase()
     )
 
 
@@ -131,22 +144,35 @@ def energy_dd() -> BeamEnergy:
     return BeamEnergy(id_energy=idd_energy(), mono=pgm().energy)
 
 
+@device_factory()
+def idu_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:")
+
+
+@device_factory()
+def idu_phase() -> UndulatorPhaseAxes:
+    return UndulatorPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
+        top_outer="RPQ1",
+        top_inner="RPQ2",
+        btm_inner="RPQ3",
+        btm_outer="RPQ4",
+    )
+
+
+@device_factory()
+def idu_jaw_phase() -> UndulatorJawPhase:
+    return UndulatorJawPhase(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
+        move_pv="RPQ1",
+    )
+
+
 @device_factory()
 def idu() -> I10Apple2:
     """i10 upstream insertion device"""
     return I10Apple2(
-        id_gap=UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:"),
-        id_phase=UndulatorPhaseAxes(
-            prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
-            top_outer="RPQ1",
-            top_inner="RPQ2",
-            btm_inner="RPQ3",
-            btm_outer="RPQ4",
-        ),
-        id_jaw_phase=UndulatorJawPhase(
-            prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-21:",
-            move_pv="RPQ1",
-        ),
+        id_gap=idu_gap(), id_phase=idu_phase(), id_jaw_phase=idu_jaw_phase()
     )
 
 

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/beamlines/i17.py

@@ -47,18 +47,28 @@ def pgm() -> PGM:
     )
 
 
+@device_factory()
+def id_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def id_phase() -> UndulatorPhaseAxes:
+    return UndulatorPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="RPQ1",
+        top_inner="RPQ2",
+        btm_inner="RPQ3",
+        btm_outer="RPQ4",
+    )
+
+
 @device_factory(skip=True)
 def id() -> Apple2:
     """I17 insertion device:"""
     return Apple2(
-        id_gap=UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:"),
-        id_phase=UndulatorPhaseAxes(
-            prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
-            top_outer="RPQ1",
-            top_inner="RPQ2",
-            btm_inner="RPQ3",
-            btm_outer="RPQ4",
-        ),
+        id_gap=id_gap(),
+        id_phase=id_phase(),
     )
 
 

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/beamlines/i21.py

@@ -2,6 +2,11 @@ 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.apple2_undulator import (
+    Apple2,
+    UndulatorGap,
+    UndulatorPhaseAxes,
+)
 from dodal.devices.i21 import Grating
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -9,7 +14,7 @@ from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
 BL = get_beamline_name("i21")
-PREFIX = BeamlinePrefix(BL, suffix="I")
+PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
@@ -25,3 +30,28 @@ def pgm() -> PGM:
         prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
         grating=Grating,
     )
+
+
+@device_factory()
+def id_gap() -> UndulatorGap:
+    return UndulatorGap(prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:")
+
+
+@device_factory()
+def id_phase() -> UndulatorPhaseAxes:
+    return UndulatorPhaseAxes(
+        prefix=f"{PREFIX.insertion_prefix}-MO-SERVC-01:",
+        top_outer="PUO",
+        top_inner="PUI",
+        btm_inner="PLI",
+        btm_outer="PLO",
+    )
+
+
+@device_factory()
+def id() -> Apple2:
+    """I21 insertion device."""
+    return Apple2(
+        id_gap=id_gap(),
+        id_phase=id_phase(),
+    )

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/cli.py

@@ -4,7 +4,7 @@ from pathlib import Path
 
 import click
 from bluesky.run_engine import RunEngine
-from ophyd_async.core import NotConnected, StaticPathProvider, UUIDFilenameProvider
+from ophyd_async.core import NotConnectedError, StaticPathProvider, UUIDFilenameProvider
 from ophyd_async.plan_stubs import ensure_connected
 
 from dodal.beamlines import all_beamline_names, module_name_for_beamline
@@ -79,7 +79,7 @@ def connect(beamline: str, all: bool, sim_backend: bool) -> None:
     # If exceptions have occurred, this will print details of the relevant PVs
     exceptions = {**instance_exceptions, **connect_exceptions}
     if len(exceptions) > 0:
-        raise NotConnected(exceptions)
+        raise NotConnectedError(exceptions)
 
 
 def _report_successful_devices(
@@ -113,7 +113,7 @@ def _connect_devices(
     # Connect ophyd-async devices
     try:
         run_engine(ensure_connected(*ophyd_async_devices.values(), mock=sim_backend))
-    except NotConnected as ex:
+    except NotConnectedError as ex:
         exceptions = {**exceptions, **ex.sub_errors}
 
     # Only return the subset of devices that haven't raised an exception

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/devices/apple2_undulator.py

@@ -326,8 +326,8 @@ class Apple2(StandardReadable, Movable):
             Name of the device.
         """
         with self.add_children_as_readables():
-            self.gap = id_gap
-            self.phase = id_phase
+            self.gap = Reference(id_gap)
+            self.phase = Reference(id_phase)
         super().__init__(name=name)
 
     @AsyncStatus.wrap
@@ -338,25 +338,27 @@ class Apple2(StandardReadable, Movable):
         """
 
         # Only need to check gap as the phase motors share both fault and gate with gap.
-        await self.gap.raise_if_cannot_move()
+        await self.gap().raise_if_cannot_move()
         await asyncio.gather(
-            self.phase.top_outer.user_setpoint.set(value=id_motor_values.top_outer),
-            self.phase.top_inner.user_setpoint.set(value=id_motor_values.top_inner),
-            self.phase.btm_inner.user_setpoint.set(value=id_motor_values.btm_inner),
-            self.phase.btm_outer.user_setpoint.set(value=id_motor_values.btm_outer),
-            self.gap.user_setpoint.set(value=id_motor_values.gap),
+            self.phase().top_outer.user_setpoint.set(value=id_motor_values.top_outer),
+            self.phase().top_inner.user_setpoint.set(value=id_motor_values.top_inner),
+            self.phase().btm_inner.user_setpoint.set(value=id_motor_values.btm_inner),
+            self.phase().btm_outer.user_setpoint.set(value=id_motor_values.btm_outer),
+            self.gap().user_setpoint.set(value=id_motor_values.gap),
         )
         timeout = np.max(
-            await asyncio.gather(self.gap.get_timeout(), self.phase.get_timeout())
+            await asyncio.gather(self.gap().get_timeout(), self.phase().get_timeout())
         )
         LOGGER.info(
             f"Moving f{self.name} apple2 motors to {id_motor_values}, timeout = {timeout}"
         )
         await asyncio.gather(
-            self.gap.set_move.set(value=1, wait=False, timeout=timeout),
-            self.phase.set_move.set(value=1, wait=False, timeout=timeout),
+            self.gap().set_move.set(value=1, wait=False, timeout=timeout),
+            self.phase().set_move.set(value=1, wait=False, timeout=timeout),
+        )
+        await wait_for_value(
+            self.gap().gate, UndulatorGateStatus.CLOSE, timeout=timeout
         )
-        await wait_for_value(self.gap.gate, UndulatorGateStatus.CLOSE, timeout=timeout)
 
 
 class EnergyMotorConvertor(Protocol):
@@ -448,11 +450,11 @@ class Apple2Controller(abc.ABC, StandardReadable, Generic[Apple2Type]):
                 raw_to_derived=self._read_pol,
                 set_derived=self._set_pol,
                 pol=self.polarisation_setpoint,
-                top_outer=self.apple2().phase.top_outer.user_readback,
-                top_inner=self.apple2().phase.top_inner.user_readback,
-                btm_inner=self.apple2().phase.btm_inner.user_readback,
-                btm_outer=self.apple2().phase.btm_outer.user_readback,
-                gap=self.apple2().gap.user_readback,
+                top_outer=self.apple2().phase().top_outer.user_readback,
+                top_inner=self.apple2().phase().top_inner.user_readback,
+                btm_inner=self.apple2().phase().btm_inner.user_readback,
+                btm_outer=self.apple2().phase().btm_outer.user_readback,
+                gap=self.apple2().gap().user_readback,
             )
         super().__init__(name)
 

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/devices/b07_1/ccmc.py

@@ -62,7 +62,7 @@ class ChannelCutMonochromator(
             )
 
         # energy derived signal as property
-        self.energy_in_ev = derived_signal_r(
+        self.energy_in_eV = derived_signal_r(
             self._convert_pos_to_ev, pos_signal=self.crystal
         )
         super().__init__(name=name)

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/devices/common_dcm.py

@@ -53,9 +53,9 @@ class DoubleCrystalMonochromatorBase(StandardReadable, Generic[Xtal_1, Xtal_2]):
     ) -> None:
         with self.add_children_as_readables():
             # Virtual motor PV's which set the physical motors so that the DCM produces requested energy
-            self.energy_in_kev = Motor(prefix + "ENERGY")
-            self.energy_in_ev = derived_signal_r(
-                self._convert_keV_to_eV, energy_signal=self.energy_in_kev.user_readback
+            self.energy_in_keV = Motor(prefix + "ENERGY")
+            self.energy_in_eV = derived_signal_r(
+                self._convert_keV_to_eV, energy_signal=self.energy_in_keV.user_readback
             )
 
             self._make_crystals(prefix, xtal_1, xtal_2)

{dls_dodal-1.63.0 → dls_dodal-1.64.0}/src/dodal/devices/i03/undulator_dcm.py

@@ -58,7 +58,7 @@ class UndulatorDCM(StandardReadable, Movable[float]):
     async def set(self, value: float):
         await self.undulator_ref().raise_if_not_enabled()
         await asyncio.gather(
-            self.dcm_ref().energy_in_kev.set(value, timeout=ENERGY_TIMEOUT_S),
+            self.dcm_ref().energy_in_keV.set(value, timeout=ENERGY_TIMEOUT_S),
             self.undulator_ref().set(value),
         )