dls-dodal 1.47.0__tar.gz → 1.48.0__tar.gz

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/.github/workflows/_test.yml

@@ -57,6 +57,21 @@ jobs:
         run: |
           python .github/scripts/check_test_durations.py unit-report.json 1
 
+      - name: Checkout simulated devices
+        uses: actions/checkout@v4
+        with:
+          repository: epics-containers/example-services
+          path: example-services
+
+      - name: Run docker compose
+        uses: hoverkraft-tech/compose-action@v2.2.0
+        with:
+          compose-file: "./example-services/compose.yaml"
+          services: |
+            bl01t-di-cam-01
+            bl01t-mo-sim-01
+            ca-gateway
+
       - name: Run system tests
         run: tox -e system-report
 

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/.gitignore

@@ -77,4 +77,5 @@ lockfiles/
 
 
 # custom CI setup 
-report.json
+*-report.json
+*_cov.xml

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.47.0
+Version: 1.48.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.10.0a3
+Requires-Dist: ophyd-async>=0.10.0a4
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

dls_dodal-1.48.0/docs/explanations/decisions/0005-standardise-devices-at-epics-level.md

@@ -0,0 +1,21 @@
+# 5. Encourage aliasing at EPICS level
+
+Date: 2025-05-13
+
+## Status
+
+Proposed
+
+## Context
+
+Many devices have the same functional set of PVs with differing addresses, requiring that either device classes in dodal are generic to support them or duplicate classes are created and must be maintained.
+
+## Decision
+
+Dodal device classes should be made generic before duplicate classes are created, to ensure that upgrades and benefits are shared. Prior to making a device class generic a reasonable attempt should be made to unify the devices at the epics level.
+
+When a new device is onboarded into dodal, there should be clear guidance for the support and controls engineers to use to determine whether an alias should be added to the support module or configurability should be added to the device class.
+
+## Consequences
+
+Documentation on making new devices has been updated and the commitment to trying to standardise devices has been codified.

dls_dodal-1.48.0/docs/how-to/create-device.md

