dls-dodal 1.41.0__tar.gz → 1.43.0__tar.gz

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.41.0
+Version: 1.43.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
@@ -246,7 +246,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==1.1.394; extra == "dev"
+Requires-Dist: pyright; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/docs/how-to/create-beamline.rst

@@ -7,7 +7,7 @@ They include motors in the experiment hutch, optical components in the optics hu
 Beamline Modules
 ----------------
 
-Each beamline should have its own file in the ``doodal.beamlines`` folder, in which the particular devices for the 
+Each beamline should have its own file in the ``dodal.beamlines`` folder, in which the particular devices for the 
 beamline are instantiated. The file should be named after the colloquial name for the beamline. For example:
 
 * ``i03.py``
@@ -25,55 +25,67 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
 
 .. code-block:: python
 
-    from dodal.common.beamlines.beamline_utils import device_instantiation
+    from ophyd_async.epics.adaravis import AravisDetector
+
+    from dodal.common.beamlines.beamline_utils import (
+        device_factory,
+        get_path_provider,
+        set_path_provider,
+    )
     from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-    from dodal.devices.areadetector.adaravis import AdAravisDetector
+    from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
+    from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
     from dodal.devices.synchrotron import Synchrotron
     from dodal.log import set_beamline as set_log_beamline
-    from dodal.utils import get_beamline_name, skip_device
+    from dodal.utils import BeamlinePrefix
 
     BL = get_beamline_name("s41")  # Default used when not on a live beamline
+    PREFIX = BeamlinePrefix(BL)
     set_log_beamline(BL)  # Configure logging and util functions
     set_utils_beamline(BL)
 
+    # Currently we must hard-code the visit, determining the visit is WIP.
+    set_path_provider(
+        StaticVisitPathProvider(
+            BL,
+            # Root directory for all detectors
+            Path("/dls/w41/data/YYYY/cm12345-1"),
+            # Uses an existing GDA server to ensure filename uniqueness
+            client=RemoteDirectoryServiceClient("http://s41-control:8088/api"),
+            # Else if no GDA server use a LocalDirectoryServiceClient(),
+        )
+    )
 
     """
     Define device factory functions below this point.
-    A device factory function is any function that has a return type which conforms 
+    A device factory function is any function that has a return type which conforms
     to one or more Bluesky Protocols.
     """
 
-
     """
-    A valid factory function which is:
-    - instantiated only on the live beamline
-    - a maximum of once
-    - can optionally be faked with ophyd simulated axes
-    - can optionally be connected concurrently by not waiting for connect to complete
-    - if constructor took a prefix, could optionally exclude the BLIXX prefix
+    A valid factory function which:
+    - may be instantiated automatically, selectively on live beamline
+        - caches and re-uses the result for subsequent calls
+    - automatically names the device
+    - may be skipped when make_all_devices is called on this module
+    - must be explicitly connected (may be automated by tools)
+        - when connected may connect to a simulated backend
+        - may be connected concurrently (when automated by tools)
     """"
