Split out common AD file plugin logic into core writer class, create ADTiffWriter

src/ophyd_async/epics/adaravis/_aravis.py

@@ -3,6 +3,7 @@
 from ophyd_async.core import PathProvider
 from ophyd_async.core._signal import SignalR
 from ophyd_async.epics import adcore
+from ophyd_async.epics.adcore._core_io import ADBaseDatasetDescriber
 
 from ._aravis_controller import AravisController
 
@@ -29,17 +30,23 @@ def __init__(
         controller, driver = AravisController.controller_and_drv(
             prefix + drv_suffix, gpio_number=gpio_number, name=name
         )
+        writer, fileio = writer_cls.writer_and_io(
+            prefix,
+            path_provider,
+            lambda: name,
+            ADBaseDatasetDescriber(driver),
+            fileio_suffix=fileio_suffix,
+            plugins=plugins,
+        )
 
         super().__init__(
-            prefix=prefix,
             driver=driver,
             controller=controller,
-            writer_cls=writer_cls,
-            fileio_suffix=fileio_suffix,
-            path_provider=path_provider,
+            fileio=fileio,
+            writer=writer,
             plugins=plugins,
             name=name,
             config_sigs=config_sigs,
         )
-
         self.drv = driver
+        self.fileio = fileio

src/ophyd_async/epics/adcore/_core_detector.py

@@ -1,34 +1,25 @@
 from collections.abc import Sequence
 
-from ophyd_async.core import PathProvider, SignalR, StandardDetector
+from ophyd_async.core import SignalR, StandardDetector
 
-from ._core_io import ADBaseDatasetDescriber, ADBaseIO, NDPluginBaseIO
+from ._core_io import ADBaseIO, NDFileIO, NDPluginBaseIO
 from ._core_logic import ADBaseControllerT
 from ._core_writer import ADWriterT
 
 
 class AreaDetector(StandardDetector[ADBaseControllerT, ADWriterT]):
     def __init__(
         self,
-        prefix: str,
         driver: ADBaseIO,
         controller: ADBaseControllerT,
-        writer_cls: type[ADWriterT],
-        path_provider: PathProvider,
-        plugins: dict[str, NDPluginBaseIO] | None,
+        fileio: NDFileIO,
+        writer: ADWriterT,
+        plugins: dict[str, NDPluginBaseIO] | None = None,
         config_sigs: Sequence[SignalR] = (),
         name: str = "",
-        fileio_suffix: str | None = None,
     ):
         self.drv = driver
-        writer, self.fileio = writer_cls.writer_and_io(
-            prefix + (fileio_suffix or writer_cls.default_suffix),
-            path_provider,
-            lambda: name,
-            ADBaseDatasetDescriber(self.drv),
-            plugins=plugins,
-            name=name,
-        )
+        self.fileio = fileio
 
         if plugins is not None:
             for name, plugin in plugins.items():

src/ophyd_async/epics/adcore/_core_writer.py

@@ -70,15 +70,22 @@ def writer_and_io(
         path_provider: PathProvider,
         name_provider: NameProvider,
         dataset_describer: ADBaseDatasetDescriber,
-        plugins: dict[str, NDPluginBaseIO] | None = None,
+        fileio_suffix: str | None = None,
         name: str = "",
+        plugins: dict[str, NDPluginBaseIO] | None = None,
     ) -> tuple[ADWriterT, NDFileIOT]:
         try:
             fileio_cls = get_args(cls.__orig_bases__[0])[0]  # type: ignore
         except IndexError as err:
             raise RuntimeError("File IO class for writer not specified!") from err
 
-        fileio = fileio_cls(prefix, name=name)
+        if fileio_suffix is None:
+            fileio_prefix = prefix + cls.default_suffix
+        else:
+            fileio_prefix = prefix + fileio_suffix
+
+        fileio = fileio_cls(fileio_prefix, name=name)
+
         writer = cls(
             fileio, path_provider, name_provider, dataset_describer, plugins=plugins
         )

src/ophyd_async/epics/adkinetix/_kinetix.py

@@ -1,7 +1,13 @@
 from collections.abc import Sequence
 
 from ophyd_async.core import PathProvider, SignalR
-from ophyd_async.epics.adcore import ADHDFWriter, ADWriter, AreaDetector, NDPluginBaseIO
+from ophyd_async.epics.adcore import (
+    ADBaseDatasetDescriber,
+    ADHDFWriter,
+    ADWriter,
+    AreaDetector,
+    NDPluginBaseIO,
+)
 
 from ._kinetix_controller import KinetixController
 
@@ -26,16 +32,23 @@ def __init__(
         controller, driver = KinetixController.controller_and_drv(
             prefix + drv_suffix, name=name
         )
+        writer, fileio = writer_cls.writer_and_io(
+            prefix,
+            path_provider,
+            lambda: name,
+            ADBaseDatasetDescriber(driver),
+            fileio_suffix=fileio_suffix,
+            plugins=plugins,
+        )
 
         super().__init__(
-            prefix=prefix,
             driver=driver,
             controller=controller,
-            writer_cls=writer_cls,
-            path_provider=path_provider,
+            fileio=fileio,
+            writer=writer,
             plugins=plugins,
             name=name,
-            fileio_suffix=fileio_suffix,
             config_sigs=config_sigs,
         )
         self.drv = driver
+        self.fileio = fileio

src/ophyd_async/epics/adpilatus/_pilatus.py

@@ -3,7 +3,7 @@
 from ophyd_async.core import PathProvider
 from ophyd_async.core._signal import SignalR
 from ophyd_async.epics.adcore._core_detector import AreaDetector
-from ophyd_async.epics.adcore._core_io import NDPluginBaseIO
+from ophyd_async.epics.adcore._core_io import ADBaseDatasetDescriber, NDPluginBaseIO
 from ophyd_async.epics.adcore._core_writer import ADWriter
 from ophyd_async.epics.adcore._hdf_writer import ADHDFWriter
 
@@ -28,16 +28,23 @@ def __init__(
         controller, driver = PilatusController.controller_and_drv(
             prefix + drv_suffix, name=name, readout_time=readout_time
         )
+        writer, fileio = writer_cls.writer_and_io(
+            prefix,
+            path_provider,
+            lambda: name,
+            ADBaseDatasetDescriber(driver),
+            fileio_suffix=fileio_suffix,
+            plugins=plugins,
+        )
 
         super().__init__(
-            prefix=prefix,
             driver=driver,
             controller=controller,
-            writer_cls=writer_cls,
-            path_provider=path_provider,
+            fileio=fileio,
+            writer=writer,
             plugins=plugins,
             name=name,
-            fileio_suffix=fileio_suffix,
             config_sigs=config_sigs,
         )
         self.drv = driver
+        self.fileio = fileio

src/ophyd_async/epics/adsimdetector/_sim.py

@@ -31,15 +31,23 @@ def __init__(
         controller, driver = SimController.controller_and_drv(
             prefix + drv_suffix, name=name
         )
+        writer, fileio = writer_cls.writer_and_io(
+            prefix,
+            path_provider,
+            lambda: name,
+            adcore.ADBaseDatasetDescriber(driver),
+            fileio_suffix=fileio_suffix,
+            plugins=plugins,
+        )
 
         super().__init__(
-            prefix=prefix,
             driver=driver,
             controller=controller,
-            writer_cls=writer_cls,
-            fileio_suffix=fileio_suffix,
-            path_provider=path_provider,
+            fileio=fileio,
+            writer=writer,
             plugins=plugins,
             name=name,
             config_sigs=config_sigs,
         )
+        self.drv = driver
+        self.fileio = fileio

src/ophyd_async/epics/advimba/_vimba.py

@@ -2,6 +2,7 @@
 
 from ophyd_async.core import PathProvider, SignalR
 from ophyd_async.epics import adcore
+from ophyd_async.epics.adcore._core_io import ADBaseDatasetDescriber
 
 from ._vimba_controller import VimbaController
 
@@ -25,17 +26,23 @@ def __init__(
         controller, driver = VimbaController.controller_and_drv(
             prefix + drv_suffix, name=name
         )
+        writer, fileio = writer_cls.writer_and_io(
+            prefix,
+            path_provider,
+            lambda: name,
+            ADBaseDatasetDescriber(driver),
+            fileio_suffix=fileio_suffix,
+            plugins=plugins,
+        )
 
         super().__init__(
-            prefix=prefix,
             driver=driver,
             controller=controller,
-            writer_cls=writer_cls,
-            path_provider=path_provider,
+            fileio=fileio,
+            writer=writer,
             plugins=plugins,
             name=name,
-            fileio_suffix=fileio_suffix,
             config_sigs=config_sigs,
         )
-
         self.drv = driver
+        self.fileio = fileio

tests/epics/conftest.py

@@ -33,13 +33,18 @@ def generate_ad_standard_det(
                 prefix + "cam1:", name=name
             )
 
-            test_adstandard_det = adcore.AreaDetector[controller_cls, writer_cls](
+            writer, fileio = writer_cls.writer_and_io(
                 prefix,
+                static_path_provider,
+                lambda: name,
+                adcore.ADBaseDatasetDescriber(driver),
+            )
+
+            test_adstandard_det = adcore.AreaDetector[controller_cls, writer_cls](
                 driver,
                 controller,
-                writer_cls,
-                static_path_provider,
-                {},
+                fileio,
+                writer,
                 name=name,
             )