dls-dodal 1.34.1__tar.gz → 1.36.0__tar.gz

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.34.1
+Version: 1.36.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.8,>=0.7.0a1
+Requires-Dist: ophyd-async==0.8.0a4
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -233,11 +233,13 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: deepdiff
+Requires-Dist: scanspec>=0.7.3
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
+Requires-Dist: ophyd_async[sim]; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

{dls_dodal-1.34.1/tests → dls_dodal-1.36.0}/conftest.py

@@ -44,6 +44,7 @@ mock_attributes_table = {
 }
 
 BANNED_PATHS = [Path("/dls"), Path("/dls_sw")]
+environ["DODAL_TEST_MODE"] = "true"
 
 
 @pytest.fixture(autouse=True)
@@ -155,19 +156,6 @@ async def static_path_provider(
     return svpp
 
 
-@pytest.fixture
-async def RE():
-    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...")
-    yield RE
-
-
 @pytest.fixture
 def run_engine_documents(RE: RunEngine) -> Mapping[str, list[dict]]:
     docs: dict[str, list[dict]] = {}
@@ -185,3 +173,16 @@ def failed_status(failure: Exception) -> Status:
     status = Status()
     status.set_exception(failure)
     return status
+
+
+@pytest.fixture
+async def RE():
+    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...")
+    yield RE

{dls_dodal-1.34.1 → dls_dodal-1.36.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.7.0a1,<0.8",
+    "ophyd-async==0.8.0a4",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -24,14 +24,15 @@ dependencies = [
     "requests",
     "graypy",
     "pydantic>=2.0",
-    "opencv-python-headless",    # For pin-tip detection.
-    "aioca",                     # Required for CA support with ophyd-async.
-    "p4p",                       # Required for PVA support with ophyd-async.
-    "numpy<2.0",                 # Unpin when https://github.com/bluesky/ophyd-async/issues/387 resolved
+    "opencv-python-headless", # For pin-tip detection.
+    "aioca",                  # Required for CA support with ophyd-async.
+    "p4p",                    # Required for PVA support with ophyd-async.
+    "numpy<2.0",              # Unpin when https://github.com/bluesky/ophyd-async/issues/387 resolved
     "aiofiles",
     "aiohttp",
     "redis",
     "deepdiff",
+    "scanspec>=0.7.3",
 ]
 
 dynamic = ["version"]
@@ -47,6 +48,7 @@ dev = [
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
     "myst-parser",
+    "ophyd_async[sim]",
     "pipdeptree",
     "pre-commit",
     "psutil",
@@ -92,7 +94,7 @@ version_file = "src/dodal/_version.py"
 
 [tool.pyright]
 typeCheckingMode = "standard"
-reportMissingImports = false # Ignore missing stubs in imported modules
+reportMissingImports = false  # Ignore missing stubs in imported modules
 
 [tool.pytest.ini_options]
 # Run pytest with all our checkers, and don't spam us with massive tracebacks on error

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dls-dodal
-Version: 1.34.1
+Version: 1.36.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.8,>=0.7.0a1
+Requires-Dist: ophyd-async==0.8.0a4
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -233,11 +233,13 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: deepdiff
+Requires-Dist: scanspec>=0.7.3
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
+Requires-Dist: ophyd_async[sim]; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: psutil; extra == "dev"

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ Dockerfile
 LICENSE
 README.md
 catalog-info.yaml
+conftest.py
 pull_request_template.md
 pyproject.toml
 .devcontainer/devcontainer.json
@@ -99,6 +100,7 @@ src/dodal/beamlines/p99.py
 src/dodal/beamlines/training_rig.py
 src/dodal/common/__init__.py
 src/dodal/common/coordination.py
+src/dodal/common/crystal_metadata.py
 src/dodal/common/maths.py
 src/dodal/common/signal_utils.py
 src/dodal/common/types.py
@@ -146,6 +148,7 @@ 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
 src/dodal/devices/zebra.py
@@ -176,8 +179,8 @@ src/dodal/devices/i24/beamstop.py
 src/dodal/devices/i24/dcm.py
 src/dodal/devices/i24/dual_backlight.py
 src/dodal/devices/i24/i24_detector_motion.py
-src/dodal/devices/i24/i24_vgonio.py
 src/dodal/devices/i24/pmac.py
+src/dodal/devices/i24/vgonio.py
 src/dodal/devices/oav/__init__.py
 src/dodal/devices/oav/microns_for_zoom_levels.json
 src/dodal/devices/oav/oav_calculations.py
@@ -205,12 +208,18 @@ src/dodal/devices/util/test_utils.py
 src/dodal/devices/xspress3/xspress3.py
 src/dodal/devices/xspress3/xspress3_channel.py
 src/dodal/devices/zocalo/__init__.py
+src/dodal/devices/zocalo/zocalo_constants.py
 src/dodal/devices/zocalo/zocalo_interaction.py
 src/dodal/devices/zocalo/zocalo_results.py
 src/dodal/parameters/experiment_parameter_base.py
-src/dodal/plans/check_topup.py
-src/dodal/plans/data_session_metadata.py
-src/dodal/plans/motor_util_plans.py
+src/dodal/plan_stubs/__init__.py
+src/dodal/plan_stubs/check_topup.py
+src/dodal/plan_stubs/data_session.py
+src/dodal/plan_stubs/motor_utils.py
+src/dodal/plan_stubs/wrapped.py
+src/dodal/plans/__init__.py
+src/dodal/plans/scanspec.py
+src/dodal/plans/wrapped.py
 system_tests/__init__.py
 system_tests/test_aperturescatterguard_system.py
 system_tests/test_eiger_system.py
@@ -224,7 +233,6 @@ system_tests/test_undulator_system.py
 system_tests/test_zebra_system.py
 system_tests/test_zocalo_results.py
 tests/__init__.py
-tests/conftest.py
 tests/fake_beamline.py
 tests/fake_beamline_all_devices_raise_exception.py
 tests/fake_beamline_broken_dependency.py
@@ -241,6 +249,7 @@ tests/beamlines/unit_tests/test_i24.py
 tests/beamlines/unit_tests/test_mapping.py
 tests/common/__init__.py
 tests/common/test_coordination.py
+tests/common/test_crystal_metadata.py
 tests/common/test_maths.py
 tests/common/test_udc_directory_provider.py
 tests/common/test_visit.py
@@ -297,6 +306,7 @@ tests/devices/unit_tests/test_thawer.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
 tests/devices/unit_tests/test_xbpm_feedback.py
 tests/devices/unit_tests/test_xspress3.py
@@ -309,6 +319,7 @@ tests/devices/unit_tests/detector/test_detector.py
 tests/devices/unit_tests/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
 tests/devices/unit_tests/i24/test_pmac.py
+tests/devices/unit_tests/i24/test_vgonio.py
 tests/devices/unit_tests/oav/__init__.py
 tests/devices/unit_tests/oav/conftest.py
 tests/devices/unit_tests/oav/test_grid_overlay.py
@@ -332,8 +343,13 @@ tests/fake_zocalo/README.rst
 tests/fake_zocalo/__init__.py
 tests/fake_zocalo/__main__.py
 tests/fake_zocalo/dls_start_fake_zocalo.sh
-tests/plans/test_motor_util_plans.py
-tests/plans/test_topup_plan.py
+tests/plan_stubs/test_motor_util_plans.py
+tests/plan_stubs/test_topup_plan.py
+tests/plan_stubs/test_wrapped_stubs.py
+tests/plans/conftest.py
+tests/plans/test_compliance.py
+tests/plans/test_scanspec.py
+tests/plans/test_wrapped.py
 tests/preprocessors/test_filesystem_metadata.py
 tests/test_data/bad_beamlineParameters
 tests/test_data/i04_beamlineParameters

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async<0.8,>=0.7.0a1
+ophyd-async==0.8.0a4
 bluesky
 pyepics
 dataclasses-json
@@ -17,12 +17,14 @@ aiofiles
 aiohttp
 redis
 deepdiff
+scanspec>=0.7.3
 
 [dev]
 black
 diff-cover
 mypy
 myst-parser
+ophyd_async[sim]
 pipdeptree
 pre-commit
 psutil

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.34.1'
-__version_tuple__ = version_tuple = (1, 34, 1)
+__version__ = version = '1.36.0'
+__version_tuple__ = version_tuple = (1, 36, 0)

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/beamlines/i22.py

@@ -11,9 +11,13 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import numbered_slits
+from dodal.common.crystal_metadata import (
+    MaterialsEnum,
+    make_crystal_metadata_from_material,
+)
 from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.focusing_mirror import FocusingMirror
-from dodal.devices.i22.dcm import CrystalMetadata, DoubleCrystalMonochromator
+from dodal.devices.i22.dcm import DoubleCrystalMonochromator
 from dodal.devices.i22.fswitch import FSwitch
 from dodal.devices.i22.nxsas import NXSasMetadataHolder, NXSasOAV, NXSasPilatus
 from dodal.devices.linkam3 import Linkam3
@@ -21,6 +25,7 @@ from dodal.devices.slits import Slits
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.tetramm import TetrammDetector
 from dodal.devices.undulator import Undulator
+from dodal.devices.watsonmarlow323_pump import WatsonMarlow323Pump
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name, skip_device
 
@@ -170,17 +175,12 @@ def dcm(
         fake_with_ophyd_sim,
         bl_prefix=False,
         temperature_prefix=f"{BeamlinePrefix(BL).beamline_prefix}-DI-DCM-01:",
-        crystal_1_metadata=CrystalMetadata(
-            usage="Bragg",
-            type="silicon",
-            reflection=(1, 1, 1),
-            d_spacing=(3.13475, "nm"),
+        crystal_1_metadata=make_crystal_metadata_from_material(
+            MaterialsEnum.Si, (1, 1, 1)
         ),
-        crystal_2_metadata=CrystalMetadata(
-            usage="Bragg",
-            type="silicon",
-            reflection=(1, 1, 1),
-            d_spacing=(3.13475, "nm"),
+        crystal_2_metadata=make_crystal_metadata_from_material(
+            MaterialsEnum.Si,
+            (1, 1, 1),
         ),
     )
 
@@ -377,3 +377,16 @@ def linkam(
         wait_for_connection,
         fake_with_ophyd_sim,
     )
+
+
+def ppump(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> WatsonMarlow323Pump:
+    """Sample Environment Peristaltic Pump"""
+    return device_instantiation(
+        WatsonMarlow323Pump,
+        "ppump",
+        "-EA-PUMP-01:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/beamlines/i24.py

@@ -11,8 +11,8 @@ from dodal.devices.i24.beamstop import Beamstop
 from dodal.devices.i24.dcm import DCM
 from dodal.devices.i24.dual_backlight import DualBacklight
 from dodal.devices.i24.i24_detector_motion import DetectorMotion
-from dodal.devices.i24.i24_vgonio import VGonio
 from dodal.devices.i24.pmac import PMAC
+from dodal.devices.i24.vgonio import VerticalGoniometer
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVConfig
 from dodal.devices.zebra import Zebra
@@ -154,12 +154,12 @@ def oav(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) ->
 @skip_device(lambda: BL == "s24")
 def vgonio(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-) -> VGonio:
-    """Get the i24 vgonio device, instantiate it if it hasn't already been.
+) -> VerticalGoniometer:
+    """Get the i24 vertical goniometer device, instantiate it if it hasn't already been.
     If this is called when already instantiated, it will return the existing object.
     """
     return device_instantiation(
-        VGonio,
+        VerticalGoniometer,
         "vgonio",
         "-MO-VGON-01:",
         wait_for_connection,

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/beamlines/p38.py

@@ -10,14 +10,19 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import numbered_slits
+from dodal.common.crystal_metadata import (
+    MaterialsEnum,
+    make_crystal_metadata_from_material,
+)
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.focusing_mirror import FocusingMirror
-from dodal.devices.i22.dcm import CrystalMetadata, DoubleCrystalMonochromator
+from dodal.devices.i22.dcm import DoubleCrystalMonochromator
 from dodal.devices.i22.fswitch import FSwitch
 from dodal.devices.linkam3 import Linkam3
 from dodal.devices.slits import Slits
 from dodal.devices.tetramm import TetrammDetector
 from dodal.devices.undulator import Undulator
+from dodal.devices.watsonmarlow323_pump import WatsonMarlow323Pump
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name, skip_device
 
@@ -227,17 +232,11 @@ def dcm(
         fake_with_ophyd_sim,
         bl_prefix=False,
         temperature_prefix=f"{BeamlinePrefix(BL).beamline_prefix}-DI-DCM-01:",
-        crystal_1_metadata=CrystalMetadata(
-            usage="Bragg",
-            type="silicon",
-            reflection=(1, 1, 1),
-            d_spacing=(3.13475, "nm"),
+        crystal_1_metadata=make_crystal_metadata_from_material(
+            MaterialsEnum.Si, (1, 1, 1)
         ),
-        crystal_2_metadata=CrystalMetadata(
-            usage="Bragg",
-            type="silicon",
-            reflection=(1, 1, 1),
-            d_spacing=(3.13475, "nm"),
+        crystal_2_metadata=make_crystal_metadata_from_material(
+            MaterialsEnum.Si, (1, 1, 1)
         ),
     )
 
@@ -317,3 +316,16 @@ def linkam(
         wait_for_connection,
         fake_with_ophyd_sim,
     )
+
+
+def ppump(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = True
+) -> WatsonMarlow323Pump:
+    """Peristaltic Pump"""
+    return device_instantiation(
+        WatsonMarlow323Pump,
+        "ppump",
+        "-EA-PUMP-01:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/common/beamlines/beamline_utils.py

@@ -90,8 +90,7 @@ def device_instantiation(
         fake: bool                  whether to fake with ophyd.sim
         post_create: Callable       (optional) a function to be run on the device after
                                     creation
-        bl_prefix: bool             if true, add the beamline prefix when instantiating, if
-                                    false the complete PV prefix must be supplied.
+        bl_prefix: bool             if true, add the beamline prefix when instantiating
     Returns:
         The instance of the device.
     """

dls_dodal-1.36.0/src/dodal/common/crystal_metadata.py

@@ -0,0 +1,61 @@
+import math
+from dataclasses import dataclass
+from enum import Enum
+from typing import Literal
+
+
+@dataclass(frozen=True)
+class Material:
+    """
+    Class representing a crystalline material with a specific lattice parameter.
+    """
+
+    name: str
+    lattice_parameter: float  # Lattice parameter in meters
+
+
+class MaterialsEnum(Enum):
+    Si = Material(name="silicon", lattice_parameter=5.4310205e-10)
+    Ge = Material(name="germanium", lattice_parameter=5.6575e-10)
+
+
+@dataclass(frozen=True)
+class CrystalMetadata:
+    """
+    Metadata used in the NeXus format,
+    see https://manual.nexusformat.org/classes/base_classes/NXcrystal.html
+    """
+
+    usage: Literal["Bragg", "Laue"]
+    type: str
+    reflection: tuple[int, int, int]
+    d_spacing: tuple[float, str]
+
+    @staticmethod
+    def calculate_default_d_spacing(
+        lattice_parameter: float, reflection: tuple[int, int, int]
+    ) -> tuple[float, str]:
+        """
+        Calculates the d-spacing value in nanometers based on the given lattice parameter and reflection indices.
+        """
+        h_index, k_index, l_index = reflection
+        d_spacing_m = lattice_parameter / math.sqrt(
+            h_index**2 + k_index**2 + l_index**2
+        )
+        d_spacing_nm = d_spacing_m * 1e9  # Convert meters to nanometers
+        return round(d_spacing_nm, 5), "nm"
+
+
+def make_crystal_metadata_from_material(
+    material: MaterialsEnum,
+    reflection_plane: tuple[int, int, int],
+    usage: Literal["Bragg", "Laue"] = "Bragg",
+    d_spacing_param: tuple[float, str] | None = None,
+):
+    d_spacing = d_spacing_param or CrystalMetadata.calculate_default_d_spacing(
+        material.value.lattice_parameter, reflection_plane
+    )
+    assert all(
+        isinstance(i, int) and i > 0 for i in reflection_plane
+    ), "Reflection plane indices must be positive integers"
+    return CrystalMetadata(usage, material.value.name, reflection_plane, d_spacing)

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/common/signal_utils.py

@@ -1,17 +1,14 @@
 from collections.abc import Callable, Coroutine
-from typing import Any, TypeVar
+from typing import Any
 
 from bluesky.protocols import Reading
-from ophyd_async.core import SignalR, SoftSignalBackend
-from ophyd_async.core._soft_signal_backend import SignalMetadata
+from ophyd_async.core import SignalDatatypeT, SignalR, SoftSignalBackend
 
-T = TypeVar("T")
 
-
-class HarwareBackedSoftSignalBackend(SoftSignalBackend[T]):
+class HardwareBackedSoftSignalBackend(SoftSignalBackend[SignalDatatypeT]):
     def __init__(
         self,
-        get_from_hardware_func: Callable[[], Coroutine[Any, Any, T]],
+        get_from_hardware_func: Callable[[], Coroutine[Any, Any, SignalDatatypeT]],
         *args,
         **kwargs,
     ) -> None:
@@ -20,20 +17,20 @@ class HarwareBackedSoftSignalBackend(SoftSignalBackend[T]):
 
     async def _update_value(self):
         new_value = await self.get_from_hardware_func()
-        await self.put(new_value)
+        await self.put(new_value, True)
 
     async def get_reading(self) -> Reading:
         await self._update_value()
         return await super().get_reading()
 
-    async def get_value(self) -> T:
+    async def get_value(self) -> SignalDatatypeT:
         await self._update_value()
         return await super().get_value()
 
 
 def create_hardware_backed_soft_signal(
-    datatype: type[T],
-    get_from_hardware_func: Callable[[], Coroutine[Any, Any, T]],
+    datatype: type[SignalDatatypeT],
+    get_from_hardware_func: Callable[[], Coroutine[Any, Any, SignalDatatypeT]],
     units: str | None = None,
     precision: int | None = None,
 ):
@@ -45,9 +42,8 @@ def create_hardware_backed_soft_signal(
     the signal is currently read only. See https://github.com/bluesky/ophyd-async/issues/525
     for a more full solution.
     """
-    metadata = SignalMetadata(units=units, precision=precision)
     return SignalR(
-        backend=HarwareBackedSoftSignalBackend(
-            get_from_hardware_func, datatype, metadata=metadata
+        backend=HardwareBackedSoftSignalBackend(
+            get_from_hardware_func, datatype, units=units, precision=precision
         )
     )

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/devices/CTAB.py

@@ -1,6 +1,6 @@
 from ophyd_async.core import StandardReadable
+from ophyd_async.epics.core import epics_signal_r
 from ophyd_async.epics.motor import Motor
-from ophyd_async.epics.signal import epics_signal_r
 
 
 class CTAB(StandardReadable):

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/devices/aperture.py

@@ -1,6 +1,6 @@
 from ophyd_async.core import StandardReadable
+from ophyd_async.epics.core import epics_signal_r
 from ophyd_async.epics.motor import Motor
-from ophyd_async.epics.signal import epics_signal_r
 
 
 class Aperture(StandardReadable):

{dls_dodal-1.34.1 → dls_dodal-1.36.0}/src/dodal/devices/aperturescatterguard.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
 import asyncio
-from enum import Enum
 
 from bluesky.protocols import Movable
 from ophyd_async.core import (
     AsyncStatus,
-    HintedSignal,
     StandardReadable,
+    StandardReadableFormat,
+    StrictEnum,
 )
 from pydantic import BaseModel, Field
 
@@ -22,12 +22,24 @@ class InvalidApertureMove(Exception):
 
 
 class AperturePosition(BaseModel):
+    """
+    Represents one of the available positions for the Aperture-Scatterguard.
+    Attributes:
+        aperture_x: The x position of the aperture component in mm
+        aperture_y: The y position of the aperture component in mm
+        aperture_z: The z position of the aperture component in mm
+        scatterguard_x: The x position of the scatterguard component in mm
+        scatterguard_y: The y position of the scatterguard component in mm
+        radius: Radius of the selected aperture. When in the Robot Load position, the
+            radius is defined to be 0
+    """
+
     aperture_x: float
     aperture_y: float
     aperture_z: float
     scatterguard_x: float
     scatterguard_y: float
-    radius: float | None = Field(json_schema_extra={"units": "µm"}, default=None)
+    radius: float = Field(json_schema_extra={"units": "µm"}, default=0.0)
 
     @property
     def values(self) -> tuple[float, float, float, float, float]:
@@ -54,7 +66,7 @@ class AperturePosition(BaseModel):
     @staticmethod
     def from_gda_params(
         name: ApertureValue,
-        radius: float | None,
+        radius: float,
         params: GDABeamlineParameters,
     ) -> AperturePosition:
         return AperturePosition(
@@ -67,7 +79,7 @@ class AperturePosition(BaseModel):
         )
 
 
-class ApertureValue(str, Enum):
+class ApertureValue(StrictEnum):
     """Maps from a short usable name to the value name in the GDA Beamline parameters"""
 
     ROBOT_LOAD = "ROBOT_LOAD"
@@ -81,7 +93,7 @@ def load_positions_from_beamline_parameters(
 ) -> dict[ApertureValue, AperturePosition]:
     return {
         ApertureValue.ROBOT_LOAD: AperturePosition.from_gda_params(
-            ApertureValue.ROBOT_LOAD, None, params
+            ApertureValue.ROBOT_LOAD, 0, params
         ),
         ApertureValue.SMALL: AperturePosition.from_gda_params(
             ApertureValue.SMALL, 20, params
@@ -120,7 +132,7 @@ class ApertureScatterguard(StandardReadable, Movable):
                 self.radius,
             ],
         )
-        with self.add_children_as_readables(HintedSignal):
+        with self.add_children_as_readables(StandardReadableFormat.HINTED_SIGNAL):
             self.selected_aperture = create_hardware_backed_soft_signal(
                 ApertureValue, self._get_current_aperture_position
             )
@@ -172,7 +184,7 @@ class ApertureScatterguard(StandardReadable, Movable):
 
         raise InvalidApertureMove("Current aperture/scatterguard state unrecognised")
 
-    async def _get_current_radius(self) -> float | None:
+    async def _get_current_radius(self) -> float:
         current_value = await self._get_current_aperture_position()
         return self._loaded_positions[current_value].radius