Amend references to old enum names

Author: shihab-dls

src/ophyd_async/plan_stubs/_nd_attributes.py

@@ -5,8 +5,8 @@
 
 from ophyd_async.core import Device
 from ophyd_async.epics.adcore import (
+    ADNDAttributeDataType,
     NDArrayBaseIO,
-    NDAttributeDataType,
     NDAttributeParam,
     NDAttributePv,
     NDFileHDFIO,
@@ -66,7 +66,7 @@ def setup_ndstats_sum(detector: Device):
                 NDAttributeParam(
                     name=f"{detector.name}-sum",
                     param="NDPluginStatsTotal",
-                    datatype=NDAttributeDataType.DOUBLE,
+                    datatype=ADNDAttributeDataType.DOUBLE,
                     description="Sum of the array",
                 )
             ],

tests/epics/adcore/test_single_trigger.py

@@ -39,7 +39,7 @@ def plan():
         yield from bps.abs_set(single_trigger_det_with_stats.drv.acquire_time, 0.5)
         yield from bps.abs_set(single_trigger_det_with_stats.drv.array_counter, 1)
         yield from bps.abs_set(
-            single_trigger_det_with_stats.drv.image_mode, adcore.ImageMode.CONTINUOUS
+            single_trigger_det_with_stats.drv.image_mode, adcore.ADImageMode.CONTINUOUS
         )
         # set_mock_value(stats.unique_id, 3)
         yield from bp.count([single_trigger_det_with_stats])
@@ -48,7 +48,7 @@ def plan():
 
     drv = single_trigger_det_with_stats.drv
     assert 1 == await drv.acquire.get_value()
-    assert adcore.ImageMode.SINGLE == await drv.image_mode.get_value()
+    assert adcore.ADImageMode.SINGLE == await drv.image_mode.get_value()
     assert True is await drv.wait_for_plugins.get_value()
 
     assert names == ["start", "descriptor", "event", "stop"]

tests/epics/adcore/test_writers.py

@@ -214,14 +214,14 @@ async def test_nd_attributes_plan_stub(RE, detectors):
         param = adcore.NDAttributeParam(
             name=f"{detector.name}-sum",
             param="sum",
-            datatype=adcore.NDAttributeDataType.DOUBLE,
+            datatype=adcore.ADNDAttributeDataType.DOUBLE,
             description=f"Sum of {detector.name} frame",
         )
         pv = adcore.NDAttributePv(
             name="Temperature",
             signal=epics_signal_r(str, "LINKAM:TEMP"),
             description="The sample temperature",
-            dbrtype=adcore.NDAttributePvDbrType.DBR_FLOAT,
+            dbrtype=adcore.ADNDAttributePvDbrType.DBR_FLOAT,
         )
         RE(setup_ndattributes(detector.fileio, [pv, param]))
         text = await detector.fileio.nd_attributes_file.get_value()

tests/epics/adsimdetector/test_sim.py

@@ -172,13 +172,15 @@ def plan():
 
         drv = controller_a.driver
         assert False is (yield from bps.rd(drv.acquire))
-        assert adcore.ImageMode.MULTIPLE == (yield from bps.rd(drv.image_mode))
+        assert adcore.ADImageMode.MULTIPLE == (yield from bps.rd(drv.image_mode))
 
         hdfb = cast(adcore.NDFileHDFIO, writer_b.fileio)
         assert True is (yield from bps.rd(hdfb.lazy_open))
         assert True is (yield from bps.rd(hdfb.swmr_mode))
         assert 0 == (yield from bps.rd(hdfb.num_capture))
-        assert adcore.FileWriteMode.STREAM == (yield from bps.rd(hdfb.file_write_mode))
+        assert adcore.ADFileWriteMode.STREAM == (
+            yield from bps.rd(hdfb.file_write_mode)
+        )
 
         assert (yield from bps.rd(writer_a.fileio.file_path)) == str(
             info_a.directory_path
@@ -392,7 +394,7 @@ async def test_ad_sim_controller(test_adsimdetector: adsimdetector.SimDetector):
 
     driver = ad.driver
     assert await driver.num_images.get_value() == 1
-    assert await driver.image_mode.get_value() == adcore.ImageMode.MULTIPLE
+    assert await driver.image_mode.get_value() == adcore.ADImageMode.MULTIPLE
     assert await driver.acquire.get_value() is True
 
     await ad.disarm()