-    @skip_device(lambda: BL == "s41")  # Conditionally do not instantiate this device
-    def synchrotron(
-        wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
-    ) -> Synchrotron:
-        """Calls the Synchrotron class's constructor with name="synchrotron", prefix=""
-        If this is called when already instantiated, it will return the existing object.
-        """
-        return device_instantiation(
-            Synchrotron,
-            "synchrotron",
-            "",
-            wait_for_connection,
-            fake_with_ophyd_sim,
-            bl_prefix=False,
+    @device_factory(skip = BL == "s41")
+    def synchrotron() -> Synchrotron:
+        return Synchrotron()
+
+
+    @device_factory()
+    def d11() -> AravisDetector:
+        return AravisDetector(
+            f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
+            path_provider=get_path_provider(),
+            drv_suffix=CAM_SUFFIX,
+            fileio_suffix=HDF5_SUFFIX,
         )
 
-    def d11(name: str = "D11") -> AdAravisDetector:
-        """
-        Also a valid Device factory function, but as multiple calls would instantiate
-        multiple copies of a device, discouraged.
-        """
-        return AdAravisDetector(name=name, prefix=f"{BL}-DI-DCAM-01:")
 
 ``w41`` should also be added to the list of ``ALL_BEAMLINES`` in ``tests/beamlines/test_device_instantiation``.
 This test checks that the function returns a type that conforms to Bluesky protocols, 

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/pyproject.toml

@@ -55,7 +55,7 @@ dev = [
     "pre-commit",
     "psutil",
     "pydata-sphinx-theme>=0.12",
-    "pyright==1.1.394",          # See https://github.com/DiamondLightSource/dodal/issues/1079
+    "pyright",
     "pytest",
     "pytest-asyncio",
     "pytest-cov",
@@ -178,14 +178,15 @@ lint.select = [
     "I",   # isort - https://docs.astral.sh/ruff/rules/#isort-i
     "UP",  # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
     "SLF", # self - https://docs.astral.sh/ruff/settings/#lintflake8-self
+    "RUF018" # walrus operators in asserts - https://docs.astral.sh/ruff/rules/assignment-in-assert/
 ]
 
 [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 in tests
-"tests/**/*" = ["SLF001"]
-"system_tests/**/*" = ["SLF001"]
+# Remove this line to forbid private member access and walrus operators in asserts in tests 
+"tests/**/*" = ["SLF001", "RUF018"]
+"system_tests/**/*" = ["SLF001", "RUF018"]
 
 [tool.importlinter]
 root_package = "dodal"

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.41.0
+Version: 1.43.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
@@ -246,7 +246,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==1.1.394; extra == "dev"
+Requires-Dist: pyright; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -90,6 +90,7 @@ src/dodal/beamline_specific_utils/i03.py
 src/dodal/beamlines/README.md
 src/dodal/beamlines/__init__.py
 src/dodal/beamlines/adsim.py
+src/dodal/beamlines/aithre.py
 src/dodal/beamlines/b01_1.py
 src/dodal/beamlines/i02_1.py
 src/dodal/beamlines/i03.py
@@ -99,6 +100,7 @@ src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i18.py
 src/dodal/beamlines/i19_1.py
 src/dodal/beamlines/i19_2.py
+src/dodal/beamlines/i19_optics.py
 src/dodal/beamlines/i20_1.py
 src/dodal/beamlines/i22.py
 src/dodal/beamlines/i23.py
@@ -161,6 +163,7 @@ 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/aithre_lasershaping/goniometer.py
 src/dodal/devices/areadetector/plugins/CAM.py
 src/dodal/devices/areadetector/plugins/MJPG.py
 src/dodal/devices/attenuator/attenuator.py
@@ -197,6 +200,7 @@ src/dodal/devices/i18/diode.py
 src/dodal/devices/i18/table.py
 src/dodal/devices/i18/thor_labs_stage.py
 src/dodal/devices/i19/__init__.py
+src/dodal/devices/i19/hutch_access.py
 src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
 src/dodal/devices/i22/dcm.py
@@ -255,7 +259,10 @@ src/dodal/plan_stubs/wrapped.py
 src/dodal/plans/__init__.py
 src/dodal/plans/save_panda.py
 src/dodal/plans/scanspec.py
+src/dodal/plans/verify_undulator_gap.py
 src/dodal/plans/wrapped.py
+src/dodal/plans/preprocessors/__init__.py
+src/dodal/plans/preprocessors/verify_undulator_gap.py
 system_tests/__init__.py
 system_tests/test_adsim.py
 system_tests/test_aperturescatterguard_system.py
@@ -272,6 +279,7 @@ system_tests/test_zebra_system.py
 system_tests/test_zocalo_results.py
 tests/__init__.py
 tests/conftest.py
+tests/constants.py
 tests/fake_beamline.py
 tests/fake_beamline_all_devices_raise_exception.py
 tests/fake_beamline_broken_dependency.py
@@ -397,13 +405,16 @@ tests/fake_zocalo/README.rst
 tests/fake_zocalo/__init__.py
 tests/fake_zocalo/__main__.py
 tests/fake_zocalo/dls_start_fake_zocalo.sh
+tests/plan_stubs/test_data_session.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_verify_undulator_gap_plan.py
 tests/plans/test_wrapped.py
+tests/plans/test_preprocessors/test_verify_undulator_gap.py
 tests/preprocessors/test_filesystem_metadata.py
 tests/test_data/bad_beamlineParameters
 tests/test_data/i04_beamlineParameters

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dls_dodal.egg-info/requires.txt

@@ -31,7 +31,7 @@ pipdeptree
 pre-commit
 psutil
 pydata-sphinx-theme>=0.12
-pyright==1.1.394
+pyright
 pytest
 pytest-asyncio
 pytest-cov

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.41.0'
-__version_tuple__ = version_tuple = (1, 41, 0)
+__version__ = version = '1.43.0'
+__version_tuple__ = version_tuple = (1, 43, 0)

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/beamlines/__init__.py

@@ -13,6 +13,7 @@ _BEAMLINE_NAME_OVERRIDES = {
     "i20-1": "i20_1",
     "i19-1": "i19_1",
     "i19-2": "i19_2",
+    "i19-optics": "i19_optics",
     "s03": "i03",
     "p46": "training_rig",
     "p47": "training_rig",

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/beamlines/adsim.py

@@ -40,7 +40,7 @@ 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
+export EPICS_CA_ADDR_LIST=127.0.0.1:5094
 ```
 
 How to use the devices in a plan:

dls_dodal-1.43.0/src/dodal/beamlines/aithre.py

@@ -0,0 +1,9 @@
+from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.devices.aithre_lasershaping.goniometer import Goniometer
+
+PREFIX = "LA18L"
+
+
+@device_factory()
+def goniometer() -> Goniometer:
+    return Goniometer(f"{PREFIX}-MO-LSR-01:", "goniometer")

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/beamlines/i04.py

@@ -46,7 +46,7 @@ ZOOM_PARAMS_FILE = (
 DISPLAY_CONFIG = "/dls_sw/i04/software/gda_versions/var/display.configuration"
 DAQ_CONFIGURATION_PATH = "/dls_sw/i04/software/daq_configuration"
 
-REDIS_HOST = os.environ.get("VALKEY_PROD_SVC_SERVICE_HOST", "test_redis")
+REDIS_HOST = "i04-valkey-murko.diamond.ac.uk"
 REDIS_PASSWORD = os.environ.get("VALKEY_PASSWORD", "test_redis_password")
 MURKO_REDIS_DB = 7
 

dls_dodal-1.43.0/src/dodal/beamlines/i19_optics.py

@@ -0,0 +1,34 @@
+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.hutch_shutter import HutchShutter
+from dodal.devices.i19.hutch_access import HutchAccessControl
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix
+
+BL = "i19-optics"
+PREFIX = BeamlinePrefix("i19", "I")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def shutter() -> HutchShutter:
+    """Get the i19 hutch shutter device, instantiate it if it hasn't already been.
+    If this is called when already instantiated, it will return the existing object.
+    """
+    return HutchShutter(
+        f"{PREFIX.beamline_prefix}-PS-SHTR-01:",
+        "shutter",
+    )
+
+
+@device_factory()
+def access_control() -> HutchAccessControl:
+    """Get a device that checks the active hutch for i19, instantiate it if it hasn't already been.
+    If this is called when already instantiated, it will return the existing object.
+    """
+    return HutchAccessControl(f"{PREFIX.beamline_prefix}-OP-STAT-01:", "access_control")

dls_dodal-1.43.0/src/dodal/beamlines/p45.py

@@ -0,0 +1,78 @@
+from pathlib import Path
+
+from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.fastcs.panda import HDFPanda
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    get_path_provider,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.beamlines.device_helpers import DET_SUFFIX, HDF5_SUFFIX
+from dodal.common.visit import StaticVisitPathProvider
+from dodal.devices.p45 import Choppers, TomoStageWithStretchAndSkew
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("p45")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/data/2024/cm37283-2/"),  # latest commissioning visit
+    )
+)
+
+
+@device_factory()
+def sample() -> TomoStageWithStretchAndSkew:
+    return TomoStageWithStretchAndSkew(f"{PREFIX.beamline_prefix}-MO-STAGE-01:")
+
+
+@device_factory()
+def choppers() -> Choppers:
+    return Choppers(f"{PREFIX.beamline_prefix}-MO-CHOP-01:")
+
+
+# Disconnected
+@device_factory(skip=True)
+def det() -> AravisDetector:
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-EA-MAP-01:",
+        path_provider=get_path_provider(),
+        drv_suffix=DET_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+# Disconnected
+@device_factory(skip=True)
+def diff() -> AravisDetector:
+    return AravisDetector(
+        f"{PREFIX.beamline_prefix}-EA-DIFF-01:",
+        path_provider=get_path_provider(),
+        drv_suffix=DET_SUFFIX,
+        fileio_suffix=HDF5_SUFFIX,
+    )
+
+
+# Must document what PandAs are physically connected to
+# See: https://github.com/bluesky/ophyd-async/issues/284
+@device_factory(skip=True)
+def panda1() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory(skip=True)
+def panda2() -> HDFPanda:
+    return HDFPanda(
+        f"{PREFIX.beamline_prefix}-MO-PANDA-02:",
+        path_provider=get_path_provider(),
+    )

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/beamlines/training_rig.py

@@ -10,7 +10,10 @@ 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 DET_SUFFIX, HDF5_SUFFIX
-from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.common.visit import (
+    LocalDirectoryServiceClient,
+    StaticVisitPathProvider,
+)
 from dodal.devices.training_rig.sample_stage import TrainingRigSampleStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -31,6 +34,7 @@ PREFIX = BeamlinePrefix(BL)
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+
 set_path_provider(
     StaticVisitPathProvider(
         BL,

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/common/beamlines/beamline_utils.py

@@ -5,11 +5,13 @@ from typing import Annotated, Final, TypeVar, cast
 from bluesky.run_engine import call_in_bluesky_event_loop
 from ophyd import Device as OphydV1Device
 from ophyd.sim import make_fake_device
-from ophyd_async.core import DEFAULT_TIMEOUT
+from ophyd_async.core import (
+    DEFAULT_TIMEOUT,
+    PathProvider,
+)
 from ophyd_async.core import Device as OphydV2Device
 from ophyd_async.core import wait_for_connection as v2_device_wait_for_connection
 
-from dodal.common.types import UpdatingPathProvider
 from dodal.utils import (
     AnyDevice,
     BeamlinePrefix,
@@ -22,7 +24,6 @@ DEFAULT_CONNECTION_TIMEOUT: Final[float] = 5.0
 
 ACTIVE_DEVICES: dict[str, AnyDevice] = {}
 BL = ""
-PATH_PROVIDER: UpdatingPathProvider | None = None
 
 
 def set_beamline(beamline: str):
@@ -153,15 +154,11 @@ def device_factory(
     return decorator
 
 
-def set_path_provider(provider: UpdatingPathProvider):
+def set_path_provider(provider: PathProvider):
     global PATH_PROVIDER
 
     PATH_PROVIDER = provider
 
 
-def get_path_provider() -> UpdatingPathProvider:
-    if PATH_PROVIDER is None:
-        raise ValueError(
-            "PathProvider has not been set! Ophyd-async StandardDetectors will not be able to write!"
-        )
+def get_path_provider() -> PathProvider:
     return PATH_PROVIDER

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/common/visit.py

@@ -3,7 +3,8 @@ from pathlib import Path
 from typing import Literal
 
 from aiohttp import ClientSession
-from ophyd_async.core import FilenameProvider, PathInfo
+from event_model import RunStart
+from ophyd_async.core import FilenameProvider, PathInfo, PathProvider
 from pydantic import BaseModel
 
 from dodal.common.types import UpdatingPathProvider
@@ -78,7 +79,7 @@ class RemoteDirectoryServiceClient(DirectoryServiceClient):
         ):
             response.raise_for_status()
             json = await response.json()
-            return DataCollectionIdentifier.model_validate_json(json)
+            return DataCollectionIdentifier.model_validate(json)
 
 
 class LocalDirectoryServiceClient(DirectoryServiceClient):
@@ -150,3 +151,42 @@ class StaticVisitPathProvider(UpdatingPathProvider):
         return PathInfo(
             directory_path=self._root, filename=self._filename_provider(device_name)
         )
+
+
+DEFAULT_TEMPLATE = "{device_name}-{instrument}-{scan_id}"
+
+
+class StartDocumentPathProvider(PathProvider):
+    """A PathProvider that sources from metadata in a RunStart document.
+
+    This uses metadata from a RunStart document to determine file names and data session
+    directories. The file naming defaults to "{device_name}-{instrument}-{scan_id}", so
+    the file name is incremented by scan number. A template can be included in the
+    StartDocument to allow for custom naming conventions.
+
+    """
+
+    def __init__(self) -> None:
+        self._doc = {}
+
+    def update_run(self, name: str, start_doc: RunStart) -> None:
+        """Cache a start document.
+
+        This can be plugged into the run engine's subscribe method.
+        """
+        if name == "start":
+            self._doc = start_doc
+
+    def __call__(self, device_name: str | None = None) -> PathInfo:
+        """Returns the directory path and filename for a given data_session.
+
+        The default template for file naming is: "{device_name}-{instrument}-{scan_id}"
+        however, this can be changed by providing a template in the start document. For
+        example: "template": "custom-{device_name}--{scan_id}".
+
+        If you do not provide a data_session_directory it will default to "/tmp".
+        """
+        template = self._doc.get("template", DEFAULT_TEMPLATE)
+        sub_path = template.format_map(self._doc | {"device_name": device_name})
+        data_session_directory = Path(self._doc.get("data_session_directory", "/tmp"))
+        return PathInfo(directory_path=data_session_directory, filename=sub_path)

dls_dodal-1.43.0/src/dodal/devices/aithre_lasershaping/goniometer.py

@@ -0,0 +1,15 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.motor import Motor
+
+
+class Goniometer(StandardReadable):
+    """Goniometer and the stages it sits on"""
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        self.x = Motor(prefix + "X")
+        self.y = Motor(prefix + "Y")
+        self.z = Motor(prefix + "Z")
+        self.sampy = Motor(prefix + "SAMPY")
+        self.sampz = Motor(prefix + "SAMPZ")
+        self.omega = Motor(prefix + "OMEGA")
+        super().__init__(name)

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/devices/detector/detector.py

@@ -32,7 +32,7 @@ class DetectorParams(BaseModel):
     # Must use model_dump(by_alias=True) if serialising!
 
     expected_energy_ev: float | None = None
-    exposure_time: float
+    exposure_time_s: float
     directory: str  # : Path https://github.com/DiamondLightSource/dodal/issues/774
     prefix: str
     detector_distance: float

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/devices/eiger.py

@@ -221,11 +221,11 @@ class EigerDetector(Device, Stageable):
     def set_cam_pvs(self) -> AndStatus:
         assert self.detector_params is not None
         status = self.cam.acquire_time.set(
-            self.detector_params.exposure_time,
+            self.detector_params.exposure_time_s,
             timeout=self.timeouts.general_status_timeout,
         )
         status &= self.cam.acquire_period.set(
-            self.detector_params.exposure_time,
+            self.detector_params.exposure_time_s,
             timeout=self.timeouts.general_status_timeout,
         )
         status &= self.cam.num_exposures.set(

dls_dodal-1.43.0/src/dodal/devices/i19/hutch_access.py

@@ -0,0 +1,8 @@
+from ophyd_async.core import StandardReadable
+from ophyd_async.epics.core import epics_signal_r
+
+
+class HutchAccessControl(StandardReadable):
+    def __init__(self, prefix: str, name: str = "") -> None:
+        self.active_hutch = epics_signal_r(str, f"{prefix}EHStatus.VALA")
+        super().__init__(name)

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/devices/oav/snapshots/snapshot_with_grid.py

@@ -34,9 +34,10 @@ class SnapshotWithGrid(MJPG):
         box_width = await self.box_width.get_value()
         num_boxes_x = await self.num_boxes_x.get_value()
         num_boxes_y = await self.num_boxes_y.get_value()
-
-        assert isinstance(filename_str := await self.filename.get_value(), str)
-        assert isinstance(directory_str := await self.directory.get_value(), str)
+        filename_str = await self.filename.get_value()
+        assert isinstance(filename_str, str)
+        directory_str = await self.directory.get_value()
+        assert isinstance(directory_str, str)
 
         add_grid_border_overlay_to_image(
             image, int(top_left_x), int(top_left_y), box_width, num_boxes_x, num_boxes_y

{dls_dodal-1.41.0 → dls_dodal-1.43.0}/src/dodal/devices/p45.py

@@ -7,13 +7,13 @@ class SampleY(StandardReadable):
     Motors for controlling the sample's y position and stretch in the y axis.
     """
 
-    def __init__(self, prefix: str, name="") -> None:
+    def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.base = Motor(prefix + "CS:Y")
             self.stretch = Motor(prefix + "CS:Y:STRETCH")
             self.top = Motor(prefix + "Y:TOP")
             self.bottom = Motor(prefix + "Y:BOT")
-            super().__init__(name=name)
+        super().__init__(name)
 
 
 class SampleTheta(StandardReadable):
@@ -21,13 +21,13 @@ class SampleTheta(StandardReadable):
     Motors for controlling the sample's theta position and skew
     """
 
-    def __init__(self, prefix: str, name="") -> None:
+    def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.base = Motor(prefix + "THETA:POS")
             self.skew = Motor(prefix + "THETA:SKEW")
             self.top = Motor(prefix + "THETA:TOP")
             self.bottom = Motor(prefix + "THETA:BOT")
-            super().__init__(name=name)
+        super().__init__(name)
 
 
 class TomoStageWithStretchAndSkew(StandardReadable):
@@ -35,12 +35,12 @@ class TomoStageWithStretchAndSkew(StandardReadable):
     Grouping of motors for the P45 tomography stage
     """
 
-    def __init__(self, prefix: str, name="") -> None:
+    def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.x = Motor(prefix + "X")
             self.y = SampleY(prefix)
             self.theta = SampleTheta(prefix)
-            super().__init__(name=name)
+        super().__init__(name)
 
 
 class Choppers(StandardReadable):
@@ -48,8 +48,8 @@ class Choppers(StandardReadable):
     Grouping for the P45 chopper motors
     """
 
-    def __init__(self, prefix: str, name="") -> None:
+    def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables():
             self.x = Motor(prefix + "ENDAT")
             self.y = Motor(prefix + "BISS")
-            super().__init__(name=name)
+        super().__init__(name)