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

{dls_dodal-1.47.0 → dls_dodal-1.49.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.49.0}/.gitignore

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.47.0
+Version: 1.49.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
@@ -234,6 +234,7 @@ Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: deepdiff
 Requires-Dist: scanspec>=0.7.3
+Requires-Dist: event-model>=1.23
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.47.0 → dls_dodal-1.49.0}/conftest.py

@@ -39,6 +39,7 @@ mock_attributes_table = {
     "s04": mock_paths,
     "i19_1": mock_paths,
     "i24": mock_paths,
+    "aithre": mock_paths,
 }
 
 BANNED_PATHS = [Path("/dls"), Path("/dls_sw")]

dls_dodal-1.49.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.49.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.49.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,15 +24,16 @@ 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",
     "redis",
     "deepdiff",
     "scanspec>=0.7.3",
+    "event-model>=1.23",  # Until bluesky pins it https://github.com/DiamondLightSource/dodal/issues/1278
 ]
 
 dynamic = ["version"]
@@ -103,12 +104,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 +118,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 +152,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.49.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.49.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
@@ -234,6 +234,7 @@ Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: deepdiff
 Requires-Dist: scanspec>=0.7.3
+Requires-Dist: event-model>=1.23
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

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

@@ -47,17 +47,20 @@ 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/explanations/umls/apple2_design.png
+docs/explanations/umls/i10_id_design.png
 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
@@ -95,6 +98,8 @@ src/dodal/beamlines/aithre.py
 src/dodal/beamlines/b01_1.py
 src/dodal/beamlines/b07.py
 src/dodal/beamlines/b07_1.py
+src/dodal/beamlines/b16.py
+src/dodal/beamlines/b18.py
 src/dodal/beamlines/i02_1.py
 src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
@@ -110,6 +115,7 @@ src/dodal/beamlines/i20_1.py
 src/dodal/beamlines/i22.py
 src/dodal/beamlines/i23.py
 src/dodal/beamlines/i24.py
+src/dodal/beamlines/k11.py
 src/dodal/beamlines/p38.py
 src/dodal/beamlines/p45.py
 src/dodal/beamlines/p60.py
@@ -170,11 +176,14 @@ 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
 src/dodal/devices/attenuator/filter.py
 src/dodal/devices/attenuator/filter_selections.py
+src/dodal/devices/b16/__init__.py
+src/dodal/devices/b16/detector.py
 src/dodal/devices/current_amplifiers/__init__.py
 src/dodal/devices/current_amplifiers/current_amplifier.py
 src/dodal/devices/current_amplifiers/current_amplifier_detector.py
@@ -188,6 +197,8 @@ 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/detector.py
+src/dodal/devices/electron_analyser/enums.py
 src/dodal/devices/electron_analyser/types.py
 src/dodal/devices/electron_analyser/util.py
 src/dodal/devices/electron_analyser/abstract/__init__.py
@@ -197,10 +208,12 @@ 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/enums.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/enums.py
 src/dodal/devices/electron_analyser/vgscienta/region.py
 src/dodal/devices/i03/__init__.py
 src/dodal/devices/i03/dcm.py
@@ -209,6 +222,7 @@ 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/__init__.py
 src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
 src/dodal/devices/i10/i10_setting_data.py
@@ -284,9 +298,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
@@ -312,6 +325,7 @@ tests/fake_device_factory_beamline.py
 tests/test_utils.py
 tests/beamlines/__init__.py
 tests/beamlines/unit_tests/__init__.py
+tests/beamlines/unit_tests/test_b16.py
 tests/beamlines/unit_tests/test_i03.py
 tests/beamlines/unit_tests/test_i24.py
 tests/beamlines/unit_tests/test_mapping.py
@@ -329,8 +343,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 +365,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 +420,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 +471,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.49.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
@@ -18,6 +18,7 @@ aiohttp
 redis
 deepdiff
 scanspec>=0.7.3
+event-model>=1.23
 
 [dev]
 black

{dls_dodal-1.47.0 → dls_dodal-1.49.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.49.0'
+__version_tuple__ = version_tuple = (1, 49, 0)

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

@@ -0,0 +1,30 @@
+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
+from dodal.devices.oav.oav_detector import NullZoomController, OAVBeamCentreFile
+from dodal.devices.oav.oav_parameters import OAVConfigBeamCentre
+
+ZOOM_PARAMS_FILE = "/dls_sw/i23/software/aithre/aithre_oav.xml"
+DISPLAY_CONFIG = "/dls_sw/i23/software/aithre/aithre_display.configuration"
+
+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:")
+
+
+@device_factory()
+def oav(params: OAVConfigBeamCentre | None = None) -> OAVBeamCentreFile:
+    return OAVBeamCentreFile(
+        prefix=f"{PREFIX}-DI-OAV-01:",
+        config=params or OAVConfigBeamCentre(ZOOM_PARAMS_FILE, DISPLAY_CONFIG),
+        name="oav",
+        zoom_controller=NullZoomController(),
+    )

{dls_dodal-1.47.0 → dls_dodal-1.49.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.49.0/src/dodal/beamlines/b16.py

@@ -0,0 +1,65 @@
+from pathlib import Path
+
+from ophyd_async.epics.adcore import (
+    AreaDetector,
+)
+from ophyd_async.epics.motor import Motor
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.b16.detector import (
+    software_triggered_tiff_area_detector,
+)
+from dodal.devices.motors import XYZPositioner
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("b16")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/b16/data/2025/cm40635-3/bluesky"),
+        client=RemoteDirectoryServiceClient("http://b16-control:8088/api"),
+    )
+)
+
+
+@device_factory()
+def attol1() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-EA-ECC-03:ACT0")
+
+
+@device_factory()
+def attol2() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-EA-ECC-03:ACT1")
+
+
+@device_factory()
+def attol3() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-EA-ECC-03:ACT2")
+
+
+@device_factory()
+def attorot1() -> Motor:
+    return Motor(f"{PREFIX.beamline_prefix}-EA-ECC-02:ACT2")
+
+
+@device_factory()
+def fds2() -> AreaDetector:
+    prefix = f"{PREFIX.beamline_prefix}-EA-FDS-02:"
+    return software_triggered_tiff_area_detector(prefix)
+
+
+@device_factory()
+def sim_stage() -> XYZPositioner:
+    return XYZPositioner(
+        f"{PREFIX.beamline_prefix}-MO-SIM-01:", "sim_stage", infix=("M1", "M2", "M3")
+    )

dls_dodal-1.49.0/src/dodal/beamlines/b18.py

@@ -0,0 +1,38 @@
+from pathlib import Path
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+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 BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("b18")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+# Currently we must hard-code the visit, determining the visit at runtime requires
+# infrastructure that is still WIP.
+# Communication with GDA is also WIP so for now we determine an arbitrary scan number
+# locally and write the commissioning directory. The scan number is not guaranteed to
+# be unique and the data is at risk - this configuration is for testing only.
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/b18/data/2025/cm40637-3/bluesky"),
+        client=LocalDirectoryServiceClient(),
+    )
+)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()

{dls_dodal-1.47.0 → dls_dodal-1.49.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.49.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,
     )