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

{dls_dodal-1.46.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.46.0 → dls_dodal-1.48.0}/.gitignore

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.46.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.46.0 → dls_dodal-1.48.0}/conftest.py

@@ -4,7 +4,7 @@ import os
 import sys
 import time
 from collections.abc import Mapping
-from os import environ, getenv
+from os import environ
 from pathlib import Path
 from typing import Any
 from unittest.mock import MagicMock, patch
@@ -35,7 +35,6 @@ mock_paths = [
 mock_attributes_table = {
     "i03": mock_paths,
     "i10": mock_paths,
-    "s03": mock_paths,
     "i04": mock_paths,
     "s04": mock_paths,
     "i19_1": mock_paths,
@@ -98,16 +97,6 @@ def pytest_runtest_teardown():
         sys.modules["dodal.beamlines.beamline_utils"].clear_devices()
 
 
-s03_epics_server_port = getenv("S03_EPICS_CA_SERVER_PORT")
-s03_epics_repeater_port = getenv("S03_EPICS_CA_REPEATER_PORT")
-
-if s03_epics_server_port is not None:
-    environ["EPICS_CA_SERVER_PORT"] = s03_epics_server_port
-    print(f"[EPICS_CA_SERVER_PORT] = {s03_epics_server_port}")
-if s03_epics_repeater_port is not None:
-    environ["EPICS_CA_REPEATER_PORT"] = s03_epics_repeater_port
-    print(f"[EPICS_CA_REPEATER_PORT] = {s03_epics_repeater_port}")
-
 PATH_INFO_FOR_TESTING: PathInfo = PathInfo(
     directory_path=Path("/does/not/exist"),
     filename="on_this_filesystem",

dls_dodal-1.46.0/docs/explanations/decisions/0003-make-devices-factory.md → dls_dodal-1.48.0/docs/explanations/decisions/0004-make-devices-factory.md

@@ -1,4 +1,4 @@
-# 3. Add device factory decorator with lazy connect support
+# 4. Add device factory decorator with lazy connect support
 
 Date: 2024-04-26
 

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.48.0/docs/how-to/external-io-devices.md

@@ -0,0 +1,27 @@
+# How to Write External IO Devices
+
+## Motivation and Overview
+
+At Diamond Dodal devices primarily refer to python classes referencing EPICS channels, with some internal logic.
+There are instances when input-output operations are desired that do not work with EPICS.
+For example, many GDA-compatible features need disk IO as GDA relies heavily on XML files to define various variables.
+One may need a bluesky calibration plan to start with cached values - those could be in the filesystem or a key value store like Redis.
+
+Direct IO inside plans is not allowed when inside the RunEngine context.
+
+As far as is possible, we want our devices to only talk to EPICS PVs. The [config server](https://github.com/DiamondLightSource/daq-config-server) should fulfil the majority of use cases. Where we can't do that, it is possible to make ophyd-async devices, but heavily discouraged and that would be a temporary solution until the config server supports that IO.
+It's not recommended to read from the filesystem going forward and instead development effort will be put into the config server.
+
+## Extant examples
+
+- [aperturescatterguard](../../src/dodal/devices/aperturescatterguard.py) - reads a set of valid positions from a file.
+- [oav_to_redis_forwarder](../../src/dodal/devices/oav/oav_to_redis_forwarder.py) - pushes data into redis
+- [OAV_detector](../../src/dodal/devices/oav/oav_detector.py) - detector configuration is based on a file on disk
+
+## Existing patterns
+
+Those three devices have been mostly at the MX beamlines. To see a more up to date list, narrow down the search to the [beamlines folder](../../src/dodal/beamlines/) and search for a `dls` string. You will see `Path` calls that are about data writing, but also some ALL_CAPS constants such as `DISPLAY_CONFIG`.
+There are two cases, either the IO operation we're looking into is just on device start, or it's an ongoing thing. If it's just in the start as a config, the established pattern is to provide a Class for that object, and make a standlone function in the device file to load it from the filesystem, taking path as a parameter.
+Then inside the specific file in the beamlines folder, the device takes the product of calling the function with a beamline-specific path. The fact the device just takes an object makes it easier to write mocks for testing.
+
+Conversely if the IO is ongoing throughout the lifetime of the device object, AsyncStatus logic must be implemented, as in the oav_to_redis_forwarder, mentioned earlier.

{dls_dodal-1.46.0 → dls_dodal-1.48.0}/docs/reference/device-standards.rst

@@ -150,10 +150,9 @@ based on this and so this has the issues listed above. Instead you should make s
         def __init__(self):
             self.underlying_motor = Motor("MOTOR")
             with self.add_children_as_readables():
-                self.in_out = create_r_hardware_backed_soft_signal(InOut, self._get_in_out_from_hardware)
+                self.in_out = derived_signal_r(self._get_in_out_from_hardware, current_position= self.underlying_motor)
                 
-        async def _get_in_out_from_hardware(self):
-            current_position = await self.underlying_motor.get_value()
+        def _get_in_out_from_hardware(self, current_position:float)->InOut:
             if isclose(current_position, 0):
                 return InOut.IN
             elif isclose(current_position, 100):
@@ -169,6 +168,6 @@ based on this and so this has the issues listed above. Instead you should make s
             else:
                 await self.underlying_motor.set(0)
 
-This will be simplified by https://github.com/bluesky/ophyd-async/issues/525
+For detail on how to use derived signal see `ophyd-async how to guide. <https://blueskyproject.io/ophyd-async/main/how-to/derive-one-signal-from-others.html>`__
 
 .. _flowchart: https://blueskyproject.io/ophyd-async/main/how-to/choose-interfaces-for-devices.html

{dls_dodal-1.46.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",
@@ -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 = [
-    "s03: marks tests as requiring the s03 simulator running (deselect with '-m \"not s03\"')",
-    "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",
 ]
 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 (s03 or 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 (s03 or 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 (s03 or adsim)' --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.46.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.46.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.46.0 → dls_dodal-1.48.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -46,17 +46,19 @@ docs/explanations/reviews.md
 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/0003-make-devices-factory.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
@@ -119,7 +121,6 @@ src/dodal/common/coordination.py
 src/dodal/common/crystal_metadata.py
 src/dodal/common/data_util.py
 src/dodal/common/maths.py
-src/dodal/common/signal_utils.py
 src/dodal/common/types.py
 src/dodal/common/udc_directory_provider.py
 src/dodal/common/visit.py
@@ -148,10 +149,10 @@ src/dodal/devices/focusing_mirror.py
 src/dodal/devices/hutch_shutter.py
 src/dodal/devices/ipin.py
 src/dodal/devices/linkam3.py
-src/dodal/devices/logging_ophyd_device.py
 src/dodal/devices/motors.py
 src/dodal/devices/p45.py
 src/dodal/devices/pgm.py
+src/dodal/devices/positioner.py
 src/dodal/devices/pressure_jump_cell.py
 src/dodal/devices/qbpm.py
 src/dodal/devices/robot.py
@@ -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
@@ -188,16 +190,26 @@ src/dodal/devices/detector/det_resolution.py
 src/dodal/devices/detector/detector.py
 src/dodal/devices/detector/detector_motion.py
 src/dodal/devices/electron_analyser/__init__.py
-src/dodal/devices/electron_analyser/abstract_analyser_io.py
-src/dodal/devices/electron_analyser/abstract_region.py
-src/dodal/devices/electron_analyser/specs_analyser_io.py
-src/dodal/devices/electron_analyser/specs_region.py
-src/dodal/devices/electron_analyser/vgscienta_analyser_io.py
-src/dodal/devices/electron_analyser/vgscienta_region.py
+src/dodal/devices/electron_analyser/types.py
+src/dodal/devices/electron_analyser/util.py
+src/dodal/devices/electron_analyser/abstract/__init__.py
+src/dodal/devices/electron_analyser/abstract/base_detector.py
+src/dodal/devices/electron_analyser/abstract/base_driver_io.py
+src/dodal/devices/electron_analyser/abstract/base_region.py
+src/dodal/devices/electron_analyser/specs/__init__.py
+src/dodal/devices/electron_analyser/specs/detector.py
+src/dodal/devices/electron_analyser/specs/driver_io.py
+src/dodal/devices/electron_analyser/specs/region.py
+src/dodal/devices/electron_analyser/vgscienta/__init__.py
+src/dodal/devices/electron_analyser/vgscienta/detector.py
+src/dodal/devices/electron_analyser/vgscienta/driver_io.py
+src/dodal/devices/electron_analyser/vgscienta/region.py
 src/dodal/devices/i03/__init__.py
-src/dodal/devices/i03/beamstop.py
 src/dodal/devices/i03/dcm.py
 src/dodal/devices/i03/undulator_dcm.py
+src/dodal/devices/i04/__init__.py
+src/dodal/devices/i04/constants.py
+src/dodal/devices/i04/murko_results.py
 src/dodal/devices/i04/transfocator.py
 src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
@@ -234,6 +246,7 @@ src/dodal/devices/i24/i24_detector_motion.py
 src/dodal/devices/i24/pilatus_metadata.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/i24/vgonio.py
+src/dodal/devices/mx_phase1/beamstop.py
 src/dodal/devices/oav/__init__.py
 src/dodal/devices/oav/oav_calculations.py
 src/dodal/devices/oav/oav_detector.py
@@ -248,6 +261,7 @@ src/dodal/devices/oav/snapshots/snapshot.py
 src/dodal/devices/oav/snapshots/snapshot_image_processing.py
 src/dodal/devices/oav/snapshots/snapshot_with_grid.py
 src/dodal/devices/p99/__init__.py
+src/dodal/devices/p99/andor2_point.py
 src/dodal/devices/p99/sample_stage.py
 src/dodal/devices/training_rig/__init__.py
 src/dodal/devices/training_rig/sample_stage.py
@@ -272,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_controller.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
@@ -283,18 +296,9 @@ 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
 system_tests/test_cli.py
-system_tests/test_eiger_system.py
-system_tests/test_gridscan_system.py
 system_tests/test_oav_system.py
 system_tests/test_oav_to_redis_system.py
-system_tests/test_slit_gaps_system.py
-system_tests/test_smargon_system.py
-system_tests/test_synchrotron_system.py
-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/constants.py
@@ -316,7 +320,6 @@ tests/common/__init__.py
 tests/common/test_coordination.py
 tests/common/test_crystal_metadata.py
 tests/common/test_maths.py
-tests/common/test_signal_utils.py
 tests/common/test_udc_directory_provider.py
 tests/common/test_visit.py
 tests/common/beamlines/__init__.py
@@ -327,11 +330,11 @@ 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
-tests/devices/i10/test_diagnostic.py
 tests/devices/i10/test_i10Apple2.py
 tests/devices/i10/lookupTables/IDEnergy2GapCalibrations.csv
 tests/devices/i10/lookupTables/IDEnergy2PhaseCalibrations.csv
@@ -349,9 +352,10 @@ 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/conftest.py
 tests/devices/unit_tests/test_OAVCentring.json
 tests/devices/unit_tests/test_aperture.py
 tests/devices/unit_tests/test_aperture_scatterguard.py
@@ -374,6 +378,7 @@ tests/devices/unit_tests/test_lookup_table.txt
 tests/devices/unit_tests/test_lookup_table_2.txt
 tests/devices/unit_tests/test_motors.py
 tests/devices/unit_tests/test_odin.py
+tests/devices/unit_tests/test_positioner.py
 tests/devices/unit_tests/test_pressure_jump_cell.py
 tests/devices/unit_tests/test_qbpm.py
 tests/devices/unit_tests/test_slits.py
@@ -401,12 +406,19 @@ tests/devices/unit_tests/detector/test_det_resolution.py
 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_base_analayser_io.py
-tests/devices/unit_tests/electron_analyser/test_specs_analyser_io.py
-tests/devices/unit_tests/electron_analyser/test_specs_region.py
 tests/devices/unit_tests/electron_analyser/test_util.py
-tests/devices/unit_tests/electron_analyser/test_vgscienta_analyser_io.py
-tests/devices/unit_tests/electron_analyser/test_vgscienta_region.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
+tests/devices/unit_tests/electron_analyser/specs/__init__.py
+tests/devices/unit_tests/electron_analyser/specs/test_detector.py
+tests/devices/unit_tests/electron_analyser/specs/test_driver_io.py
+tests/devices/unit_tests/electron_analyser/specs/test_region.py
+tests/devices/unit_tests/electron_analyser/vgscienta/__init__.py
+tests/devices/unit_tests/electron_analyser/vgscienta/test_detector.py
+tests/devices/unit_tests/electron_analyser/vgscienta/test_driver_io.py
+tests/devices/unit_tests/electron_analyser/vgscienta/test_region.py
 tests/devices/unit_tests/i03/__init__.py
 tests/devices/unit_tests/i03/test_dcm.py
 tests/devices/unit_tests/i03/test_undulator_dcm.py
@@ -446,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.46.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.46.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.46.0'
-__version_tuple__ = version_tuple = (1, 46, 0)
+__version__ = version = '1.48.0'
+__version_tuple__ = version_tuple = (1, 48, 0)

{dls_dodal-1.46.0 → dls_dodal-1.48.0}/src/dodal/beamlines/__init__.py

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

{dls_dodal-1.46.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.46.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.46.0 → dls_dodal-1.48.0}/src/dodal/beamlines/b07.py

@@ -2,9 +2,7 @@ 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.electron_analyser.specs_analyser_io import (
-    SpecsAnalyserDriverIO,
-)
+from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -22,6 +20,4 @@ def synchrotron() -> Synchrotron:
 
 @device_factory()
 def analyser_driver() -> SpecsAnalyserDriverIO:
-    return SpecsAnalyserDriverIO(
-        name="analyser_driver", prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:"
-    )
+    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")

{dls_dodal-1.46.0 → dls_dodal-1.48.0}/src/dodal/beamlines/b07_1.py

@@ -2,9 +2,7 @@ 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.electron_analyser.specs_analyser_io import (
-    SpecsAnalyserDriverIO,
-)
+from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name