@@ -0,0 +1,28 @@
+Creating a new device
+---------------------
+
+Devices are written using the ophyd-async framework, the hardware abstraction library at Diamond. 
+
+Reusing an existing class
+=========================
+
+When creating a new device, first check if there is a device class that claims to support the device: e.g. all EPICS Motor records should use the [Motor](https://github.com/bluesky/ophyd-async/blob/main/src/ophyd_async/epics/motor.py) type; for reading or monitoring signals from the storage ring the [Synchrotron](https://github.com/DiamondLightSource/dodal/blob/main/src/dodal/devices/synchrotron.py) device should be used; AreaDetectors should use the [StandardDetector](https://github.com/bluesky/ophyd-async/blob/main/src/ophyd_async/core/_detector.py) type- of which there are examples in ophyd_async and in dodal.
+
+If there is a compatible device class it should be used- adding it to the [the beamline](./create-beamline.rst)- this prevents reimplementing the device, and allows improvements to be shared. Improving the device to meet your use case is better than starting again.
+
+If a device class is incompatible due to differences in PV address only, first request that an alias is added to the EPICS support module for the IOC - or request support in making that change. Only if it is not possible to add an alias, for example the support module is proprietary, add configurability to the dodal device class, taking care not to break existing devices- e.g. make new fields have a default that matches the existing pattern, and ensure that `dodal connect` is still able to connect to the device for the existing instances.
+
+If the device class is sufficiently different (or you cannot find a similar device), create a device that connects to the required signals and can be tested for your desired behaviour. During the review process, attempts to bring it closer in line with existing devices may allow to deduplicate some parts, through inheritance or composition of the device from existing components.
+
+
+Writing a device class
+======================
+
+The aim should be to get a new device ready for testing it on the beamline as soon as possible, to ensure fast iteration: write a device against your assumptions of how it should work, write tests against those assumptions then test your assumptions on the beamline. Write issues from beamline testing, to resolve offline to reserve as much time for testing that requires the beamline as possible.
+
+Dodal's CLI `dodal connect <beamline>` is a useful way to verify that PV addresses are correct, together with `cainfo <PV address>` to find the datatype of signals.
+
+If you're not sure how to represent a PV as a Signal: ask! Seek feedback early (e.g. by opening a draft PR) and merge with other devices where it makes sense to. The test suite should provide confidence to do so without breaking existing code.
+
+
+.. _ophyd-async: https://blueskyproject.io/ophyd-async/main/how-to/choose-interfaces-for-devices.html

{dls_dodal-1.47.0 → dls_dodal-1.48.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.10.0a3",
+    "ophyd-async>=0.10.0a4",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -24,9 +24,9 @@ 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.
+    "opencv-python-headless", # For pin-tip detection.
+    "aioca",                  # Required for CA support with ophyd-async.
+    "p4p",                    # Required for PVA support with ophyd-async.
     "numpy",
     "aiofiles",
     "aiohttp",
@@ -103,12 +103,11 @@ reportMissingImports = false  # Ignore missing stubs in imported modules
 # Run pytest with all our checkers, and don't spam us with massive tracebacks on error
 asyncio_mode = "auto"
 markers = [
-    "adsim: marks tests as requiring the containerised AreaDetector simulator running (deselect with '-m \"not adsim\"')",
+    "requires: marks tests as requiring other infrastructure",
     "skip_in_pycharm: marks test as not working in pycharm testrunner",
-    "system_test: marks test as other system test that requires infrastructure"
 ]
 addopts = """
-    --cov=dodal --cov-report term --cov-report xml:cov.xml
+    --cov=src/dodal --cov=dodal --cov-report term
     --tb=native -vv --doctest-modules --doctest-glob="*.rst"
     """
 # https://iscinumpy.gitlab.io/post/bound-version-constraints/#watch-for-warnings
@@ -118,8 +117,6 @@ filterwarnings = [
     "ignore:dep_util is Deprecated. Use functions from setuptools instead.:DeprecationWarning",
     # Ignore deprecation warning from zocalo
     "ignore:.*pkg_resources.*:DeprecationWarning",
-    # Ignore deprecation warning from setuptools_dso (remove when https://github.com/epics-base/setuptools_dso/issues/36 is released)
-    "ignore::DeprecationWarning:wheel",
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests system_tests"
@@ -154,12 +151,12 @@ allowlist_externals =
     sphinx-build
     sphinx-autobuild
 commands =
-    tests: pytest -m 'not (adsim)' --cov=dodal --cov-report term --cov-report xml:cov.xml {posargs}
+    tests: pytest -m 'not requires' {posargs}
     type-checking: pyright src tests {posargs}
     pre-commit: pre-commit run --all-files --show-diff-on-failure {posargs}
     docs: sphinx-{posargs:build -E} -T docs build/html
-    unit-report: pytest -m 'not (adsim)' --cov=dodal --cov-report term --cov-report xml:unit_cov.xml --json-report --json-report-file=unit-report.json tests {posargs}
-    system-report: pytest -m 'not (adsim or system_test)' --cov=dodal --cov-report term --cov-report xml:system_cov.xml --json-report --json-report-file=system-report.json system_tests {posargs}
+    unit-report: pytest --cov-report xml:unit_cov.xml --json-report --json-report-file=unit-report.json tests {posargs}
+    system-report: pytest -m 'not requires(instrument="i04")' --cov-report xml:system_cov.xml --json-report --json-report-file=system-report.json system_tests {posargs}
 """
 
 [tool.ruff]

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.47.0
+Version: 1.48.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.10.0a3
+Requires-Dist: ophyd-async>=0.10.0a4
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -47,17 +47,18 @@ docs/explanations/decisions/0001-record-architecture-decisions.md
 docs/explanations/decisions/0002-switched-to-python-copier-template.md
 docs/explanations/decisions/0003-codeowners.md
 docs/explanations/decisions/0004-make-devices-factory.md
+docs/explanations/decisions/0005-standardise-devices-at-epics-level.md
 docs/explanations/decisions/COPYME
 docs/how-to/build-docs.md
 docs/how-to/contribute.md
 docs/how-to/coverage.md
 docs/how-to/create-beamline.rst
+docs/how-to/create-device.md
 docs/how-to/dev-install.md
 docs/how-to/excalidraw.md
 docs/how-to/external-io-devices.md
 docs/how-to/lint.md
 docs/how-to/lock-requirements.md
-docs/how-to/make-new-ophyd-async-device.rst
 docs/how-to/make-release.md
 docs/how-to/move-code.rst
 docs/how-to/pypi.md
@@ -170,6 +171,7 @@ 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/aithre_lasershaping/laser_robot.py
 src/dodal/devices/areadetector/plugins/CAM.py
 src/dodal/devices/areadetector/plugins/MJPG.py
 src/dodal/devices/attenuator/attenuator.py
@@ -284,9 +286,8 @@ 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/plan_stubs/electron_analyser/__init__.py
-src/dodal/plan_stubs/electron_analyser/configure_driver.py
 src/dodal/plans/__init__.py
+src/dodal/plans/configure_arm_trigger_and_disarm_detector.py
 src/dodal/plans/save_panda.py
 src/dodal/plans/scanspec.py
 src/dodal/plans/verify_undulator_gap.py
@@ -329,8 +330,8 @@ tests/common/beamlines/test_device_instantiation.py
 tests/devices/__init__.py
 tests/devices/test_common_dcm.py
 tests/devices/test_diamond_filter.py
+tests/devices/aithre_lasershaping/test_goniometer.py
 tests/devices/i03/__init__.py
-tests/devices/i03/test_beamstop.py
 tests/devices/i04/__init__.py
 tests/devices/i04/test_murko_results.py
 tests/devices/i04/test_transfocator.py
@@ -351,6 +352,8 @@ tests/devices/i19/test_shutter.py
 tests/devices/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
 tests/devices/i22/test_metadataholder.py
+tests/devices/mx_phase1/__init__.py
+tests/devices/mx_phase1/test_beamstop.py
 tests/devices/training_rig/test_sample_stage.py
 tests/devices/unit_tests/__init__.py
 tests/devices/unit_tests/test_OAVCentring.json
@@ -404,6 +407,7 @@ tests/devices/unit_tests/detector/test_detector.py
 tests/devices/unit_tests/electron_analyser/__init__.py
 tests/devices/unit_tests/electron_analyser/conftest.py
 tests/devices/unit_tests/electron_analyser/test_util.py
+tests/devices/unit_tests/electron_analyser/util.py
 tests/devices/unit_tests/electron_analyser/abstract/__init__.py
 tests/devices/unit_tests/electron_analyser/abstract/test_base_detector.py
 tests/devices/unit_tests/electron_analyser/abstract/test_base_driver_io.py
@@ -454,6 +458,7 @@ 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_configure_arm_trigger_and_disarm_detector.py
 tests/plans/test_scanspec.py
 tests/plans/test_verify_undulator_gap_plan.py
 tests/plans/test_wrapped.py

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async>=0.10.0a3
+ophyd-async>=0.10.0a4
 bluesky
 pyepics
 dataclasses-json

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.47.0'
-__version_tuple__ = version_tuple = (1, 47, 0)
+__version__ = version = '1.48.0'
+__version_tuple__ = version_tuple = (1, 48, 0)

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/beamlines/aithre.py

@@ -1,5 +1,6 @@
 from dodal.common.beamlines.beamline_utils import device_factory
 from dodal.devices.aithre_lasershaping.goniometer import Goniometer
+from dodal.devices.aithre_lasershaping.laser_robot import LaserRobot
 
 PREFIX = "LA18L"
 
@@ -7,3 +8,8 @@ PREFIX = "LA18L"
 @device_factory()
 def goniometer() -> Goniometer:
     return Goniometer(f"{PREFIX}-MO-LSR-01:", "goniometer")
+
+
+@device_factory()
+def robot() -> LaserRobot:
+    return LaserRobot("robot", f"{PREFIX}-MO-ROBOT-01:")

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/beamlines/b01_1.py

@@ -24,7 +24,7 @@ set_utils_beamline(BL)
 set_path_provider(
     StaticVisitPathProvider(
         BL,
-        Path("/dls/b01-1/data/"),
+        Path("/dls/b01-1/data/2025/cm40661-1/"),
         client=LocalDirectoryServiceClient(),
     )
 )

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/beamlines/i03.py

@@ -1,3 +1,4 @@
+from ophyd_async.fastcs.eiger import EigerDetector as FastEiger
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_parameters import get_beamline_parameters
@@ -28,8 +29,8 @@ from dodal.devices.i03 import Beamstop
 from dodal.devices.i03.dcm import DCM
 from dodal.devices.i03.undulator_dcm import UndulatorDCM
 from dodal.devices.motors import XYZPositioner
-from dodal.devices.oav.oav_detector import OAV
-from dodal.devices.oav.oav_parameters import OAVConfig
+from dodal.devices.oav.oav_detector import OAVBeamCentreFile
+from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
 from dodal.devices.qbpm import QBPM
 from dodal.devices.robot import BartRobot
@@ -172,6 +173,20 @@ def eiger(mock: bool = False) -> EigerDetector:
     )
 
 
+@device_factory()
+def fastcs_eiger() -> FastEiger:
+    """Get the i03 FastCS Eiger 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 FastEiger(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-02:",
+        hdf_suffix="-EA-EIGER-01:OD:",
+    )
+
+
 @device_factory()
 def zebra_fast_grid_scan() -> ZebraFastGridScan:
     """Get the i03 zebra_fast_grid_scan device, instantiate it if it hasn't already been.
@@ -197,15 +212,15 @@ def panda_fast_grid_scan() -> PandAFastGridScan:
 
 @device_factory()
 def oav(
-    params: OAVConfig | None = None,
-) -> OAV:
+    params: OAVConfigBeamCentre | None = None,
+) -> OAVBeamCentreFile:
     """Get the i03 OAV 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 OAV(
+    return OAVBeamCentreFile(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         name="oav",
-        config=params or OAVConfig(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
     )
 
 

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/beamlines/i04.py

@@ -24,7 +24,7 @@ from dodal.devices.i04.transfocator import Transfocator
 from dodal.devices.ipin import IPin
 from dodal.devices.motors import XYZPositioner
 from dodal.devices.mx_phase1.beamstop import Beamstop
-from dodal.devices.oav.oav_detector import OAV
+from dodal.devices.oav.oav_detector import OAVBeamCentrePV
 from dodal.devices.oav.oav_parameters import OAVConfig
 from dodal.devices.oav.oav_to_redis_forwarder import OAVToRedisForwarder
 from dodal.devices.oav.pin_image_recognition import PinTipDetection
@@ -53,7 +53,7 @@ DISPLAY_CONFIG = "/dls_sw/i04/software/gda_versions/var/display.configuration"
 DAQ_CONFIGURATION_PATH = "/dls_sw/i04/software/daq_configuration"
 
 
-BL = get_beamline_name("s04")
+BL = get_beamline_name("i04")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
@@ -297,18 +297,25 @@ def zebra() -> Zebra:
 
 
 @device_factory(skip=BL == "s04")
-def oav(
-    wait_for_connection: bool = True,
-    fake_with_ophyd_sim: bool = False,
-    params: OAVConfig | None = None,
-) -> OAV:
+def oav(params: OAVConfig | None = None) -> OAVBeamCentrePV:
     """Get the i04 OAV device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i04, it will return the existing object.
     """
-    return OAV(
+    return OAVBeamCentrePV(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
-        name="oav",
-        config=params or OAVConfig(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        config=params or OAVConfig(ZOOM_PARAMS_FILE),
+    )
+
+
+@device_factory(skip=BL == "s04")
+def oav_full_screen(params: OAVConfig | None = None) -> OAVBeamCentrePV:
+    """Get the i04 OAV device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i04, it will return the existing object.
+    """
+    return OAVBeamCentrePV(
+        prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
+        config=params or OAVConfig(ZOOM_PARAMS_FILE),
+        overlay_channel=3,
     )
 
 

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/beamlines/i18.py

@@ -113,7 +113,7 @@ def hfm() -> KBMirror:
 
 
 @device_factory()
-def d7diode() -> Diode:
+def d7_diode() -> Diode:
     return Diode(f"{PREFIX.beamline_prefix}-DI-PHDGN-07:")
 
 

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/beamlines/i19_1.py

@@ -6,9 +6,12 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.devices.i19.beamstop import BeamStop
 from dodal.devices.i19.blueapi_device import HutchState
-from dodal.devices.i19.shutter import AccessControlledShutter
-from dodal.devices.oav.oav_detector import OAV
-from dodal.devices.oav.oav_parameters import OAVConfig
+from dodal.devices.i19.shutter import (
+    AccessControlledShutter,
+    HutchState,
+)
+from dodal.devices.oav.oav_detector import OAVBeamCentreFile
+from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
@@ -48,10 +51,10 @@ def beamstop() -> BeamStop:
 
 
 @device_factory()
-def oav() -> OAV:
-    return OAV(
+def oav() -> OAVBeamCentreFile:
+    return OAVBeamCentreFile(
         prefix=f"{PREFIX.beamline_prefix}-EA-OAV-01:",
-        config=OAVConfig(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        config=OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
     )
 
 

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/beamlines/i24.py

@@ -15,8 +15,8 @@ from dodal.devices.i24.i24_detector_motion import DetectorMotion
 from dodal.devices.i24.pilatus_metadata import PilatusMetadata
 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.oav.oav_detector import OAVBeamCentreFile
+from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_constants_mapping import (
     ZebraMapping,
@@ -150,11 +150,11 @@ def pmac() -> PMAC:
 
 
 @device_factory(skip=BL == "s24")
-def oav() -> OAV:
-    return OAV(
+def oav() -> OAVBeamCentreFile:
+    return OAVBeamCentreFile(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
         name="oav",
-        config=OAVConfig(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        config=OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
     )
 
 

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/common/beamlines/beamline_parameters.py

@@ -1,3 +1,4 @@
+import ast
 from typing import Any, cast
 
 from dodal.log import LOGGER
@@ -57,34 +58,7 @@ class GDABeamlineParameters:
 
     @classmethod
     def parse_value(cls, value: str):
-        if value[0] == "[":
-            return cls.parse_list(value[1:].strip())
-        else:
-            return cls.parse_list_element(value)
-
-    @classmethod
-    def parse_list_element(cls, value: str):
-        if value == "Yes":
-            return True
-        elif value == "No":
-            return False
-        else:
-            return float(value)
-
-    @classmethod
-    def parse_list(cls, value: str):
-        list_output = []
-        remaining = value.strip()
-        i = 0
-        while (i := remaining.find(",")) != -1:
-            list_output.append(cls.parse_list_element(remaining[:i]))
-            remaining = remaining[i + 1 :].lstrip()
-        if (i := remaining.find("]")) != -1:
-            list_output.append(cls.parse_list_element(remaining[:i]))
-            remaining = remaining[i + 1 :].lstrip()
-        else:
-            raise ValueError("Missing closing ']' in list expression")
-        return list_output
+        return ast.literal_eval(value.replace("Yes", "True").replace("No", "False"))
 
 
 def get_beamline_parameters(beamline_param_path: str | None = None):

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

@@ -0,0 +1,49 @@
+import asyncio
+import math
+
+from ophyd_async.core import StandardReadable, derived_signal_rw
+from ophyd_async.epics.motor import Motor
+
+
+class Goniometer(StandardReadable):
+    """The Aithre lab goniometer and the XYZ stage it sits on.
+
+    `x`, `y` and `z` control the axes of the positioner at the base, while `sampy` and
+    `sampz` control the positioner of the sample. `omega` is the rotation about the
+    x-axis (along the length of the sample holder).
+
+    The `vertical_position` signal refers to the height of the sample from the point of
+    view of the OAV and setting this value moves the sample vertically in the OAV plane
+    regardless of the current rotation.
+    """
+
+    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")
+        self.vertical_position = derived_signal_rw(
+            self._get,
+            self._set,
+            sampy=self.sampy,
+            sampz=self.sampz,
+            omega=self.omega,
+        )
+        super().__init__(name)
+
+    def _get(self, sampz: float, sampy: float, omega: float) -> float:
+        z_component = sampz * math.cos(math.radians(omega))
+        y_component = sampy * math.sin(math.radians(omega))
+        return z_component + y_component
+
+    async def _set(self, value: float) -> None:
+        omega = await self.omega.user_readback.get_value()
+        z_component = value * math.cos(math.radians(omega))
+        y_component = value * math.sin(math.radians(omega))
+        await asyncio.gather(
+            self.sampy.set(y_component),
+            self.sampz.set(z_component),
+            self.omega.set(omega),
+        )

dls_dodal-1.48.0/src/dodal/devices/aithre_lasershaping/laser_robot.py

@@ -0,0 +1,27 @@
+from ophyd_async.core import StrictEnum
+from ophyd_async.epics.core import epics_signal_rw
+
+from dodal.devices.robot import BartRobot
+
+
+class ForceBit(StrictEnum):
+    ON = "On"
+    NO = "No"
+    OFF = "Off"
+
+
+class LidHeatEnable(StrictEnum):
+    ENABLED = "Enabled"
+    DISABLED = "Disabled"
+
+
+class LaserRobot(BartRobot):
+    def __init__(self, name: str, prefix: str) -> None:
+        self.dewar_lid_heater = epics_signal_rw(
+            LidHeatEnable, prefix + "DW_1_ENABLED", prefix + "DW_1_CTRL"
+        )
+        self.cryojet_retract = epics_signal_rw(ForceBit, prefix + "OP_24_FORCE_OPTION")
+        self.set_beamline_safe = epics_signal_rw(
+            ForceBit, prefix + "IP_16_FORCE_OPTION"
+        )
+        super().__init__(name=name, prefix=prefix)

dls_dodal-1.48.0/src/dodal/devices/electron_analyser/__init__.py

@@ -0,0 +1,18 @@
+from .abstract.base_detector import (
+    ElectronAnalyserDetector,
+    ElectronAnalyserRegionDetector,
+    TElectronAnalyserDetector,
+    TElectronAnalyserRegionDetector,
+)
+from .types import EnergyMode
+from .util import to_binding_energy, to_kinetic_energy
+
+__all__ = [
+    "to_binding_energy",
+    "to_kinetic_energy",
+    "EnergyMode",
+    "ElectronAnalyserDetector",
+    "TElectronAnalyserDetector",
+    "ElectronAnalyserRegionDetector",
+    "TElectronAnalyserRegionDetector",
+]

{dls_dodal-1.47.0 → dls_dodal-1.48.0}/src/dodal/devices/electron_analyser/abstract/__init__.py

@@ -1,9 +1,6 @@
 from .base_detector import (
     AbstractAnalyserDriverIO,
     AbstractElectronAnalyserDetector,
-    AbstractElectronAnalyserRegionDetector,
-    TAbstractElectronAnalyserDetector,
-    TAbstractElectronAnalyserRegionDetector,
 )
 from .base_driver_io import AbstractAnalyserDriverIO, TAbstractAnalyserDriverIO
 from .base_region import (
@@ -20,9 +17,6 @@ __all__ = [
     "TAbstractBaseSequence",
     "AbstractAnalyserDriverIO",
     "AbstractElectronAnalyserDetector",
-    "AbstractElectronAnalyserRegionDetector",
-    "TAbstractElectronAnalyserDetector",
-    "TAbstractElectronAnalyserRegionDetector",
     "AbstractAnalyserDriverIO",
     "TAbstractAnalyserDriverIO",
 ]