dls-dodal 1.64.0__tar.gz → 1.65.0__tar.gz

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.64.0
+Version: 1.65.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

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.64.0
+Version: 1.65.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

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -545,7 +545,8 @@ tests/devices/i19/test_beamstop.py
 tests/devices/i19/test_diffractometer.py
 tests/devices/i19/test_mapt.py
 tests/devices/i19/test_pin_col.py
-tests/devices/i19/test_shutter.py
+tests/devices/i19/access_controlled/__init__.py
+tests/devices/i19/access_controlled/test_shutter.py
 tests/devices/i22/__init__.py
 tests/devices/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
@@ -629,4 +630,7 @@ tests/test_data/bad_beamlineParameters
 tests/test_data/i04_beamlineParameters
 tests/test_data/test_beamline_parameters.txt
 tests/test_data/test_display.configuration
-tests/test_data/test_oav_zoom_levels.xml
+tests/test_data/test_oav_zoom_levels.xml
+tests/testing/__init__.py
+tests/testing/fixtures/__init__.py
+tests/testing/fixtures/test_run_engine.py

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.64.0'
-__version_tuple__ = version_tuple = (1, 64, 0)
+__version__ = version = '1.65.0'
+__version_tuple__ = version_tuple = (1, 65, 0)
 
-__commit_id__ = commit_id = 'g15623816b'
+__commit_id__ = commit_id = 'g5fe631f29'

dls_dodal-1.65.0/src/dodal/beamline_specific_utils/i05_shared.py

@@ -0,0 +1,14 @@
+from dodal.common.beamlines.beamline_utils import device_factory
+from dodal.devices.i05.enums import Grating
+from dodal.devices.pgm import PlaneGratingMonochromator
+from dodal.utils import BeamlinePrefix
+
+PREFIX = BeamlinePrefix("i05", "I")
+
+
+@device_factory()
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
+        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        grating=Grating,
+    )

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/b01_1.py

