updates that aren't working

Author: danielmaclaren

src/ibex_bluesky_core/devices/dae/_period_settings.py

@@ -7,7 +7,7 @@
 from xml.etree.ElementTree import tostring
 
 from bluesky.protocols import Locatable, Location, Movable
-from ophyd_async.core import AsyncStatus, Device, SignalRW
+from ophyd_async.core import AsyncStatus, StandardReadable, SignalRW
 
 from ibex_bluesky_core.devices import (
     isis_epics_signal_rw,
@@ -116,7 +116,7 @@ def _convert_period_settings_to_xml(current_xml: str, value: DaePeriodSettingsDa
     return tostring(root, encoding="unicode")
 
 
-class DaePeriodSettings(Device, Locatable[DaePeriodSettingsData], Movable[DaePeriodSettingsData]):
+class DaePeriodSettings(StandardReadable, Locatable[DaePeriodSettingsData], Movable[DaePeriodSettingsData]):
     """Subdevice for the DAE hardware period settings."""
 
     def __init__(self, dae_prefix: str, name: str = "") -> None:

src/ibex_bluesky_core/devices/dae/_tcb_settings.py

@@ -7,7 +7,7 @@
 from xml.etree.ElementTree import tostring
 
 from bluesky.protocols import Locatable, Location, Movable
-from ophyd_async.core import AsyncStatus, Device, SignalRW
+from ophyd_async.core import AsyncStatus, SignalRW, StandardReadable
 
 from ibex_bluesky_core.devices import (
     compress_and_hex,
@@ -120,7 +120,7 @@ def _convert_tcb_settings_to_xml(current_xml: str, settings: DaeTCBSettingsData)
     return tostring(root, encoding="unicode")
 
 
-class DaeTCBSettings(Device, Locatable[DaeTCBSettingsData], Movable[DaeTCBSettingsData]):
+class DaeTCBSettings(StandardReadable, Locatable[DaeTCBSettingsData], Movable[DaeTCBSettingsData]):
     """Subdevice for the DAE time channel settings."""
 
     def __init__(self, dae_prefix: str, name: str = "") -> None:

src/ibex_bluesky_core/plan_stubs/dae_table_wrapper.py

@@ -7,10 +7,12 @@
 from bluesky.utils import Msg
 from ophyd_async.plan_stubs import ensure_connected
 
-from ibex_bluesky_core.devices.dae import Dae
+from ibex_bluesky_core.devices.dae import Dae, DaeSettingsData
 
 
-def with_dae_tables(plan: Generator[Msg, None, None], dae: Dae) -> Generator[Msg, None, None]:
+def with_dae_tables(plan: Generator[Msg, None, None], 
+                    dae: Dae, 
+                    new_settings: DaeSettingsData) -> Generator[Msg, None, None]:
     """Wrap a plan with temporary modification to DAE Settings.
 
     Args:
@@ -30,10 +32,8 @@ def _inner() -> Generator[Msg, None, None]:
         nonlocal original_dae_setting
         original_dae_setting = yield from bps.rd(dae.dae_settings)
 
-        yield from plan
+        yield from bps.mv(dae.dae_settings, new_settings)
 
-    def _onexit() -> Generator[Msg, None, None]:
-        nonlocal original_dae_setting
-        yield from bps.mv(dae.dae_settings, original_dae_setting)
+        yield from plan
 
-    return (yield from bpp.finalize_wrapper(_inner(), _onexit()))
+    return (yield from bpp.finalize_wrapper(_inner(), bps.mv(dae.dae_settings, original_dae_setting)))

src/ibex_bluesky_core/plan_stubs/num_periods_wrapper.py

@@ -1,16 +1,19 @@
 """Wrap a plan with temporary modification to Periods Settings."""
 
+import copy
 from collections.abc import Generator
 
 import bluesky.plan_stubs as bps
 import bluesky.preprocessors as bpp
 from bluesky.utils import Msg
 from ophyd_async.plan_stubs import ensure_connected
+from ibex_bluesky_core.devices.dae import DaePeriodSettings, Dae
 
-from ibex_bluesky_core.devices.dae import Dae
 
-
-def with_num_periods(plan: Generator[Msg, None, None], dae: Dae) -> Generator[Msg, None, None]:
+def with_num_periods(
+        plan: Generator[Msg, None, None],
+        dae: Dae,
+        number_of_periods: int) -> Generator[Msg, None, None]:
     """Wrap a plan with temporary modification to Periods Settings.
 
     Args:
@@ -22,18 +25,16 @@ def with_num_periods(plan: Generator[Msg, None, None], dae: Dae) -> Generator[Ms
         settings afterwards.
 
     """
-    yield from ensure_connected(dae)
 
     original_num_periods = None
 
     def _inner() -> Generator[Msg, None, None]:
+        yield from ensure_connected(dae)
         nonlocal original_num_periods
         original_num_periods = yield from bps.rd(dae.number_of_periods)
 
-        yield from plan
+        yield from bps.mv(dae.number_of_periods, number_of_periods)
 
-    def _onexit() -> Generator[Msg, None, None]:
-        nonlocal original_num_periods
-        yield from bps.mv(dae.number_of_periods, original_num_periods)
+        yield from plan
 
-    return (yield from bpp.finalize_wrapper(_inner(), _onexit()))
+    return (yield from bpp.finalize_wrapper(_inner(), bps.mv(dae.number_of_periods, original_num_periods)))

src/ibex_bluesky_core/plan_stubs/time_channels_wrapper.py

@@ -7,10 +7,13 @@
 from bluesky.utils import Msg
 from ophyd_async.plan_stubs import ensure_connected
 
-from ibex_bluesky_core.devices.dae import Dae
 
+from ibex_bluesky_core.devices.dae import Dae, DaeTCBSettingsData
 
-def with_time_channels(plan: Generator[Msg, None, None], dae: Dae) -> Generator[Msg, None, None]:
+
+def with_time_channels(plan: Generator[Msg, None, None], 
+                       dae: Dae,
+                       new_tcb_settings: DaeTCBSettingsData) -> Generator[Msg, None, None]:
     """Wrap a plan with temporary modification to Time Channel Settings.
 
     Args:
@@ -28,12 +31,10 @@ def with_time_channels(plan: Generator[Msg, None, None], dae: Dae) -> Generator[
 
     def _inner() -> Generator[Msg, None, None]:
         nonlocal original_time_channels
-        original_time_channels = yield from bps.rd(dae.tcb_settings)  # type: ignore
+        original_time_channels = yield from bps.rd(dae.tcb_settings)
 
-        yield from plan
+        yield from bps.mv(dae.tcb_settings, new_tcb_settings)
 
-    def _onexit() -> Generator[Msg, None, None]:
-        nonlocal original_time_channels
-        yield from bps.mv(dae.tcb_settings, original_time_channels)
+        yield from plan
 
-    return (yield from bpp.finalize_wrapper(_inner(), _onexit()))
+    return (yield from bpp.finalize_wrapper(_inner(), bps.mv(dae.tcb_settings, original_time_channels)))

tests/devices/test_dae.py

@@ -1028,28 +1028,39 @@ def test_dae_repr():
     assert repr(Dae(prefix="foo", name="bar")) == "Dae(name=bar, prefix=foo)"
 
 
-async def test_num_periods_wrapper(dae: Dae, RE: RunEngine):
+def test_num_periods_wrapper(dae: Dae, RE: RunEngine):
     original_settings = 4
-    modified_settings = 7
 
-    await dae.number_of_periods.set(original_settings)
+    # await dae.number_of_periods.set(original_settings)
+    set_mock_value(dae.number_of_periods.signal, original_settings)
 
-    def _dummy_plan_which_sets_periods(dae):
-        yield from bps.mv(dae.number_of_periods, modified_settings)
+    # t = await dae.number_of_periods.signal.get_value()
 
-        current = yield from bps.rd(dae.number_of_periods)
-        assert current == 7
+    # def _dummy_plan_which_sets_periods(dae):
+    #     current = yield from bps.rd(dae.number_of_periods)
+    #     print("Current number of periods:", current)
 
-    with patch("ibex_bluesky_core.plan_stubs.num_periods_wrapper.ensure_connected"):
-        RE(
-            with_num_periods(
-                _dummy_plan_which_sets_periods(dae),
-                dae=dae,  # type: ignore
-            )
+    #     assert current == 80
+
+    #with patch("ibex_bluesky_core.plan_stubs.num_periods_wrapper.ensure_connected"):
+    # This is needed for the DaeCheckingSignal
+    # set_mock_value(dae.number_of_periods.signal, 80)
+
+    RE(
+        with_num_periods(
+            bps.null(),
+            dae=dae,  # type: ignore
+            number_of_periods = 80,
         )
+    )
+
 
-    result = await dae.number_of_periods.read()
-    assert result["DAE-number_of_periods-signal"]["value"] == original_settings
+    mock_set = get_mock_put(dae.number_of_periods.signal)
+
+    mock_set.assert_called_with(80)
+    mock_set.assert_called_with(original_settings)
+    
+    
 
 
 def test_time_channels_wrapper(dae: Dae, RE: RunEngine):
@@ -1081,6 +1092,7 @@ def _dummy_plan_which_sets_time_units(dae):
     assert after.time_unit == expected_time_units
 
 
+
 def test_dae_table_wrapper(dae: Dae, RE: RunEngine):
     original_settings = initial_dae_settings
     modified_settings = DaeSettingsData(