dls-dodal 1.37.0__tar.gz → 1.39.0__tar.gz

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/.github/workflows/_tox.yml

@@ -20,5 +20,8 @@ jobs:
       - name: Install python packages
         uses: ./.github/actions/install_requirements
 
+      - name: Run import linter
+        run: lint-imports
+
       - name: Run tox
         run: tox -e ${{ inputs.tox }}

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/.pre-commit-config.yaml

@@ -22,3 +22,11 @@ repos:
         entry: ruff format --force-exclude
         types: [python]
         require_serial: true
+        
+      - id: import-contracts
+        name: Ensure import directionality
+        pass_filenames: false
+        language: system
+        entry: lint-imports
+        types: [python]
+        require_serial: false

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.37.0
+Version: 1.39.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.0a1
+Requires-Dist: ophyd-async==0.9.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -237,6 +237,7 @@ Requires-Dist: scanspec>=0.7.3
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
+Requires-Dist: import-linter; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
 Requires-Dist: ophyd_async[sim]; extra == "dev"

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/docs/explanations/reviews.md

@@ -51,6 +51,6 @@ New members should be regular contributors to dodal and should have been "shadow
 - Adherence to the review standards above as well as the [repository standards](../reference/standards.rst) and [device standards](../reference/device-standards.rst).
 - Independent (i.e. not just to satisfy a reviewer) motivation to make sure all code in dodal is well-tested. Use of unit and system tests as appropriate. Clear effort made to keep test coverage high (>90%). 
 - Advanced understanding of bluesky and ophyd-async including concepts and best practices, such as how to appropriately split logic between devices/plans/callbacks.
-- Humility in the use of reviewing as a tool in a way that balances the need to preserve quality with the need for progress. Appropriate use of the Must/Should/Could/Nit system documented above is helpful in showing this, as it gives the reviewer the opportunity to weight their comments in terms of project impact. They should also demonstrate similar humiliary as a reviewee.
+- Humility in the use of reviewing as a tool in a way that balances the need to preserve quality with the need for progress. Appropriate use of the Must/Should/Could/Nit system documented above is helpful in showing this, as it gives the reviewer the opportunity to weight their comments in terms of project impact. They should also demonstrate similar humility as a reviewee.
 
 Additionally, they should be regularly raising issues in the repository and demonstrating the ability to write well formed issues, with well defined acceptance criteria, that are understandable without large amounts of context.