@@ -37,7 +37,7 @@ def panda() -> HDFPanda:
         HDFPanda: The HDF5-based detector trigger device.
     """
     return HDFPanda(
-        f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
+        f"{PREFIX.beamline_prefix}-MO-PPANDA-01:",
         path_provider=get_path_provider(),
     )
 

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/b07.py

@@ -5,7 +5,7 @@ from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beam
 from dodal.devices.b07 import Grating, LensMode, PsuMode
 from dodal.devices.electron_analyser import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
-from dodal.devices.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 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,8 +22,11 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
+        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        grating=Grating,
+    )
 
 
 @device_factory()

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/b07_1.py

@@ -8,7 +8,7 @@ from dodal.devices.b07_1 import (
 )
 from dodal.devices.electron_analyser import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
-from dodal.devices.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -25,8 +25,11 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
+        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        grating=Grating,
+    )
 
 
 # Connect will work again after this work completed

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i03.py

@@ -21,7 +21,7 @@ from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
 from dodal.devices.baton import Baton
 from dodal.devices.collimation_table import CollimationTable
-from dodal.devices.cryostream import CryoStream
+from dodal.devices.cryostream import CryoStream, CryoStreamGantry
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.diamond_filter import DiamondFilter, I03Filters
 from dodal.devices.eiger import EigerDetector
@@ -396,6 +396,14 @@ def cryostream() -> CryoStream:
     return CryoStream(PREFIX.beamline_prefix)
 
 
+@device_factory()
+def cryostream_gantry() -> CryoStreamGantry:
+    """Get the i03 cryostream gantry 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 CryoStreamGantry(PREFIX.beamline_prefix)
+
+
 @device_factory()
 def diamond_filter() -> DiamondFilter[I03Filters]:
     """Get the i03 diamond filter device, instantiate it if it hasn't already been.

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i05.py

@@ -1,7 +1,7 @@
 from dodal.beamline_specific_utils.i05_shared import pgm as i05_pgm
 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.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -18,5 +18,5 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def pgm() -> PGM:
+def pgm() -> PlaneGratingMonochromator:
     return i05_pgm()

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i05_1.py

@@ -1,7 +1,7 @@
 from dodal.beamline_specific_utils.i05_shared import pgm as i05_pgm
 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.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -13,7 +13,7 @@ set_utils_beamline(BL)
 
 
 @device_factory()
-def pgm() -> PGM:
+def pgm() -> PlaneGratingMonochromator:
     return i05_pgm()
 
 

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i09.py

@@ -10,7 +10,7 @@ from dodal.devices.common_dcm import (
 from dodal.devices.electron_analyser import DualEnergySource
 from dodal.devices.electron_analyser.vgscienta import VGScientaDetector
 from dodal.devices.i09 import Grating, LensMode, PassEnergy, PsuMode
-from dodal.devices.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -27,8 +27,8 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def pgm() -> PGM:
-    return PGM(
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
         prefix=f"{BeamlinePrefix(BL, suffix='J').beamline_prefix}-MO-PGM-01:",
         grating=Grating,
     )

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i09_1.py

@@ -11,6 +11,7 @@ from dodal.devices.electron_analyser import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.i09_1 import LensMode, PsuMode
 from dodal.devices.synchrotron import Synchrotron
+from dodal.devices.undulator import UndulatorOrder
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
 
@@ -47,3 +48,8 @@ def analyser() -> SpecsDetector[LensMode, PsuMode]:
         psu_mode_type=PsuMode,
         energy_source=energy_source(),
     )
+
+
+@device_factory()
+def harmonics() -> UndulatorOrder:
+    return UndulatorOrder(name="harmonics")

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i09_2.py

@@ -8,7 +8,7 @@ from dodal.devices.apple2_undulator import (
     UndulatorPhaseAxes,
 )
 from dodal.devices.i09.enums import Grating
-from dodal.devices.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -25,8 +25,11 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-MO-PGM-01:", grating=Grating)
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
+        prefix=f"{PREFIX.beamline_prefix}-MO-PGM-01:",
+        grating=Grating,
+    )
 
 
 @device_factory()

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i10_optics.py

@@ -32,7 +32,7 @@ from dodal.devices.i10.i10_apple2 import (
 
 # Imports taken from i10 while we work out how to deal with split end stations
 from dodal.devices.i10.i10_setting_data import I10Grating
-from dodal.devices.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -59,9 +59,9 @@ def first_mirror() -> PiezoMirror:
 
 
 @device_factory()
-def pgm() -> PGM:
+def pgm() -> PlaneGratingMonochromator:
     "I10 Plane Grating Monochromator, it can change energy via pgm.energy.set(<energy>)"
-    return PGM(
+    return PlaneGratingMonochromator(
         prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
         grating=I10Grating,
         grating_pv="NLINES2",

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i17.py

@@ -17,7 +17,7 @@ from dodal.devices.apple2_undulator import (
     UndulatorPhaseAxes,
 )
 from dodal.devices.i17.i17_apple2 import I17Apple2Controller
-from dodal.devices.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -39,8 +39,8 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory(skip=True)
-def pgm() -> PGM:
-    return PGM(
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
         prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
         grating=I17Grating,
         grating_pv="NLINES2",

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i19_2.py

@@ -1,12 +1,17 @@
+from pathlib import Path
+
+from ophyd_async.fastcs.eiger import EigerDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
 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 StaticVisitPathProvider
 from dodal.devices.i19.access_controlled.blueapi_device import HutchState
 from dodal.devices.i19.access_controlled.shutter import AccessControlledShutter
 from dodal.devices.i19.backlight import BacklightPosition
@@ -31,6 +36,13 @@ PREFIX = BeamlinePrefix("i19", "I")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+set_path_provider(
+    StaticVisitPathProvider(
+        BL,
+        Path("/dls/i19-2/data/2025/cm40639-4/"),
+    )
+)
+
 
 I19_2_ZEBRA_MAPPING = ZebraMapping(
     outputs=ZebraTTLOutputs(),
@@ -105,3 +117,13 @@ def panda() -> HDFPanda:
         prefix=f"{PREFIX.beamline_prefix}-EA-PANDA-01:",
         path_provider=get_path_provider(),
     )
+
+
+@device_factory()
+def eiger() -> EigerDetector:
+    return EigerDetector(
+        prefix=PREFIX.beamline_prefix,
+        path_provider=get_path_provider(),
+        drv_suffix="-EA-EIGER-01:",
+        hdf_suffix="-EA-EIGER-01:OD:",
+    )

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i21.py

@@ -8,7 +8,7 @@ from dodal.devices.apple2_undulator import (
     UndulatorPhaseAxes,
 )
 from dodal.devices.i21 import Grating
-from dodal.devices.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -25,8 +25,8 @@ def synchrotron() -> Synchrotron:
 
 
 @device_factory()
-def pgm() -> PGM:
-    return PGM(
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
         prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
         grating=Grating,
     )

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/i22.py

@@ -1,5 +1,3 @@
-from pathlib import Path
-
 from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.epics.adcore import NDPluginBaseIO, NDPluginStatsIO
 from ophyd_async.epics.adpilatus import PilatusDetector
@@ -8,7 +6,6 @@ from ophyd_async.fastcs.panda import HDFPanda
 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.beamlines.device_helpers import CAM_SUFFIX, DET_SUFFIX, HDF5_SUFFIX
@@ -16,7 +13,6 @@ from dodal.common.crystal_metadata import (
     MaterialsEnum,
     make_crystal_metadata_from_material,
 )
-from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.bimorph_mirror import BimorphMirror
 from dodal.devices.focusing_mirror import FocusingMirror
 from dodal.devices.i22.dcm import DCM
@@ -37,19 +33,6 @@ 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/i22/data/2025/cm40643-4/"),
-        client=RemoteDirectoryServiceClient("http://i22-control:8088/api"),
-    )
-)
-
 
 @device_factory()
 def saxs() -> PilatusDetector:

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/beamlines/k07.py

@@ -4,7 +4,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.pgm import PGM
+from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -27,5 +27,8 @@ class Grating(StrictEnum):
 
 # Grating does not exist yet - this class is a placeholder for when it does
 @device_factory(skip=True)
-def pgm() -> PGM:
-    return PGM(prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:", grating=Grating)
+def pgm() -> PlaneGratingMonochromator:
+    return PlaneGratingMonochromator(
+        prefix=f"{PREFIX.beamline_prefix}-OP-PGM-01:",
+        grating=Grating,
+    )

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/devices/cryostream.py

@@ -32,6 +32,11 @@ class TurboEnum(StrictEnum):
     AUTO = "Auto"
 
 
+class CryoStreamSelection(StrictEnum):
+    CRYOJET = "CryoJet"
+    HC1 = "HC1"
+
+
 class OxfordCryoStreamController(StandardReadable):
     def __init__(self, prefix: str, name: str = ""):
         with self.add_children_as_readables(StandardReadableFormat.CONFIG_SIGNAL):
@@ -107,3 +112,19 @@ class OxfordCryoStream(StandardReadable):
             self.status = OxfordCryoStreamStatus(prefix=prefix)
 
         super().__init__(name)
+
+
+class CryoStreamGantry(StandardReadable):
+    def __init__(self, prefix: str, name: str = ""):
+        with self.add_children_as_readables(StandardReadableFormat.CONFIG_SIGNAL):
+            self.cryostream_selector = epics_signal_r(
+                CryoStreamSelection, f"{prefix}-EA-GANT-01:CTRL"
+            )
+            self.hc1_selected = epics_signal_r(
+                int, f"{prefix}-MO-STEP-02:GPIO_INP_BITS.B2"
+            )
+            self.cryostream_selected = epics_signal_r(
+                int, f"{prefix}-MO-STEP-02:GPIO_INP_BITS.B3"
+            )
+
+        super().__init__(name)

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/devices/i22/nxsas.py

@@ -1,11 +1,9 @@
-import asyncio
-from collections.abc import Awaitable, Iterable
 from dataclasses import dataclass, fields
 from typing import TypeVar
 
 from bluesky.protocols import Reading
 from event_model.documents.event_descriptor import DataKey
-from ophyd_async.core import PathProvider
+from ophyd_async.core import PathProvider, merge_gathered_dicts
 from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.epics.adcore import NDPluginBaseIO
 from ophyd_async.epics.adpilatus import PilatusDetector
@@ -14,23 +12,6 @@ ValueAndUnits = tuple[float, str]
 T = TypeVar("T")
 
 
-# TODO: Remove this file as part of github.com/DiamondLightSource/dodal/issues/595
-# Until which, temporarily duplicated non-public method from ophyd_async
-async def _merge_gathered_dicts(
-    coros: Iterable[Awaitable[dict[str, T]]],
-) -> dict[str, T]:
-    """Merge dictionaries produced by a sequence of coroutines.
-
-    Can be used for merging ``read()`` or ``describe``. For instance::
-
-        combined_read = await merge_gathered_dicts(s.read() for s in signals)
-    """
-    ret: dict[str, T] = {}
-    for result in await asyncio.gather(*coros):
-        ret.update(result)
-    return ret
-
-
 @dataclass
 class MetadataHolder:
     # TODO: just in case this is useful more widely...
@@ -124,7 +105,7 @@ class NXSasPilatus(PilatusDetector):
         self._metadata_holder = metadata_holder
 
     async def read_configuration(self) -> dict[str, Reading]:
-        return await _merge_gathered_dicts(
+        return await merge_gathered_dicts(
             r
             for r in (
                 super().read_configuration(),
@@ -133,7 +114,7 @@ class NXSasPilatus(PilatusDetector):
         )
 
     async def describe_configuration(self) -> dict[str, DataKey]:
-        return await _merge_gathered_dicts(
+        return await merge_gathered_dicts(
             r
             for r in (
                 super().describe_configuration(),
@@ -167,7 +148,7 @@ class NXSasOAV(AravisDetector):
         self._metadata_holder = metadata_holder
 
     async def read_configuration(self) -> dict[str, Reading]:
-        return await _merge_gathered_dicts(
+        return await merge_gathered_dicts(
             r
             for r in (
                 super().read_configuration(),
@@ -176,7 +157,7 @@ class NXSasOAV(AravisDetector):
         )
 
     async def describe_configuration(self) -> dict[str, DataKey]:
-        return await _merge_gathered_dicts(
+        return await merge_gathered_dicts(
             r
             for r in (
                 super().describe_configuration(),

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/devices/pgm.py

@@ -7,7 +7,7 @@ from ophyd_async.epics.core import epics_signal_rw
 from ophyd_async.epics.motor import Motor
 
 
-class PGM(StandardReadable):
+class PlaneGratingMonochromator(StandardReadable):
     """
     Plane grating monochromator, it is use in soft x-ray beamline to generate monochromic beam.
     """

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/devices/scintillator.py

@@ -69,6 +69,10 @@ class Scintillator(StandardReadable):
     async def _set_selected_position(self, position: InOut) -> None:
         match position:
             case InOut.OUT:
+                current_y = await self.y_mm.user_readback.get_value()
+                current_z = await self.z_mm.user_readback.get_value()
+                if self._get_selected_position(current_y, current_z) == InOut.OUT:
+                    return
                 if (
                     self._aperture_scatterguard().selected_aperture.get_value()
                     != ApertureValue.PARKED

{dls_dodal-1.64.0 → dls_dodal-1.65.0}/src/dodal/devices/undulator.py

@@ -1,7 +1,7 @@
 import os
 
 import numpy as np
-from bluesky.protocols import Movable
+from bluesky.protocols import Locatable, Location, Movable
 from numpy import ndarray
 from ophyd_async.core import (
     AsyncStatus,
@@ -9,6 +9,7 @@ from ophyd_async.core import (
     StandardReadable,
     StandardReadableFormat,
     soft_signal_r_and_setter,
+    soft_signal_rw,
 )
 from ophyd_async.epics.core import epics_signal_r
 from ophyd_async.epics.motor import Motor
@@ -157,3 +158,30 @@ class Undulator(StandardReadable, Movable[float]):
             energy_kev * 1000,
             energy_to_distance_table,
         )
+
+
+class UndulatorOrder(StandardReadable, Locatable[int]):
+    """
+    Represents the order of an undulator device. Allows setting and locating the order.
+    """
+
+    def __init__(self, name: str = "") -> None:
+        """
+        Args:
+            name: Name for device. Defaults to ""
+        """
+        with self.add_children_as_readables():
+            self._value = soft_signal_rw(int, initial_value=3)
+        super().__init__(name=name)
+
+    @AsyncStatus.wrap
+    async def set(self, value: int) -> None:
+        if (value >= 0) and isinstance(value, int):
+            await self._value.set(value)
+        else:
+            raise ValueError(
+                f"Undulator order must be a positive integer. Requested value: {value}"
+            )
+
+    async def locate(self) -> Location[int]:
+        return await self._value.locate()

dls_dodal-1.65.0/src/dodal/plan_stubs/__init__.py

@@ -0,0 +1,3 @@
+from .wrapped import move, move_relative, set_absolute, set_relative, sleep, wait
+
+__all__ = ["move", "move_relative", "set_absolute", "set_relative", "sleep", "wait"]