Instantiate i22 saxs, waxs detectors from Pilatus in ophyd_async

src/dodal/beamlines/i22.py

@@ -1,3 +1,7 @@
+from ophyd_async.epics.areadetector import PilatusDetector
+from ophyd_async.epics.areadetector.drivers.pilatus_driver import PilatusDriver
+from ophyd_async.epics.areadetector.writers.nd_file_hdf import NDFileHDF
+
 from dodal.beamlines.beamline_utils import device_instantiation, get_directory_provider
 from dodal.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.tetramm import TetrammDetector
@@ -35,3 +39,87 @@ def it(
         fake_with_ophyd_sim,
         directory_provider=get_directory_provider(),
     )
+
+
+def saxs_driver(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> PilatusDriver:
+    return device_instantiation(
+        PilatusDriver,
+        "",
+        "-EA-PILAT-01:DRV:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )
+
+
+def saxs_writer(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> NDFileHDF:
+    return device_instantiation(
+        NDFileHDF,
+        "",
+        "-EA-PILAT-01:HDF:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )
+
+
+def saxs(
+    saxs_writer: NDFileHDF,
+    saxs_driver: PilatusDriver,
+    wait_for_connection: bool = True,
+    fake_with_ophyd_sim: bool = False,
+) -> PilatusDetector:
+    return device_instantiation(
+        PilatusDetector,
+        "waxs",
+        "-EA-PILAT-01:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+        hdf=saxs_writer,
+        driver=saxs_driver,
+        directory_provider=get_directory_provider(),
+    )
+
+
+def waxs_driver(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> PilatusDriver:
+    return device_instantiation(
+        PilatusDriver,
+        "",
+        "-EA-PILAT-03:DRV:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )
+
+
+def waxs_writer(
+    wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False
+) -> NDFileHDF:
+    return device_instantiation(
+        NDFileHDF,
+        "",
+        "-EA-PILAT-03:HDF:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+    )
+
+
+def waxs(
+    waxs_writer: NDFileHDF,
+    waxs_driver: PilatusDriver,
+    wait_for_connection: bool = True,
+    fake_with_ophyd_sim: bool = False,
+) -> PilatusDetector:
+    return device_instantiation(
+        PilatusDetector,
+        "waxs",
+        "-EA-PILAT-03:",
+        wait_for_connection,
+        fake_with_ophyd_sim,
+        hdf=waxs_writer,
+        driver=waxs_driver,
+        directory_provider=get_directory_provider(),
+    )