Update to ophyd-async 0.17a4

pyproject.toml

@@ -14,7 +14,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml
 dependencies = [
     "click",
     "ophyd",
-    "ophyd-async[ca,pva]>=v0.16.0",
+    "ophyd-async[ca,pva]>=v0.17a4",
     "bluesky>=1.14.5",
     "pyepics",
     "pillow",

src/dodal/beamlines/adsim.py

@@ -83,6 +83,6 @@ def det(path_provider) -> SimDetector:
     return SimDetector(
         f"{PREFIX.beamline_prefix}-DI-CAM-01:",
         path_provider=path_provider,
-        drv_suffix=DET_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=DET_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
     )

src/dodal/beamlines/b01_1.py

@@ -88,8 +88,8 @@ def spectroscopy_detector(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         pv_prefix,
         path_provider=path_provider,
-        drv_suffix=CAM_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=CAM_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
         plugins={
             "roistat": NDROIStatIO(f"{pv_prefix}ROISTAT:", num_channels=3),
         },
@@ -108,8 +108,8 @@ def imaging_detector(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
         path_provider=path_provider,
-        drv_suffix=CAM_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=CAM_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
     )
 
 

src/dodal/beamlines/b16.py

@@ -1,19 +1,12 @@
 from pathlib import Path
 
-from ophyd_async.epics.adcore import (
-    AreaDetector,
-)
+from ophyd_async.epics.adcore import AreaDetector
 from ophyd_async.epics.motor import Motor
 
-from dodal.common.beamlines.beamline_utils import (
-    device_factory,
-    set_path_provider,
-)
+from dodal.common.beamlines.beamline_utils import device_factory, set_path_provider
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
-from dodal.devices.beamlines.b16.detector import (
-    software_triggered_tiff_area_detector,
-)
+from dodal.devices.beamlines.b16.detector import software_triggered_tiff_area_detector
 from dodal.devices.motors import XYZStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name

src/dodal/beamlines/b21.py

@@ -35,25 +35,21 @@ def path_provider() -> PathProvider:
     return StaticPathProvider(UUIDFilenameProvider(), Path("/tmp"))
 
 
-@devices.factory()
+# Needs the fastCS Eiger/odin, see https://jira.diamond.ac.uk/browse/B21-330
+@devices.factory(skip=True)
 def saxs(path_provider: PathProvider) -> EigerDetector:
     return EigerDetector(
-        prefix=PREFIX.beamline_prefix,
+        prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:",
         path_provider=path_provider,
-        drv_suffix="-EA-EIGER-01:",
-        hdf_suffix="-EA-EIGER-01:OD:",
-        odin_nodes=1,
     )
 
 
-@devices.factory()
+# Needs the fastCS Eiger/odin, see https://jira.diamond.ac.uk/browse/B21-330
+@devices.factory(skip=True)
 def waxs(path_provider: PathProvider) -> EigerDetector:
     return EigerDetector(
-        prefix=PREFIX.beamline_prefix,
+        prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-02:",
         path_provider=path_provider,
-        drv_suffix="-EA-EIGER-02:",
-        hdf_suffix="-EA-EIGER-02:OD:",
-        odin_nodes=1,
     )
 
 
@@ -142,8 +138,8 @@ def wbscam(path_provider: PathProvider) -> AravisDetector:
     )
     return NXSasOAV(
         prefix=f"{PREFIX.beamline_prefix}-RS-ABSB-02:CAM:",
-        drv_suffix=CAM_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=CAM_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
         path_provider=path_provider,
         metadata_holder=metadata_holder,
     )

src/dodal/beamlines/i03.py

@@ -186,13 +186,13 @@ def eiger(eiger: EigerDetector) -> EigerDetector:
     return eiger
 
 
-@devices.factory()
+# ophyd-async no longer works with a mixed ADOdin and fastCS Eiger. Need to update the
+# beamline to use a fastCS Odin and Eiger
+@devices.factory(skip=True)
 def fastcs_eiger(path_provider: PathProvider) -> FastEiger:
     return FastEiger(
-        prefix=PREFIX.beamline_prefix,
+        prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-02:",
         path_provider=path_provider,
-        drv_suffix="-EA-EIGER-02:",
-        hdf_suffix="-EA-EIGER-01:OD:",
     )
 
 

src/dodal/beamlines/i11.py

@@ -43,14 +43,15 @@ def path_provider() -> PathProvider:
     return StaticPathProvider(UUIDFilenameProvider(), Path("/tmp"))
 
 
-@devices.factory()
+# Mythen detector state does not match ophyd-async see https://jira.diamond.ac.uk/browse/I11-916
+@devices.factory(skip=True)
 def mythen3(path_provider: PathProvider) -> Mythen3:
     """Mythen3 Detector from PSI."""
     return Mythen3(
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-07:",
         path_provider=path_provider,
         drv_suffix=DET_SUFFIX,
-        fileio_suffix="HDF:",
+        writer_suffix="HDF:",
     )
 
 

src/dodal/beamlines/i13_1.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
 from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.admerlin import MerlinDetector
 
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
@@ -9,7 +10,6 @@
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
-from dodal.devices.beamlines.i13_1.merlin import Merlin
 from dodal.devices.motors import XYZStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -42,17 +42,17 @@ def sample_xyz_lab_fa_stage() -> XYZStage:
 def side_camera() -> AravisDetector:
     return AravisDetector(
         prefix=f"{PREFIX}-OP-FLOAT-03:",
-        drv_suffix="CAM:",
-        fileio_suffix="HDF5:",
+        driver_suffix="CAM:",
+        writer_suffix="HDF5:",
         path_provider=get_path_provider(),
     )
 
 
 @device_factory()
-def merlin() -> Merlin:
-    return Merlin(
+def merlin() -> MerlinDetector:
+    return MerlinDetector(
         prefix=f"{PREFIX}-EA-DET-04:",
-        drv_suffix="CAM:",
-        fileio_suffix="HDF5:",
         path_provider=get_path_provider(),
+        driver_suffix="CAM:",
+        writer_suffix="HDF5:",
     )

src/dodal/beamlines/i18.py

@@ -100,7 +100,6 @@ def i0() -> TetrammDetector:
     return TetrammDetector(
         f"{PREFIX.beamline_prefix}-DI-XBPM-02:",
         path_provider=get_path_provider(),
-        type="Cividec Diamond XBPM",
     )
 
 

src/dodal/beamlines/i19_2.py

@@ -88,10 +88,8 @@ def diffractometer() -> FourCircleDiffractometer:
 @devices.factory()
 def eiger(path_provider: PathProvider) -> EigerDetector:
     return EigerDetector(
-        prefix=PREFIX.beamline_prefix,
+        prefix=f"{PREFIX.beamline_prefix}-EA-EIGER-01:",
         path_provider=path_provider,
-        drv_suffix="-EA-EIGER-01:",
-        hdf_suffix="-EA-EIGER-01:OD:",
     )
 
 

src/dodal/beamlines/i22.py

@@ -8,7 +8,7 @@
     UUIDFilenameProvider,
 )
 from ophyd_async.epics.adaravis import AravisDetector
-from ophyd_async.epics.adcore import NDPluginBaseIO, NDPluginStatsIO
+from ophyd_async.epics.adcore import NDPluginBaseIO, NDStatsIO
 from ophyd_async.epics.adpilatus import PilatusDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
@@ -76,13 +76,11 @@ def saxs(path_provider: PathProvider) -> PilatusDetector:
     return NXSasPilatus(
         prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
         path_provider=path_provider,
-        drv_suffix=CAM_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=CAM_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
         metadata_holder=metadata_holder,
         plugins={
-            "stats": NDPluginStatsIO(
-                prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:STAT:"
-            )
+            "stats": NDStatsIO(prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:STAT:")
         },
     )
 
@@ -106,13 +104,11 @@ def waxs(path_provider: PathProvider) -> PilatusDetector:
     return NXSasPilatus(
         prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-03:",
         path_provider=path_provider,
-        drv_suffix=CAM_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=CAM_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
         metadata_holder=metadata_holder,
         plugins={
-            "stats": NDPluginStatsIO(
-                prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-03:STAT:"
-            )
+            "stats": NDStatsIO(prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-03:STAT:")
         },
     )
 
@@ -122,12 +118,7 @@ def i0(path_provider: PathProvider) -> TetrammDetector:
     return TetrammDetector(
         prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:",
         path_provider=path_provider,
-        type="Cividec Diamond XBPM",
-        plugins={
-            "stats": NDPluginBaseIO(
-                prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:SumAll:"
-            )
-        },
+        plugins=[NDPluginBaseIO(prefix=f"{PREFIX.beamline_prefix}-EA-XBPM-02:SumAll:")],
     )
 
 
@@ -136,12 +127,7 @@ def it(path_provider: PathProvider) -> TetrammDetector:
     return TetrammDetector(
         prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:",
         path_provider=path_provider,
-        type="PIN Diode",
-        plugins={
-            "stats": NDPluginBaseIO(
-                prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:SumAll:"
-            )
-        },
+        plugins=[NDPluginBaseIO(prefix=f"{PREFIX.beamline_prefix}-EA-TTRM-02:SumAll:")],
     )
 
 
@@ -282,8 +268,8 @@ def oav(path_provider: PathProvider) -> AravisDetector:
     )
     return NXSasOAV(
         prefix=f"{PREFIX.beamline_prefix}-DI-OAV-01:",
-        drv_suffix=DET_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=DET_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
         path_provider=path_provider,
         metadata_holder=metadata_holder,
     )

src/dodal/beamlines/i23.py

@@ -90,8 +90,8 @@ def pilatus(path_provider: PathProvider) -> PilatusDetector:
     return PilatusDetector(
         prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
         path_provider=path_provider,
-        drv_suffix="cam1:",
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix="cam1:",
+        writer_suffix=HDF5_SUFFIX,
     )
 
 

src/dodal/beamlines/i24.py

@@ -3,6 +3,7 @@
 
 from daq_config_server import ConfigClient
 from ophyd_async.core import AutoMaxIncrementingPathProvider, PathProvider
+from ophyd_async.fastcs.jungfrau import JungfrauDetector
 
 from dodal.common.beamlines.beamline_utils import BL, set_config_client
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
@@ -16,7 +17,6 @@
 from dodal.devices.beamlines.i24.aperture import Aperture
 from dodal.devices.beamlines.i24.beam_center import DetectorBeamCenter
 from dodal.devices.beamlines.i24.beamstop import Beamstop
-from dodal.devices.beamlines.i24.commissioning_jungfrau import CommissioningJungfrau
 from dodal.devices.beamlines.i24.dcm import DCM
 from dodal.devices.beamlines.i24.dual_backlight import DualBacklight
 from dodal.devices.beamlines.i24.focus_mirrors import FocusMirrorsMode
@@ -154,16 +154,14 @@ def eiger_beam_center() -> DetectorBeamCenter:
 
 
 @devices.factory()
-def commissioning_jungfrau(
+def jungfrau(
     path_provider: PathProvider,
-) -> CommissioningJungfrau:
-    """Get the commissionning Jungfrau 9M device, which uses a temporary filewriter
-    device in place of Odin while the detector is in commissioning.
-    """
-    return CommissioningJungfrau(
+) -> JungfrauDetector:
+    return JungfrauDetector(
         f"{PREFIX.beamline_prefix}-EA-JFRAU-01:",
-        f"{PREFIX.beamline_prefix}-JUNGFRAU-META:FD:",
         AutoMaxIncrementingPathProvider(path_provider),
+        "CAM:",
+        "OD:",
     )
 
 

src/dodal/beamlines/p38.py

@@ -56,8 +56,8 @@ def d3() -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
         path_provider=get_path_provider(),
-        drv_suffix="DET:",
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix="DET:",
+        writer_suffix=HDF5_SUFFIX,
     )
 
 
@@ -67,8 +67,8 @@ def d11() -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-03:",
         path_provider=get_path_provider(),
-        drv_suffix="DET:",
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix="DET:",
+        writer_suffix=HDF5_SUFFIX,
     )
 
 
@@ -77,8 +77,8 @@ def d12() -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-04:",
         path_provider=get_path_provider(),
-        drv_suffix="DET:",
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix="DET:",
+        writer_suffix=HDF5_SUFFIX,
     )
 
 

src/dodal/beamlines/p45.py

@@ -45,8 +45,8 @@ def det() -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-EA-MAP-01:",
         path_provider=get_path_provider(),
-        drv_suffix=DET_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=DET_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
     )
 
 
@@ -56,8 +56,8 @@ def diff() -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-EA-DIFF-01:",
         path_provider=get_path_provider(),
-        drv_suffix=DET_SUFFIX,
-        fileio_suffix=HDF5_SUFFIX,
+        driver_suffix=DET_SUFFIX,
+        writer_suffix=HDF5_SUFFIX,
     )