{dls_dodal-1.37.0 → dls_dodal-1.39.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.0a1",
+    "ophyd-async == 0.9.0a1",
     "bluesky",
     "pyepics",
     "dataclasses-json",
@@ -44,6 +44,7 @@ requires-python = ">=3.10"
 dev = [
     "black",
     "diff-cover",
+    "import-linter",
     "mypy",
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
@@ -181,3 +182,17 @@ lint.select = [
 # Remove this line to forbid private member access in tests
 "tests/**/*" = ["SLF001"]
 "system_tests/**/*" = ["SLF001"]
+
+[tool.importlinter]
+root_package = "dodal"
+
+[[tool.importlinter.contracts]]
+name = "Common cannot import from beamlines"
+type = "forbidden"
+source_modules = ["dodal.common"]
+forbidden_modules = ["dodal.beamlines"]
+
+[[tool.importlinter.contracts]]
+name = "Enforce import order"
+type = "layers"
+layers = ["dodal.plans", "dodal.beamlines", "dodal.devices"]

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dls-dodal
-Version: 1.37.0
+Version: 1.39.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.0a1
+Requires-Dist: ophyd-async==0.9.0a1
 Requires-Dist: bluesky
 Requires-Dist: pyepics
 Requires-Dist: dataclasses-json
@@ -237,6 +237,7 @@ Requires-Dist: scanspec>=0.7.3
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"
+Requires-Dist: import-linter; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
 Requires-Dist: ophyd_async[sim]; extra == "dev"

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dls_dodal.egg-info/SOURCES.txt

@@ -157,8 +157,6 @@ src/dodal/devices/undulator_dcm.py
 src/dodal/devices/watsonmarlow323_pump.py
 src/dodal/devices/webcam.py
 src/dodal/devices/xbpm_feedback.py
-src/dodal/devices/zebra.py
-src/dodal/devices/zebra_controlled_shutter.py
 src/dodal/devices/areadetector/plugins/CAM.py
 src/dodal/devices/areadetector/plugins/MJPG.py
 src/dodal/devices/attenuator/attenuator.py
@@ -186,6 +184,10 @@ src/dodal/devices/i10/slits.py
 src/dodal/devices/i10/rasor/rasor_current_amp.py
 src/dodal/devices/i10/rasor/rasor_motors.py
 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/i20_1/__init__.py
 src/dodal/devices/i22/dcm.py
 src/dodal/devices/i22/fswitch.py
@@ -223,10 +225,13 @@ 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/save_panda.py
 src/dodal/devices/util/test_utils.py
 src/dodal/devices/xspress3/xspress3.py
 src/dodal/devices/xspress3/xspress3_channel.py
+src/dodal/devices/zebra/__init__.py
+src/dodal/devices/zebra/zebra.py
+src/dodal/devices/zebra/zebra_constants_mapping.py
+src/dodal/devices/zebra/zebra_controlled_shutter.py
 src/dodal/devices/zocalo/__init__.py
 src/dodal/devices/zocalo/zocalo_constants.py
 src/dodal/devices/zocalo/zocalo_interaction.py
@@ -238,6 +243,7 @@ src/dodal/plan_stubs/data_session.py
 src/dodal/plan_stubs/motor_utils.py
 src/dodal/plan_stubs/wrapped.py
 src/dodal/plans/__init__.py
+src/dodal/plans/save_panda.py
 src/dodal/plans/scanspec.py
 src/dodal/plans/wrapped.py
 system_tests/__init__.py
@@ -294,6 +300,7 @@ tests/devices/i10/lookupTables/expectedIDEnergy2GapCalibrationsIdd.pkl
 tests/devices/i10/lookupTables/expectedIDEnergy2GapCalibrationsIdu.pkl
 tests/devices/i10/lookupTables/expectedIDEnergy2PhaseCalibrationsidd.pkl
 tests/devices/i10/lookupTables/expectedIDEnergy2PhaseCalibrationsidu.pkl
+tests/devices/i13_1/test_merlin.py
 tests/devices/i22/test_dcm.py
 tests/devices/i22/test_fswitch.py
 tests/devices/i22/test_metadataholder.py
@@ -338,6 +345,7 @@ tests/devices/unit_tests/test_webcam.py
 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_zocalo_interaction.py
 tests/devices/unit_tests/test_zocalo_results.py
 tests/devices/unit_tests/current_amplifier/test_femto.py

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dls_dodal.egg-info/requires.txt

@@ -1,6 +1,6 @@
 click
 ophyd
-ophyd-async>=0.9.0a1
+ophyd-async==0.9.0a1
 bluesky
 pyepics
 dataclasses-json
@@ -22,6 +22,7 @@ scanspec>=0.7.3
 [dev]
 black
 diff-cover
+import-linter
 mypy
 myst-parser
 ophyd_async[sim]

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.37.0'
-__version_tuple__ = version_tuple = (1, 37, 0)
+__version__ = version = '1.39.0'
+__version_tuple__ = version_tuple = (1, 39, 0)

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/beamlines/i03.py

@@ -40,8 +40,13 @@ 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
-from dodal.devices.zebra import Zebra
-from dodal.devices.zebra_controlled_shutter import ZebraShutter
+from dodal.devices.zebra.zebra import Zebra
+from dodal.devices.zebra.zebra_constants_mapping import (
+    ZebraMapping,
+    ZebraSources,
+    ZebraTTLOutputs,
+)
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
 from dodal.devices.zocalo import ZocaloResults
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name, skip_device
@@ -58,6 +63,12 @@ set_utils_beamline(BL)
 
 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,
+)
+
 
 def aperture_scatterguard(
     wait_for_connection: bool = True,
@@ -324,7 +335,9 @@ def synchrotron(
 
 
 def undulator(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+    wait_for_connection: bool = True,
+    fake_with_ophyd_sim: bool = False,
+    daq_configuration_path: str | None = None,
 ) -> Undulator:
     """Get the i03 undulator device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
@@ -336,12 +349,15 @@ def undulator(
         wait_for_connection,
         fake_with_ophyd_sim,
         bl_prefix=False,
-        id_gap_lookup_table_path="/dls_sw/i03/software/daq_configuration/lookup/BeamLine_Undulator_toGap.txt",
+        # evaluate here not as parameter default to enable post-import mocking
+        id_gap_lookup_table_path=f"{daq_configuration_path or DAQ_CONFIGURATION_PATH}/lookup/BeamLine_Undulator_toGap.txt",
     )
 
 
 def undulator_dcm(
-    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+    wait_for_connection: bool = True,
+    fake_with_ophyd_sim: bool = False,
+    daq_configuration_path: str | None = None,
 ) -> UndulatorDCM:
     """Get the i03 undulator DCM device, instantiate it if it hasn't already been.
     If this is called when already instantiated in i03, it will return the existing object.
@@ -352,9 +368,14 @@ def undulator_dcm(
         prefix="",
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
-        undulator=undulator(wait_for_connection, fake_with_ophyd_sim),
+        undulator=undulator(
+            wait_for_connection,
+            fake_with_ophyd_sim,
+            daq_configuration_path=daq_configuration_path,
+        ),
         dcm=dcm(wait_for_connection, fake_with_ophyd_sim),
-        daq_configuration_path=DAQ_CONFIGURATION_PATH,
+        # evaluate here not as parameter default to enable post-import mocking
+        daq_configuration_path=daq_configuration_path or DAQ_CONFIGURATION_PATH,
     )
 
 
@@ -368,6 +389,7 @@ def zebra(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -
         "-EA-ZEBRA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
+        mapping=I03_ZEBRA_MAPPING,
     )
 
 

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/beamlines/i04.py

@@ -28,8 +28,13 @@ from dodal.devices.synchrotron import Synchrotron
 from dodal.devices.thawer import Thawer
 from dodal.devices.undulator import Undulator
 from dodal.devices.xbpm_feedback import XBPMFeedback
-from dodal.devices.zebra import Zebra
-from dodal.devices.zebra_controlled_shutter import ZebraShutter
+from dodal.devices.zebra.zebra import Zebra
+from dodal.devices.zebra.zebra_constants_mapping import (
+    ZebraMapping,
+    ZebraSources,
+    ZebraTTLOutputs,
+)
+from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name, skip_device
 
@@ -47,6 +52,11 @@ BL = get_beamline_name("s04")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+I04_ZEBRA_MAPPING = ZebraMapping(
+    outputs=(ZebraTTLOutputs(TTL_DETECTOR=1, TTL_FAST_SHUTTER=2, TTL_XSPRESS3=3)),
+    sources=ZebraSources(),
+)
+
 
 def smargon(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
@@ -341,6 +351,7 @@ def zebra(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -
         "-EA-ZEBRA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
+        mapping=I04_ZEBRA_MAPPING,
     )
 
 

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/beamlines/i13_1.py

@@ -8,7 +8,8 @@ from dodal.common.beamlines.beamline_utils import (
     set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
-from dodal.common.visit import StaticVisitPathProvider
+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 get_beamline_name
@@ -19,7 +20,8 @@ set_utils_beamline(BL)
 set_path_provider(
     StaticVisitPathProvider(
         BL,
-        Path("/data/2024/cm37257-4/"),  # latest commissioning visit
+        Path("/dls/i13-1/data/2024/cm37257-5/tmp/"),  # latest commissioning visit
+        client=LocalDirectoryServiceClient(),
     )
 )
 
@@ -64,3 +66,19 @@ def side_camera(
         wait=wait_for_connection,
         fake=fake_with_ophyd_sim,
     )
+
+
+def merlin(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> Merlin:
+    return device_instantiation(
+        Merlin,
+        prefix="BL13J-EA-DET-04:",
+        name="merlin",
+        bl_prefix=False,
+        drv_suffix="CAM:",
+        hdf_suffix="HDF5:",
+        path_provider=get_path_provider(),
+        wait=wait_for_connection,
+        fake=fake_with_ophyd_sim,
+    )

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/beamlines/i24.py

@@ -16,7 +16,12 @@ from dodal.devices.i24.pmac import PMAC
 from dodal.devices.i24.vgonio import VerticalGoniometer
 from dodal.devices.oav.oav_detector import OAV
 from dodal.devices.oav.oav_parameters import OAVConfig
-from dodal.devices.zebra import Zebra
+from dodal.devices.zebra.zebra import Zebra
+from dodal.devices.zebra.zebra_constants_mapping import (
+    ZebraMapping,
+    ZebraSources,
+    ZebraTTLOutputs,
+)
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import get_beamline_name, skip_device
 
@@ -25,10 +30,16 @@ ZOOM_PARAMS_FILE = (
 )
 DISPLAY_CONFIG = "/dls_sw/i24/software/gda_versions/var/display.configuration"
 
+
 BL = get_beamline_name("s24")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
+I24_ZEBRA_MAPPING = ZebraMapping(
+    outputs=ZebraTTLOutputs(TTL_EIGER=1, TTL_PILATUS=2, TTL_FAST_SHUTTER=4),
+    sources=ZebraSources(),
+)
+
 
 def attenuator(
     wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
@@ -191,6 +202,7 @@ def zebra(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -
         "-EA-ZEBRA-01:",
         wait_for_connection,
         fake_with_ophyd_sim,
+        mapping=I24_ZEBRA_MAPPING,
     )
 
 

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/beamlines/training_rig.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
@@ -33,7 +34,7 @@ set_utils_beamline(BL)
 set_path_provider(
     StaticVisitPathProvider(
         BL,
-        Path("/exports/mybeamline/data"),
+        Path("/data"),
         client=LocalDirectoryServiceClient(),
     )
 )
@@ -52,3 +53,11 @@ def det() -> AravisDetector:
         drv_suffix="DET:",
         hdf_suffix=HDF5_PREFIX,
     )
+
+
+@device_factory()
+def panda() -> HDFPanda:
+    return HDFPanda(
+        prefix=f"{PREFIX.beamline_prefix}-MO-PANDA-01:",
+        path_provider=get_path_provider(),
+    )

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/devices/eiger.py

@@ -62,6 +62,9 @@ class EigerDetector(Device):
     arming_status = Status()
     arming_status.set_finished()
 
+    disarming_status = Status()
+    disarming_status.set_finished()
+
     def __init__(self, beamline: str = "i03", *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.beamline = beamline
@@ -140,6 +143,7 @@ class EigerDetector(Device):
     def unstage(self) -> bool:
         assert self.detector_params is not None
         try:
+            self.disarming_status = Status()
             self.wait_on_arming_if_started()
             if self.detector_params.trigger_mode == TriggerMode.FREE_RUN:
                 # In free run mode we have to manually stop odin
@@ -158,23 +162,28 @@ class EigerDetector(Device):
                 self.timeouts.general_status_timeout
             )
             self.disable_roi_mode()
+        self.disarming_status.set_finished()
         return status_ok
 
     def stop(self, *args):
         """Emergency stop the device, mainly used to clean up after error."""
         LOGGER.info("Eiger stop() called - cleaning up...")
-        self.wait_on_arming_if_started()
-        stop_status = self.odin.stop()
-        self.odin.file_writer.start_timeout.set(1).wait(
-            self.timeouts.general_status_timeout
-        )
-        self.disarm_detector()
-        stop_status &= self.disable_roi_mode()
-        stop_status.wait(self.timeouts.general_status_timeout)
-        # See https://github.com/DiamondLightSource/hyperion/issues/1395
-        LOGGER.info("Turning off Eiger dev/shm streaming")
-        self.odin.fan.dev_shm_enable.set(0).wait()
-        LOGGER.info("Eiger has successfully been stopped")
+        if not self.disarming_status.done:
+            LOGGER.info("Eiger still disarming, waiting on disarm")
+            self.disarming_status.wait(self.timeouts.arming_timeout)
+        else:
+            self.wait_on_arming_if_started()
+            stop_status = self.odin.stop()
+            self.odin.file_writer.start_timeout.set(1).wait(
+                self.timeouts.general_status_timeout
+            )
+            self.disarm_detector()
+            stop_status &= self.disable_roi_mode()
+            stop_status.wait(self.timeouts.general_status_timeout)
+            # See https://github.com/DiamondLightSource/hyperion/issues/1395
+            LOGGER.info("Turning off Eiger dev/shm streaming")
+            self.odin.fan.dev_shm_enable.set(0).wait()
+            LOGGER.info("Eiger has successfully been stopped")
 
     def disable_roi_mode(self):
         return self.change_roi_mode(False)

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/devices/fast_grid_scan.py

@@ -45,8 +45,19 @@ class GridAxis:
         # refering to the first position
         return self.steps_to_motor_position(self.full_steps - 1)
 
-    def is_within(self, steps):
-        return 0 <= steps <= self.full_steps
+    def is_within(self, steps: float):
+        """
+        Determine whether a single axis coordinate is within the grid.
+        The coordinate is from a continuous coordinate space based on the
+        XRC grid where the origin corresponds to the centre of the first grid box.
+
+        Args:
+            steps: The coordinate to check
+
+        Returns:
+            True if the coordinate falls within the grid.
+        """
+        return -0.5 <= steps <= self.full_steps - 0.5
 
 
 class GridScanParamsCommon(AbstractExperimentWithBeamParams):

dls_dodal-1.39.0/src/dodal/devices/flux.py

@@ -0,0 +1,14 @@
+from ophyd_async.core import (
+    StandardReadable,
+    StandardReadableFormat,
+)
+from ophyd_async.epics.core import epics_signal_r
+
+
+class Flux(StandardReadable):
+    """Simple device to get the flux reading"""
+
+    def __init__(self, prefix: str, name="") -> None:
+        with self.add_children_as_readables(StandardReadableFormat.HINTED_SIGNAL):
+            self.flux_reading = epics_signal_r(float, prefix + "SAMP")
+            super().__init__(name=name)

{dls_dodal-1.37.0 → dls_dodal-1.39.0}/src/dodal/devices/i04/transfocator.py

@@ -37,32 +37,18 @@ class Transfocator(StandardReadable):
 
         super().__init__(name=name)
 
-    async def _observe_beamsize_microns(self):
-        is_set_filters_done = False
-
-        async def set_based_on_prediction(value: float):
-            if not math.isclose(
-                self.latest_pred_vertical_num_lenses, value, abs_tol=1e-8
-            ):
-                # We can only put an integer number of lenses in the beam but the
-                # calculation in the IOC returns the theoretical float number of lenses
-                nonlocal is_set_filters_done
-                value = round(value)
-                LOGGER.info(f"Transfocator setting {value} filters")
-                await self.number_filters_sp.set(value)
-                await self.start.set(1)
-                LOGGER.info("Waiting for start_rbv to change to 1")
-                await wait_for_value(self.start_rbv, 1, self.TIMEOUT)
-                LOGGER.info("Waiting for start_rbv to change to 0")
-                await wait_for_value(self.start_rbv, 0, self.TIMEOUT)
-                self.latest_pred_vertical_num_lenses = value
-                is_set_filters_done = True
-
-        # The value hasn't changed so assume the device is already set up correctly
-        async for value in observe_value(self.predicted_vertical_num_lenses):
-            await set_based_on_prediction(value)
-            if is_set_filters_done:
-                break
+    async def set_based_on_prediction(self, value: float):
+        # We can only put an integer number of lenses in the beam but the
+        # calculation in the IOC returns the theoretical float number of lenses
+        value = round(value)
+        LOGGER.info(f"Transfocator setting {value} filters")
+        await self.number_filters_sp.set(value)
+        await self.start.set(1)
+        LOGGER.info("Waiting for start_rbv to change to 1")
+        await wait_for_value(self.start_rbv, 1, self.TIMEOUT)
+        LOGGER.info("Waiting for start_rbv to change to 0")
+        await wait_for_value(self.start_rbv, 0, self.TIMEOUT)
+        self.latest_pred_vertical_num_lenses = value
 
     @AsyncStatus.wrap
     async def set(self, value: float):
@@ -81,10 +67,17 @@ class Transfocator(StandardReadable):
 
         if await self.beamsize_set_microns.get_value() != value:
             # Logic in the IOC calculates predicted_vertical_num_lenses when beam_set_microns changes
-            await asyncio.gather(
-                self.beamsize_set_microns.set(value),
-                self._observe_beamsize_microns(),
+
+            # Register an observer before setting beamsize_set_microns to ensure we don't miss changes
+            predicted_vertical_num_lenses_iterator = observe_value(
+                self.predicted_vertical_num_lenses, timeout=self.TIMEOUT
             )
+            # Keep initial prediction before setting to later compare with change after setting
+            current_prediction = await anext(predicted_vertical_num_lenses_iterator)
+            await self.beamsize_set_microns.set(value)
+            accepted_prediction = await anext(predicted_vertical_num_lenses_iterator)
+            if not math.isclose(current_prediction, accepted_prediction, abs_tol=1e-8):
+                await self.set_based_on_prediction(accepted_prediction)
 
         number_filters_rbv, vertical_lens_size_rbv = await asyncio.gather(
             self.number_filters_sp.get_value(),

dls_dodal-1.39.0/src/dodal/devices/i13_1/merlin.py

@@ -0,0 +1,33 @@
+from ophyd_async.core import PathProvider, StandardDetector
+from ophyd_async.epics import adcore
+
+from dodal.devices.i13_1.merlin_controller import MerlinController
+from dodal.devices.i13_1.merlin_io import MerlinDriverIO
+
+
+class Merlin(StandardDetector):
+    _controller: MerlinController
+    _writer: adcore.ADHDFWriter
+
+    def __init__(
+        self,
+        prefix: str,
+        path_provider: PathProvider,
+        drv_suffix="CAM:",
+        hdf_suffix="HDF:",
+        name: str = "",
+    ):
+        self.drv = MerlinDriverIO(prefix + drv_suffix)
+        self.hdf = adcore.NDFileHDFIO(prefix + hdf_suffix)
+
+        super().__init__(
+            MerlinController(self.drv),
+            adcore.ADHDFWriter(
+                self.hdf,
+                path_provider,
+                lambda: self.name,
+                adcore.ADBaseDatasetDescriber(self.drv),
+            ),
+            config_sigs=(self.drv.acquire_period, self.drv.acquire_time),
+            name=name,
+        )