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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.43.0
+Version: 1.45.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.9.0a2
+Requires-Dist: ophyd-async>=0.10.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -264,6 +264,7 @@ Requires-Dist: types-requests; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
 Requires-Dist: types-PyYAML; extra == "dev"
 Requires-Dist: types-aiofiles; extra == "dev"
+Dynamic: license-file
 
 [![CI](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/DiamondLightSource/dodal/branch/main/graph/badge.svg)](https://codecov.io/gh/DiamondLightSource/dodal)

{dls_dodal-1.43.0 → dls_dodal-1.45.0}/docs/reference/device-standards.rst

@@ -13,8 +13,8 @@ Where to put devices
 Dodal is written with the philosophy that Ophyd devices should be assumed to be as generic as possible. I.e. you 
 should think about where to place them in the following order:
 
-#. A device that could be used at any facility, e.g. a generic ``EpicsMotor`` or a commercial product with a 
-   standard IOC, should go in https://github.com/bluesky/ophyd-epics-devices
+#. A device that could be used at any facility, e.g. a generic ``Motor`` or a commercial product with a 
+   standard IOC, should go in https://github.com/bluesky/ophyd-async
 #. A device that may be on any beamline should go in the top level of the ``devices`` folder. If it is a quite 
    complex device (e.g. multiple files) it should have a folder of its own e.g. ``oav``
 #. A device that is very specific to a particular beamline should go in the ``devices/ixx`` folder
@@ -150,7 +150,7 @@ 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_hardware_backed_soft_signal(InOut, self._get_in_out_from_hardware)
+                self.in_out = create_r_hardware_backed_soft_signal(InOut, self._get_in_out_from_hardware)
                 
         async def _get_in_out_from_hardware(self):
             current_position = await self.underlying_motor.get_value()

{dls_dodal-1.43.0 → dls_dodal-1.45.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.9.0a2",
+    "ophyd-async>=0.10.0a1",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -170,23 +170,27 @@ lint.extend-ignore = [
     "F811", # support typing.overload decorator
 ]
 lint.select = [
-    "B",   # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
-    "C4",  # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
-    "E",   # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
-    "F",   # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
-    "W",   # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
-    "I",   # isort - https://docs.astral.sh/ruff/rules/#isort-i
-    "UP",  # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
-    "SLF", # self - https://docs.astral.sh/ruff/settings/#lintflake8-self
-    "RUF018" # walrus operators in asserts - https://docs.astral.sh/ruff/rules/assignment-in-assert/
+    "B",      # flake8-bugbear - https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
+    "C4",     # flake8-comprehensions - https://docs.astral.sh/ruff/rules/#flake8-comprehensions-c4
+    "E",      # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e
+    "F",      # pyflakes rules - https://docs.astral.sh/ruff/rules/#pyflakes-f
+    "W",      # pycodestyle warnings - https://docs.astral.sh/ruff/rules/#warning-w
+    "I",      # isort - https://docs.astral.sh/ruff/rules/#isort-i
+    "UP",     # pyupgrade - https://docs.astral.sh/ruff/rules/#pyupgrade-up
+    "SLF",    # self - https://docs.astral.sh/ruff/settings/#lintflake8-self
+    "RUF018", # walrus operators in asserts - https://docs.astral.sh/ruff/rules/assignment-in-assert/
+    "TID251", # banned api - https://docs.astral.sh/ruff/rules/banned-api/
 ]
 
 [tool.ruff.lint.per-file-ignores]
 # By default, private member access is allowed in tests
 # See https://github.com/DiamondLightSource/python-copier-template/issues/154
-# Remove this line to forbid private member access and walrus operators in asserts in tests 
-"tests/**/*" = ["SLF001", "RUF018"]
-"system_tests/**/*" = ["SLF001", "RUF018"]
+# Remove this line to forbid private member access, walrus operators, banned api in asserts in tests 
+"tests/**/*" = ["SLF001", "RUF018", "TID251"]
+"system_tests/**/*" = ["SLF001", "RUF018", "TID251"]
+
+[tool.ruff.lint.flake8-tidy-imports.banned-api]
+"time.sleep".msg = "Use bps.sleep or asyncio.sleep instead. # noqa will disable this rule for that line. See https://github.com/DiamondLightSource/mx-bluesky/issues/925"
 
 [tool.importlinter]
 root_package = "dodal"

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.43.0
+Version: 1.45.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.9.0a2
+Requires-Dist: ophyd-async>=0.10.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -264,6 +264,7 @@ Requires-Dist: types-requests; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
 Requires-Dist: types-PyYAML; extra == "dev"
 Requires-Dist: types-aiofiles; extra == "dev"
+Dynamic: license-file
 
 [![CI](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml/badge.svg)](https://github.com/DiamondLightSource/dodal/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/DiamondLightSource/dodal/branch/main/graph/badge.svg)](https://codecov.io/gh/DiamondLightSource/dodal)

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

@@ -92,9 +92,13 @@ src/dodal/beamlines/__init__.py
 src/dodal/beamlines/adsim.py
 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/i02_1.py
 src/dodal/beamlines/i03.py
 src/dodal/beamlines/i04.py
+src/dodal/beamlines/i09.py
+src/dodal/beamlines/i09_1.py
 src/dodal/beamlines/i10.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i18.py
@@ -107,11 +111,13 @@ src/dodal/beamlines/i23.py
 src/dodal/beamlines/i24.py
 src/dodal/beamlines/p38.py
 src/dodal/beamlines/p45.py
+src/dodal/beamlines/p60.py
 src/dodal/beamlines/p99.py
 src/dodal/beamlines/training_rig.py
 src/dodal/common/__init__.py
 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
@@ -128,6 +134,7 @@ src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
 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/cryostream.py
 src/dodal/devices/dcm.py
@@ -181,9 +188,17 @@ src/dodal/devices/detector/det_dist_to_beam_converter.py
 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/i03/__init__.py
 src/dodal/devices/i03/beamstop.py
 src/dodal/devices/i04/transfocator.py
+src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
 src/dodal/devices/i10/i10_setting_data.py
 src/dodal/devices/i10/mirrors.py
@@ -194,12 +209,13 @@ src/dodal/devices/i10/rasor/rasor_scaler_cards.py
 src/dodal/devices/i13_1/__init__.py
 src/dodal/devices/i13_1/merlin.py
 src/dodal/devices/i13_1/merlin_controller.py
-src/dodal/devices/i13_1/merlin_io.py
 src/dodal/devices/i18/KBMirror.py
 src/dodal/devices/i18/diode.py
 src/dodal/devices/i18/table.py
 src/dodal/devices/i18/thor_labs_stage.py
 src/dodal/devices/i19/__init__.py
+src/dodal/devices/i19/beamstop.py
+src/dodal/devices/i19/blueapi_device.py
 src/dodal/devices/i19/hutch_access.py
 src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
@@ -218,7 +234,6 @@ src/dodal/devices/i24/pilatus_metadata.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/i24/vgonio.py
 src/dodal/devices/oav/__init__.py
-src/dodal/devices/oav/microns_for_zoom_levels.json
 src/dodal/devices/oav/oav_calculations.py
 src/dodal/devices/oav/oav_detector.py
 src/dodal/devices/oav/oav_parameters.py
@@ -228,7 +243,8 @@ src/dodal/devices/oav/pin_image_recognition/__init__.py
 src/dodal/devices/oav/pin_image_recognition/manual_test.py
 src/dodal/devices/oav/pin_image_recognition/utils.py
 src/dodal/devices/oav/snapshots/grid_overlay.py
-src/dodal/devices/oav/snapshots/snapshot_with_beam_centre.py
+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/sample_stage.py
@@ -238,7 +254,6 @@ src/dodal/devices/util/__init__.py
 src/dodal/devices/util/adjuster_plans.py
 src/dodal/devices/util/epics_util.py
 src/dodal/devices/util/lookup_tables.py
-src/dodal/devices/util/motor_utils.py
 src/dodal/devices/util/test_utils.py
 src/dodal/devices/xspress3/xspress3.py
 src/dodal/devices/xspress3/xspress3_channel.py
@@ -256,6 +271,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/save_panda.py
 src/dodal/plans/scanspec.py
@@ -298,6 +315,7 @@ 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
@@ -311,6 +329,7 @@ tests/devices/i03/__init__.py
 tests/devices/i03/test_beamstop.py
 tests/devices/i04/__init__.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
@@ -323,6 +342,7 @@ tests/devices/i18/test_kb_mirror.py
 tests/devices/i18/test_table.py
 tests/devices/i18/test_thor_labs_stage.py
 tests/devices/i19/__init__.py
+tests/devices/i19/test_beamstop.py
 tests/devices/i19/test_shutter.py
 tests/devices/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
@@ -337,6 +357,7 @@ tests/devices/unit_tests/test_apple2_undulator.py
 tests/devices/unit_tests/test_attenuator.py
 tests/devices/unit_tests/test_backlight.py
 tests/devices/unit_tests/test_bart_robot.py
+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
@@ -350,16 +371,17 @@ tests/devices/unit_tests/test_jCameraManZoomLevels.xml
 tests/devices/unit_tests/test_linkam3.py
 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_pressure_jump_cell.py
 tests/devices/unit_tests/test_qbpm.py
-tests/devices/unit_tests/test_shutter.py
 tests/devices/unit_tests/test_slits.py
 tests/devices/unit_tests/test_smargon.py
 tests/devices/unit_tests/test_status.py
 tests/devices/unit_tests/test_synchrotron.py
 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
@@ -369,6 +391,7 @@ tests/devices/unit_tests/test_xbpm_feedback.py
 tests/devices/unit_tests/test_xspress3.py
 tests/devices/unit_tests/test_zebra.py
 tests/devices/unit_tests/test_zebra_constants_mapping.py
+tests/devices/unit_tests/test_zebra_shutter.py
 tests/devices/unit_tests/test_zocalo_interaction.py
 tests/devices/unit_tests/test_zocalo_results.py
 tests/devices/unit_tests/current_amplifier/test_femto.py
@@ -376,6 +399,14 @@ tests/devices/unit_tests/current_amplifier/test_sr570.py
 tests/devices/unit_tests/detector/test_det_dim_constants.py
 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/i24/__init__.py
 tests/devices/unit_tests/i24/test_dual_backlight.py
 tests/devices/unit_tests/i24/test_focus_mirrors.py
@@ -389,6 +420,7 @@ tests/devices/unit_tests/oav/test_oav.py
 tests/devices/unit_tests/oav/test_oav_parameters.py
 tests/devices/unit_tests/oav/test_oav_to_redis_forwarder.py
 tests/devices/unit_tests/oav/test_oav_utils.py
+tests/devices/unit_tests/oav/test_snapshot_image_processing.py
 tests/devices/unit_tests/oav/test_snapshots.py
 tests/devices/unit_tests/oav/image_recognition/test_pin_tip_detect.py
 tests/devices/unit_tests/oav/image_recognition/test_pin_tip_detect_utils.py
@@ -425,6 +457,8 @@ tests/test_data/test_beamline_parameters.txt
 tests/test_data/test_det_dist_converter.txt
 tests/test_data/topup_long_delay.txt
 tests/test_data/topup_short_params.txt
+tests/test_data/electron_analyser/specs_sequence.seq
+tests/test_data/electron_analyser/vgscienta_sequence.seq
 tests/test_data/test_images/oav_snapshot_expected.png
 tests/test_data/test_images/oav_snapshot_test.png
 tests/unit_tests/__init__.py

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

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

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

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

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

@@ -9,6 +9,8 @@ from pathlib import Path
 # module name. Add any new beamlines whose name differs from their module name to this
 # dictionary, which maps ${BEAMLINE} to dodal.beamlines.<MODULE NAME>
 _BEAMLINE_NAME_OVERRIDES = {
+    "b07-1": "b07_1",
+    "i09-1": "i09_1",
     "i13-1": "i13_1",
     "i20-1": "i20_1",
     "i19-1": "i19_1",

{dls_dodal-1.43.0 → dls_dodal-1.45.0}/src/dodal/beamlines/b01_1.py

@@ -11,6 +11,7 @@ from dodal.common.beamlines.beamline_utils import (
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import CAM_SUFFIX, HDF5_SUFFIX
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.motors import XYZPositioner
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
@@ -60,3 +61,10 @@ def manta() -> AravisDetector:
         drv_suffix=CAM_SUFFIX,
         fileio_suffix=HDF5_SUFFIX,
     )
+
+
+@device_factory()
+def sample_stage() -> XYZPositioner:
+    return XYZPositioner(
+        f"{PREFIX.beamline_prefix}-MO-PPMAC-01:",
+    )

dls_dodal-1.45.0/src/dodal/beamlines/b07.py

@@ -0,0 +1,27 @@
+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.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("b07")
+PREFIX = BeamlinePrefix(BL, suffix="B")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(
+        name="analyser_driver", prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:"
+    )

dls_dodal-1.45.0/src/dodal/beamlines/b07_1.py

@@ -0,0 +1,25 @@
+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.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("b07-1")
+PREFIX = BeamlinePrefix(BL, suffix="C")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")

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

@@ -16,6 +16,7 @@ from dodal.devices.aperturescatterguard import (
 )
 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
@@ -436,3 +437,13 @@ def qbpm() -> QBPM:
         f"{PREFIX.beamline_prefix}-DI-QBPM-01:",
         "qbpm",
     )
+
+
+@device_factory(
+    skip=True
+)  # Skipping as not yet on the beamline, see https://jira.diamond.ac.uk/browse/I03-894
+def baton() -> Baton:
+    """Get the i03 baton 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 Baton(f"{PREFIX.beamline_prefix}:")

dls_dodal-1.45.0/src/dodal/beamlines/i09.py

@@ -0,0 +1,25 @@
+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.vgscienta_analyser_io import (
+    VGScientaAnalyserDriverIO,
+)
+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("i09")
+PREFIX = BeamlinePrefix(BL)
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> VGScientaAnalyserDriverIO:
+    return VGScientaAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:")

dls_dodal-1.45.0/src/dodal/beamlines/i09_1.py

@@ -0,0 +1,25 @@
+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.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("i09-1")
+PREFIX = BeamlinePrefix(BL, suffix="I")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    return Synchrotron()
+
+
+@device_factory()
+def analyser_driver() -> SpecsAnalyserDriverIO:
+    return SpecsAnalyserDriverIO(prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:")

{dls_dodal-1.43.0 → dls_dodal-1.45.0}/src/dodal/beamlines/i10.py

@@ -8,6 +8,7 @@ from dodal.devices.apple2_undulator import (
     UndulatorPhaseAxes,
 )
 from dodal.devices.current_amplifiers import CurrentAmpDet
+from dodal.devices.i10.diagnostics import I10Diagnostic, I10Diagnostic5ADet
 from dodal.devices.i10.i10_apple2 import (
     I10Apple2,
     I10Apple2PGM,
@@ -24,10 +25,9 @@ from dodal.devices.i10.rasor.rasor_motors import (
     PinHole,
 )
 from dodal.devices.i10.rasor.rasor_scaler_cards import RasorScalerCard1
-from dodal.devices.i10.slits import I10PrimarySlits, I10Slits
+from dodal.devices.i10.slits import I10Slits, I10SlitsDrainCurrent
 from dodal.devices.motors import XYZPositioner
 from dodal.devices.pgm import PGM
-from dodal.devices.slits import MinimalSlits
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -272,6 +272,9 @@ def idd_la_angle(
     )
 
 
+"""Mirrors"""
+
+
 @device_factory()
 def first_mirror() -> PiezoMirror:
     return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-COL-01:")
@@ -283,58 +286,39 @@ def switching_mirror() -> PiezoMirror:
 
 
 @device_factory()
-def slit_1() -> I10PrimarySlits:
-    return I10PrimarySlits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-01:",
-    )
+def focusing_mirror() -> PiezoMirror:
+    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCS-01:")
 
 
-@device_factory()
-def slit_2() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-02:",
-    )
+"""Optic slits"""
 
 
 @device_factory()
-def slit_3() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-03:",
-    )
-
-
-"""Rasor devices"""
+def slits() -> I10Slits:
+    return I10Slits(prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-")
 
 
 @device_factory()
-def focusing_mirror() -> PiezoMirror:
-    return PiezoMirror(prefix=f"{PREFIX.beamline_prefix}-OP-FOCS-01:")
+def slits_current() -> I10SlitsDrainCurrent:
+    return I10SlitsDrainCurrent(prefix=f"{PREFIX.beamline_prefix}-")
 
 
-@device_factory()
-def slit_4() -> MinimalSlits:
-    return MinimalSlits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-04:",
-        x_gap="XSIZE",
-        y_gap="YSIZE",
-    )
+"""Diagnostics"""
 
 
 @device_factory()
-def slit_5() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-05:",
+def diagnostics() -> I10Diagnostic:
+    return I10Diagnostic(
+        prefix=f"{PREFIX.beamline_prefix}-DI-",
     )
 
 
 @device_factory()
-def slit_6() -> I10Slits:
-    return I10Slits(
-        prefix=f"{PREFIX.beamline_prefix}-AL-SLITS-06:",
-    )
+def d5a_det() -> I10Diagnostic5ADet:
+    return I10Diagnostic5ADet(prefix=f"{PREFIX.beamline_prefix}-DI-")
 
 
-"Rasor devices"
+"""Rasor devices"""
 
 
 @device_factory()

dls_dodal-1.45.0/src/dodal/beamlines/i13_1.py

@@ -0,0 +1,59 @@
+from pathlib import Path
+
+from ophyd_async.epics.adaravis import AravisDetector
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    get_path_provider,
+    set_path_provider,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+from dodal.devices.i13_1.merlin import Merlin
+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("i13-1")
+PREFIX_BL13I = BeamlinePrefix(BL)  # Can't use this yet as returns BL13I
+PREFIX = "BL13J"
+set_log_beamline(BL)
+set_utils_beamline(BL)
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/i13-1/data/2024/cm37257-5/tmp/"),  # latest commissioning visit
+        client=LocalDirectoryServiceClient(),
+    )
+)
+
+
+@device_factory()
+def sample_xyz_stage() -> XYZPositioner:
+    return XYZPositioner(prefix=f"{PREFIX}-MO-PI-02:")
+
+
+@device_factory()
+def sample_xyz_lab_fa_stage() -> XYZPositioner:
+    return XYZPositioner(prefix=f"{PREFIX}-MO-PI-02:FIXANG:")
+
+
+@device_factory()
+def side_camera() -> AravisDetector:
+    return AravisDetector(
+        prefix=f"{PREFIX}-OP-FLOAT-03:",
+        drv_suffix="CAM:",
+        fileio_suffix="HDF5:",
+        path_provider=get_path_provider(),
+    )
+
+
+@device_factory()
+def merlin() -> Merlin:
+    return Merlin(
+        prefix=f"{PREFIX}-EA-DET-04:",
+        name="merlin",
+        drv_suffix="CAM:",
+        fileio_suffix="HDF5:",
+        path_provider=get_path_provider(),
+    )