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

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

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

{dls_dodal-1.45.0 → dls_dodal-1.47.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.45.0/docs/explanations/decisions/0003-make-devices-factory.md → dls_dodal-1.47.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.47.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.45.0 → dls_dodal-1.47.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.45.0 → dls_dodal-1.47.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.0a1",
+    "ophyd-async>=0.10.0a3",
     "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,9 +103,9 @@ 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\"')",
     "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
@@ -154,12 +154,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 (adsim)' --cov=dodal --cov-report term --cov-report xml:cov.xml {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 -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}
 """
 
 [tool.ruff]

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

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

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

@@ -46,7 +46,7 @@ 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/COPYME
 docs/how-to/build-docs.md
 docs/how-to/contribute.md
@@ -54,6 +54,7 @@ docs/how-to/coverage.md
 docs/how-to/create-beamline.rst
 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
@@ -119,7 +120,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
@@ -136,8 +136,8 @@ src/dodal/devices/apple2_undulator.py
 src/dodal/devices/backlight.py
 src/dodal/devices/baton.py
 src/dodal/devices/bimorph_mirror.py
+src/dodal/devices/common_dcm.py
 src/dodal/devices/cryostream.py
-src/dodal/devices/dcm.py
 src/dodal/devices/diamond_filter.py
 src/dodal/devices/eiger.py
 src/dodal/devices/eiger_odin.py
@@ -148,10 +148,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
@@ -166,7 +166,6 @@ src/dodal/devices/tetramm.py
 src/dodal/devices/thawer.py
 src/dodal/devices/turbo_slit.py
 src/dodal/devices/undulator.py
-src/dodal/devices/undulator_dcm.py
 src/dodal/devices/watsonmarlow323_pump.py
 src/dodal/devices/webcam.py
 src/dodal/devices/xbpm_feedback.py
@@ -189,14 +188,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
@@ -233,6 +244,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
@@ -247,6 +259,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,7 +285,7 @@ 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/plan_stubs/electron_analyser/configure_driver.py
 src/dodal/plans/__init__.py
 src/dodal/plans/save_panda.py
 src/dodal/plans/scanspec.py
@@ -282,18 +295,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
@@ -315,7 +319,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
@@ -324,12 +327,13 @@ tests/common/beamlines/test_beamline_utils.py
 tests/common/beamlines/test_device_helpers.py
 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/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,7 +353,6 @@ tests/devices/i22/test_fswitch.py
 tests/devices/i22/test_metadataholder.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
@@ -361,7 +364,6 @@ tests/devices/unit_tests/test_baton.py
 tests/devices/unit_tests/test_beam_converter.py
 tests/devices/unit_tests/test_beamline_undulator_to_gap_lookup_table.txt
 tests/devices/unit_tests/test_bimorph_mirror.py
-tests/devices/unit_tests/test_dcm.py
 tests/devices/unit_tests/test_display.configuration
 tests/devices/unit_tests/test_eiger.py
 tests/devices/unit_tests/test_focusing_mirror.py
@@ -373,6 +375,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
@@ -383,7 +386,6 @@ tests/devices/unit_tests/test_tetramm.py
 tests/devices/unit_tests/test_thawer.py
 tests/devices/unit_tests/test_turbo_slit.py
 tests/devices/unit_tests/test_undulator.py
-tests/devices/unit_tests/test_undulator_dcm.py
 tests/devices/unit_tests/test_utils.py
 tests/devices/unit_tests/test_watsonmarlow323_pump.py
 tests/devices/unit_tests/test_webcam.py
@@ -401,12 +403,21 @@ 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/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
 tests/devices/unit_tests/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
 tests/devices/unit_tests/i24/test_focus_mirrors.py

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

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

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

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

{dls_dodal-1.45.0 → dls_dodal-1.47.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.45.0 → dls_dodal-1.47.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.45.0 → dls_dodal-1.47.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

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

@@ -18,14 +18,15 @@ from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.baton import Baton
 from dodal.devices.cryostream import CryoStream
-from dodal.devices.dcm import DCM
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.diamond_filter import DiamondFilter, I03Filters
 from dodal.devices.eiger import EigerDetector
 from dodal.devices.fast_grid_scan import PandAFastGridScan, ZebraFastGridScan
 from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
-from dodal.devices.i03.beamstop import Beamstop
+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
@@ -37,7 +38,6 @@ from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
 from dodal.devices.undulator import Undulator
-from dodal.devices.undulator_dcm import UndulatorDCM
 from dodal.devices.webcam import Webcam
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.xspress3.xspress3 import Xspress3
@@ -58,7 +58,7 @@ ZOOM_PARAMS_FILE = (
 DISPLAY_CONFIG = "/dls_sw/i03/software/gda_versions/var/display.configuration"
 DAQ_CONFIGURATION_PATH = "/dls_sw/i03/software/daq_configuration"
 
-BL = get_beamline_name("s03")
+BL = get_beamline_name("i03")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
@@ -67,7 +67,6 @@ set_path_provider(PandASubpathProvider())
 I03_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(TTL_DETECTOR=1, TTL_SHUTTER=2, TTL_XSPRESS3=3, TTL_PANDA=4),
     sources=ZebraSources(),
-    AND_GATE_FOR_AUTO_SHUTTER=2,
 )
 
 PREFIX = BeamlinePrefix(BL)
@@ -113,12 +112,12 @@ def dcm() -> DCM:
     If this is called when already instantiated in i03, it will return the existing object.
     """
     return DCM(
-        f"{PREFIX.beamline_prefix}-MO-DCM-01:",
-        "dcm",
+        prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:",
+        name="dcm",
     )
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def vfm() -> FocusingMirrorWithStripes:
     return FocusingMirrorWithStripes(
         prefix=f"{PREFIX.beamline_prefix}-OP-VFM-01:",
@@ -130,7 +129,7 @@ def vfm() -> FocusingMirrorWithStripes:
     )
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def mirror_voltages() -> MirrorVoltages:
     return MirrorVoltages(
         name="mirror_voltages",
@@ -147,7 +146,7 @@ def backlight() -> Backlight:
     return Backlight(prefix=PREFIX.beamline_prefix, name="backlight")
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def detector_motion() -> DetectorMotion:
     """Get the i03 detector motion device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
@@ -158,7 +157,7 @@ def detector_motion() -> DetectorMotion:
     )
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def eiger(mock: bool = False) -> EigerDetector:
     """Get the i03 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.
@@ -196,7 +195,7 @@ def panda_fast_grid_scan() -> PandAFastGridScan:
     )
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def oav(
     params: OAVConfig | None = None,
 ) -> OAV:
@@ -210,7 +209,7 @@ def oav(
     )
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def pin_tip_detection() -> PinTipDetection:
     """Get the i03 pin tip detection device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
@@ -240,7 +239,7 @@ def s4_slit_gaps() -> S4SlitGaps:
     )
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def synchrotron() -> Synchrotron:
     """Get the i03 synchrotron device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
@@ -316,7 +315,7 @@ def panda() -> HDFPanda:
     )
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def sample_shutter() -> ZebraShutter:
     """Get the i03 sample shutter device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
@@ -327,7 +326,7 @@ def sample_shutter() -> ZebraShutter:
     )
 
 
-@device_factory(skip=BL == "s03")
+@device_factory()
 def flux() -> Flux:
     """Get the i03 flux device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
@@ -422,9 +421,7 @@ def diamond_filter() -> DiamondFilter[I03Filters]:
     If this is called when already instantiated in i03, it will return the existing object.
     """
     return DiamondFilter[I03Filters](
-        prefix=f"{PREFIX.beamline_prefix}-MO-FLTR-01:",
-        name="diamond_filter",
-        data_type=I03Filters,
+        f"{PREFIX.beamline_prefix}-MO-FLTR-01:Y", I03Filters
     )