dls-dodal 1.58.0__tar.gz → 1.60.0__tar.gz

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.58.0
+Version: 1.60.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async[ca,pva]>=0.13.2
-Requires-Dist: bluesky==1.14.2
+Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
@@ -230,9 +230,9 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
-Requires-Dist: event-model>=1.23
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
+Requires-Dist: daq-config-server>=v1.0.0-rc.2
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/docs/how-to/write-tests.md

@@ -120,3 +120,33 @@ async def test_my_device_read(sim_my_device: MyDevice, RE: RunEngine) -> None:
         }
     )
 ```
+
+## Test performance and reliability
+
+Dodal has well over 1000 unit tests and developers will run the full unit test suite frequently on their local 
+machines, therefore it is imperative that the unit tests are both reliable and run quickly. Ideally the test suite 
+should run in about a minute, so if your test takes more than a fraction of a second to complete then consider 
+making it faster. The GitHub CI will fail if any test takes longer than 1 second.
+
+Tests that involve concurrency can sometimes be unreliable due to subtle race conditions and variations in timing 
+caused by caching, garbage collection and other factors. 
+Often these manifest only on certain machines or in CI and are difficult to reproduce. Whilst the odd test failure 
+can be worked around by re-running the tests, this is annoying and a build up of such flaky tests is undesirable so 
+it is preferable to fix the test.  
+
+### Event loop fuzzer
+
+To assist in the reproduction of concurrency-related test failures, there is an event loop fuzzer available as a 
+pytest fixture. The fuzzer introduces random delays into the ``asyncio`` event loop. You can use it as by 
+requesting ``event_loop_fuzzing`` as a fixture. It is also recommended when debugging to parametrize the test to 
+introduce a good number of iterations in order to ensure the problem has a good chance to show up, but remember to 
+remove the parametrization afterwards.
+
+```Python
+    import pytest
+    # repeat the test a number of times
+    @pytest.mark.parametrize("i", range(0, 100))
+    async def my_unreliable_test(i, event_loop_fuzzing):
+        # Do some stuff in here
+
+```

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/docs/reference/device-standards.md

@@ -26,8 +26,8 @@ Determining where in dodal a device should live can be summarised below:
 
 ## Device Best Practices
 
-Ophyd-async directory contains a [flowchart](https://blueskyproject.io/ophyd-async/main/how-to/choose-interfaces-for-devices.html) for a simplified decision tree about what interfaces
-should a given device implement. In addition to this the following guidelines are strongly recommended:
+In general, you should follow the ophyd-async [guide](https://blueskyproject.io/ophyd-async/main/how-to/choose-right-baseclass.html) for what interfaces a device should implement.
+In addition to this the following guidelines are strongly recommended:
 
 * Device should have their name as an optional str parameter with a default of ""- this allows ophyd-async to automatically name the device
 * Devices should contain only the PV suffixes that are generic for any instance of the device. See [PV Suffixes](#pv-suffixes)

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/pyproject.toml

@@ -15,7 +15,7 @@ dependencies = [
     "click",
     "ophyd",
     "ophyd-async[ca,pva]>=0.13.2",
-    "bluesky==1.14.2",  # https://github.com/bluesky/bluesky/issues/1938
+    "bluesky>=1.14.5",
     "pyepics",
     "dataclasses-json",
     "pillow",
@@ -29,9 +29,9 @@ dependencies = [
     "aiohttp",
     "redis",
     "scanspec>=0.7.3",
-    "event-model>=1.23",             # Until bluesky pins it https://github.com/DiamondLightSource/dodal/issues/1278
     "pyzmq==26.3.0",                 # Until we can move to RHEL 8 https://github.com/DiamondLightSource/mx-bluesky/issues/1139
     "deepdiff",
+    "daq-config-server>=v1.0.0-rc.2",# For getting Configuration settings.
 ]
 
 dynamic = ["version"]

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.58.0
+Version: 1.60.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: ophyd
 Requires-Dist: ophyd-async[ca,pva]>=0.13.2
-Requires-Dist: bluesky==1.14.2
+Requires-Dist: bluesky>=1.14.5
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
 Requires-Dist: pillow
@@ -230,9 +230,9 @@ Requires-Dist: aiofiles
 Requires-Dist: aiohttp
 Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
-Requires-Dist: event-model>=1.23
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
+Requires-Dist: daq-config-server>=v1.0.0-rc.2
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -111,18 +111,23 @@ src/dodal/beamlines/i05_1.py
 src/dodal/beamlines/i09.py
 src/dodal/beamlines/i09_1.py
 src/dodal/beamlines/i09_2.py
+src/dodal/beamlines/i10-1.py
 src/dodal/beamlines/i10.py
 src/dodal/beamlines/i11.py
 src/dodal/beamlines/i13_1.py
+src/dodal/beamlines/i15.py
+src/dodal/beamlines/i15_1.py
 src/dodal/beamlines/i17.py
 src/dodal/beamlines/i18.py
 src/dodal/beamlines/i19_1.py
 src/dodal/beamlines/i19_2.py
 src/dodal/beamlines/i19_optics.py
 src/dodal/beamlines/i20_1.py
+src/dodal/beamlines/i21.py
 src/dodal/beamlines/i22.py
 src/dodal/beamlines/i23.py
 src/dodal/beamlines/i24.py
+src/dodal/beamlines/k07.py
 src/dodal/beamlines/k11.py
 src/dodal/beamlines/p38.py
 src/dodal/beamlines/p45.py
@@ -184,6 +189,7 @@ src/dodal/devices/tetramm.py
 src/dodal/devices/thawer.py
 src/dodal/devices/turbo_slit.py
 src/dodal/devices/undulator.py
+src/dodal/devices/v2f.py
 src/dodal/devices/watsonmarlow323_pump.py
 src/dodal/devices/webcam.py
 src/dodal/devices/xbpm_feedback.py
@@ -216,6 +222,7 @@ 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/energy_sources.py
 src/dodal/devices/electron_analyser/enums.py
 src/dodal/devices/electron_analyser/types.py
 src/dodal/devices/electron_analyser/util.py
@@ -234,6 +241,9 @@ 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/i02_1/__init__.py
+src/dodal/devices/i02_1/fast_grid_scan.py
+src/dodal/devices/i02_1/sample_motors.py
 src/dodal/devices/i03/__init__.py
 src/dodal/devices/i03/dcm.py
 src/dodal/devices/i03/undulator_dcm.py
@@ -265,6 +275,13 @@ src/dodal/devices/i11/spinner.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/i15/dcm.py
+src/dodal/devices/i15/focussing_mirror.py
+src/dodal/devices/i15/jack.py
+src/dodal/devices/i15/laue.py
+src/dodal/devices/i15/motors.py
+src/dodal/devices/i15/multilayer_mirror.py
+src/dodal/devices/i15/rail.py
 src/dodal/devices/i18/KBMirror.py
 src/dodal/devices/i18/diode.py
 src/dodal/devices/i19/__init__.py
@@ -275,6 +292,8 @@ src/dodal/devices/i19/diffractometer.py
 src/dodal/devices/i19/hutch_access.py
 src/dodal/devices/i19/shutter.py
 src/dodal/devices/i20_1/__init__.py
+src/dodal/devices/i21/__init__.py
+src/dodal/devices/i21/enums.py
 src/dodal/devices/i22/dcm.py
 src/dodal/devices/i22/fswitch.py
 src/dodal/devices/i22/nxsas.py
@@ -282,6 +301,7 @@ src/dodal/devices/i24/__init__.py
 src/dodal/devices/i24/aperture.py
 src/dodal/devices/i24/beam_center.py
 src/dodal/devices/i24/beamstop.py
+src/dodal/devices/i24/commissioning_jungfrau.py
 src/dodal/devices/i24/dcm.py
 src/dodal/devices/i24/dual_backlight.py
 src/dodal/devices/i24/focus_mirrors.py
@@ -307,6 +327,10 @@ src/dodal/devices/p60/lab_xray_source.py
 src/dodal/devices/p99/__init__.py
 src/dodal/devices/p99/andor2_point.py
 src/dodal/devices/p99/sample_stage.py
+src/dodal/devices/temperture_controller/__init__.py
+src/dodal/devices/temperture_controller/lakeshore/__init__.py
+src/dodal/devices/temperture_controller/lakeshore/lakeshore.py
+src/dodal/devices/temperture_controller/lakeshore/lakeshore_io.py
 src/dodal/devices/util/__init__.py
 src/dodal/devices/util/adjuster_plans.py
 src/dodal/devices/util/epics_util.py
@@ -429,6 +453,7 @@ tests/devices/detector/test_data/test_det_dist_converter.txt
 tests/devices/electron_analyser/__init__.py
 tests/devices/electron_analyser/conftest.py
 tests/devices/electron_analyser/test_detector.py
+tests/devices/electron_analyser/test_energy_sources.py
 tests/devices/electron_analyser/test_util.py
 tests/devices/electron_analyser/abstract/__init__.py
 tests/devices/electron_analyser/abstract/test_base_detector.py
@@ -448,6 +473,8 @@ tests/devices/electron_analyser/vgscienta/__init__.py
 tests/devices/electron_analyser/vgscienta/test_detector.py
 tests/devices/electron_analyser/vgscienta/test_driver_io.py
 tests/devices/electron_analyser/vgscienta/test_region.py
+tests/devices/i02_1/__init__.py
+tests/devices/i02_1/test_fast_grid_scan.py
 tests/devices/i03/__init__.py
 tests/devices/i03/test_dcm.py
 tests/devices/i03/test_undulator_dcm.py
@@ -467,6 +494,7 @@ tests/devices/i10/test_data/expectedIDEnergy2PhaseCalibrationsidu.pkl
 tests/devices/i11/test_i11devices.py
 tests/devices/i11/test_mythen.py
 tests/devices/i13_1/test_merlin.py
+tests/devices/i15/test_dcm.py
 tests/devices/i18/test_kb_mirror.py
 tests/devices/i19/__init__.py
 tests/devices/i19/test_backlight.py
@@ -477,6 +505,7 @@ tests/devices/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
 tests/devices/i22/test_metadataholder.py
 tests/devices/i24/__init__.py
+tests/devices/i24/test_commissioning_jungfrau.py
 tests/devices/i24/test_dual_backlight.py
 tests/devices/i24/test_focus_mirrors.py
 tests/devices/i24/test_pmac.py
@@ -500,6 +529,10 @@ tests/devices/oav/test_data/oav_snapshot_test.png
 tests/devices/oav/test_data/test_OAVCentring.json
 tests/devices/p60/test_lab_xray_source.py
 tests/devices/p99/test_p99_stage.py
+tests/devices/temperature_controller/__init__.py
+tests/devices/temperature_controller/lakeshore/__init__.py
+tests/devices/temperature_controller/lakeshore/test_lakeshore.py
+tests/devices/temperature_controller/lakeshore/test_lakeshore_io.py
 tests/devices/test_daq_configuration/__init__.py
 tests/devices/test_daq_configuration/domain/__init__.py
 tests/devices/test_daq_configuration/domain/beamlineParameters

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,7 +1,7 @@
 click
 ophyd
 ophyd-async[ca,pva]>=0.13.2
-bluesky==1.14.2
+bluesky>=1.14.5
 pyepics
 dataclasses-json
 pillow
@@ -15,9 +15,9 @@ aiofiles
 aiohttp
 redis
 scanspec>=0.7.3
-event-model>=1.23
 pyzmq==26.3.0
 deepdiff
+daq-config-server>=v1.0.0-rc.2
 
 [dev]
 black

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.58.0'
-__version_tuple__ = version_tuple = (1, 58, 0)
+__version__ = version = '1.60.0'
+__version_tuple__ = version_tuple = (1, 60, 0)
 
-__commit_id__ = commit_id = 'g52d34a5bc'
+__commit_id__ = commit_id = 'gb3036ebaf'

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/beamlines/__init__.py

@@ -13,6 +13,7 @@ _BEAMLINE_NAME_OVERRIDES = {
     "b07-1": "b07_1",
     "i09-1": "i09_1",
     "i13-1": "i13_1",
+    "i15-1": "i15_1",
     "i20-1": "i20_1",
     "i19-1": "i19_1",
     "i19-2": "i19_2",

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/beamlines/b07.py

@@ -3,8 +3,8 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.b07 import Grating, LensMode, PsuMode
-from dodal.devices.electron_analyser import SelectedSource
-from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
+from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -26,13 +26,18 @@ def pgm() -> PGM:
     return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
 
 
+@device_factory()
+def energy_source() -> EnergySource:
+    return EnergySource(pgm().energy.user_readback)
+
+
 # Connect will work again after this work completed
 # https://jira.diamond.ac.uk/browse/B07-1104
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
-    return SpecsAnalyserDriverIO[LensMode, PsuMode](
+def analyser() -> SpecsDetector[LensMode, PsuMode]:
+    return SpecsDetector[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
         psu_mode_type=PsuMode,
-        energy_sources={SelectedSource.SOURCE1: pgm().energy.user_readback},
+        energy_source=energy_source(),
     )

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/beamlines/b07_1.py

@@ -6,8 +6,8 @@ from dodal.devices.b07_1 import (
     Grating,
     LensMode,
 )
-from dodal.devices.electron_analyser import SelectedSource
-from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
+from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
@@ -37,10 +37,15 @@ def ccmc() -> ChannelCutMonochromator:
 
 
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
-    return SpecsAnalyserDriverIO[LensMode, PsuMode](
+def energy_source() -> EnergySource:
+    return EnergySource(pgm().energy.user_readback)
+
+
+@device_factory()
+def analyser() -> SpecsDetector[LensMode, PsuMode]:
+    return SpecsDetector[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
         psu_mode_type=PsuMode,
-        energy_sources={SelectedSource.SOURCE1: pgm().energy.user_readback},
+        energy_source=energy_source(),
     )

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/beamlines/b21.py

@@ -8,10 +8,13 @@ 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.devices.focusing_mirror import SimpleMirror
 from dodal.devices.i22.nxsas import NXSasMetadataHolder, NXSasOAV
 from dodal.devices.linkam3 import Linkam3
+from dodal.devices.motors import XYStage
 from dodal.devices.slits import Slits
 from dodal.devices.synchrotron import Synchrotron
+from dodal.devices.v2f import QDV2F
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -43,6 +46,18 @@ def waxs() -> EigerDetector:
     )
 
 
+@device_factory()
+def mirror() -> SimpleMirror:
+    return SimpleMirror(
+        prefix=f"{PREFIX.beamline_prefix}-OP-MR-01:",
+    )
+
+
+@device_factory()
+def it() -> QDV2F:
+    return QDV2F(prefix=f"{PREFIX.beamline_prefix}-DI-PHDGN-07:PHD1:", I_suffix="I")
+
+
 @device_factory()
 def panda1() -> HDFPanda:
     return HDFPanda(
@@ -51,6 +66,13 @@ def panda1() -> HDFPanda:
     )
 
 
+@device_factory()
+def table() -> XYStage:
+    return XYStage(
+        prefix=f"{PREFIX.beamline_prefix}-MO-TABLE-04:",
+    )
+
+
 @device_factory()
 def synchrotron() -> Synchrotron:
     return Synchrotron()

dls_dodal-1.60.0/src/dodal/beamlines/i02_1.py

@@ -0,0 +1,117 @@
+"""Beamline i02-1 is also known as VMXm, or I02J"""
+
+from dodal.common.beamlines.beamline_utils import (
+    device_factory,
+    device_instantiation,
+)
+from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
+from dodal.devices.attenuator.attenuator import EnumFilterAttenuator
+from dodal.devices.attenuator.filter_selections import (
+    I02_1FilterFourSelections,
+    I02_1FilterOneSelections,
+    I02_1FilterThreeSelections,
+    I02_1FilterTwoSelections,
+)
+from dodal.devices.eiger import EigerDetector
+from dodal.devices.i02_1.fast_grid_scan import ZebraFastGridScanTwoD
+from dodal.devices.i02_1.sample_motors import SampleMotors
+from dodal.devices.synchrotron import Synchrotron
+from dodal.devices.zebra.zebra import Zebra
+from dodal.devices.zebra.zebra_constants_mapping import (
+    ZebraMapping,
+    ZebraSources,
+    ZebraTTLOutputs,
+)
+from dodal.devices.zocalo import ZocaloResults
+from dodal.log import set_beamline as set_log_beamline
+from dodal.utils import BeamlinePrefix, get_beamline_name
+
+BL = get_beamline_name("i02-1")
+PREFIX = BeamlinePrefix(BL, suffix="J")
+set_log_beamline(BL)
+set_utils_beamline(BL)
+DAQ_CONFIGURATION_PATH = "/dls_sw/i02-1/software/daq_configuration"
+
+I02_1_ZEBRA_MAPPING = ZebraMapping(
+    outputs=ZebraTTLOutputs(TTL_EIGER=2, TTL_XSPRESS3=3, TTL_FAST_SHUTTER=1),
+    sources=ZebraSources(),
+)
+
+
+@device_factory()
+def eiger(mock: bool = False) -> EigerDetector:
+    """Get the i02-1 Eiger device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-1, it will return the existing object.
+    """
+    return device_instantiation(
+        device_factory=EigerDetector,
+        prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:",
+        bl_prefix=False,
+        wait=False,
+        fake=mock,
+        name="eiger",
+    )
+
+
+@device_factory()
+def zebra_fast_grid_scan() -> ZebraFastGridScanTwoD:
+    """Get the i02-1 zebra_fast_grid_scan device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-1, it will return the existing object.
+    """
+    return ZebraFastGridScanTwoD(
+        prefix=f"{PREFIX.beamline_prefix}-MO-SAMP-11:",
+        motion_controller_prefix="BL02J-MO-STEP-11:",
+    )
+
+
+@device_factory()
+def synchrotron() -> Synchrotron:
+    """Get the i02-1 synchrotron device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-1, it will return the existing object.
+    """
+    return Synchrotron()
+
+
+@device_factory()
+def zebra() -> Zebra:
+    """Get the i02-1 zebra device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-1, it will return the existing object.
+    """
+    return Zebra(
+        prefix=f"{PREFIX.beamline_prefix}-EA-ZEBRA-01:",
+        mapping=I02_1_ZEBRA_MAPPING,
+    )
+
+
+# Device not needed after https://github.com/DiamondLightSource/mx-bluesky/issues/1299
+@device_factory()
+def zocalo() -> ZocaloResults:
+    """Get the i02-1 ZocaloResults device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-1, it will return the existing object.
+    """
+    return ZocaloResults()
+
+
+@device_factory()
+def goniometer() -> SampleMotors:
+    """Get the i02-1 goniometer device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-1, it will return the existing object.
+    """
+    return SampleMotors(f"{PREFIX.beamline_prefix}-MO-SAMP-01:")
+
+
+@device_factory()
+def attenuator() -> EnumFilterAttenuator:
+    """Get the i02-1 attenuator device, instantiate it if it hasn't already been.
+    If this is called when already instantiated in i02-1, it will return the existing object.
+    """
+
+    return EnumFilterAttenuator(
+        f"{PREFIX.beamline_prefix}-OP-ATTN-01:",
+        (
+            I02_1FilterOneSelections,
+            I02_1FilterTwoSelections,
+            I02_1FilterThreeSelections,
+            I02_1FilterFourSelections,
+        ),
+    )

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/beamlines/i03.py

@@ -25,7 +25,7 @@ from dodal.devices.cryostream import CryoStream
 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.fast_grid_scan import PandAFastGridScan, ZebraFastGridScanThreeD
 from dodal.devices.fluorescence_detector_motion import FluorescenceDetector
 from dodal.devices.flux import Flux
 from dodal.devices.focusing_mirror import FocusingMirrorWithStripes, MirrorVoltages
@@ -191,11 +191,13 @@ def fastcs_eiger() -> FastEiger:
 
 
 @device_factory()
-def zebra_fast_grid_scan() -> ZebraFastGridScan:
+def zebra_fast_grid_scan() -> ZebraFastGridScanThreeD:
     """Get the i03 zebra_fast_grid_scan 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 ZebraFastGridScan(prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:")
+    return ZebraFastGridScanThreeD(
+        prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:",
+    )
 
 
 @device_factory()

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/beamlines/i04.py

@@ -17,7 +17,7 @@ from dodal.devices.detector import DetectorParams
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.diamond_filter import DiamondFilter, I04Filters
 from dodal.devices.eiger import EigerDetector
-from dodal.devices.fast_grid_scan import ZebraFastGridScan
+from dodal.devices.fast_grid_scan import ZebraFastGridScanThreeD
 from dodal.devices.flux import Flux
 from dodal.devices.i03.dcm import DCM
 from dodal.devices.i04.constants import RedisConstants
@@ -210,11 +210,13 @@ def eiger(mock: bool = False, params: DetectorParams | None = None) -> EigerDete
 
 
 @device_factory()
-def zebra_fast_grid_scan() -> ZebraFastGridScan:
+def zebra_fast_grid_scan() -> ZebraFastGridScanThreeD:
     """Get the i04 zebra_fast_grid_scan 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 ZebraFastGridScan(f"{PREFIX.beamline_prefix}-MO-SGON-01:")
+    return ZebraFastGridScanThreeD(
+        prefix=f"{PREFIX.beamline_prefix}-MO-SGON-01:",
+    )
 
 
 @device_factory()

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/beamlines/i09.py

@@ -2,8 +2,8 @@ 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 import SelectedSource
-from dodal.devices.electron_analyser.vgscienta import VGScientaAnalyserDriverIO
+from dodal.devices.electron_analyser import DualEnergySource
+from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
 from dodal.devices.i09 import DCM, Grating, LensMode, PassEnergy, PsuMode
 from dodal.devices.pgm import PGM
 from dodal.devices.synchrotron import Synchrotron
@@ -34,18 +34,19 @@ def dcm() -> DCM:
     return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
+@device_factory()
+def energy_source() -> DualEnergySource:
+    return DualEnergySource(dcm().energy_in_ev, pgm().energy.user_readback)
+
+
 # Connect will work again after this work completed
 # https://jira.diamond.ac.uk/browse/I09-651
 @device_factory()
-def analyser_driver() -> VGScientaAnalyserDriverIO[LensMode, PsuMode, PassEnergy]:
-    energy_sources = {
-        SelectedSource.SOURCE1: pgm().energy.user_readback,
-        SelectedSource.SOURCE2: dcm().energy_in_ev,
-    }
-    return VGScientaAnalyserDriverIO[LensMode, PsuMode, PassEnergy](
+def ew4000() -> VGScientaDetector[LensMode, PsuMode, PassEnergy]:
+    return VGScientaDetector[LensMode, PsuMode, PassEnergy](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-01:CAM:",
         lens_mode_type=LensMode,
         psu_mode_type=PsuMode,
         pass_energy_type=PassEnergy,
-        energy_sources=energy_sources,
+        energy_source=energy_source(),
     )

{dls_dodal-1.58.0 → dls_dodal-1.60.0}/src/dodal/beamlines/i09_1.py

@@ -2,8 +2,8 @@ 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 import SelectedSource
-from dodal.devices.electron_analyser.specs import SpecsAnalyserDriverIO
+from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.i09.dcm import DCM
 from dodal.devices.i09_1 import LensMode, PsuMode
 from dodal.devices.synchrotron import Synchrotron
@@ -26,13 +26,18 @@ def dcm() -> DCM:
     return DCM(prefix=f"{PREFIX.beamline_prefix}-MO-DCM-01:")
 
 
+@device_factory()
+def energy_source() -> EnergySource:
+    return EnergySource(dcm().energy_in_ev)
+
+
 # Connect will work again after this work completed
 # https://jira.diamond.ac.uk/browse/I09-651
 @device_factory()
-def analyser_driver() -> SpecsAnalyserDriverIO[LensMode, PsuMode]:
-    return SpecsAnalyserDriverIO[LensMode, PsuMode](
+def analyser() -> SpecsDetector[LensMode, PsuMode]:
+    return SpecsDetector[LensMode, PsuMode](
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-02:CAM:",
         lens_mode_type=LensMode,
         psu_mode_type=PsuMode,
-        energy_sources={SelectedSource.SOURCE1: dcm().energy_in_ev},
+        energy_source=energy_source(),
     )