diff --git a/pyproject.toml b/pyproject.toml index 325802a240..83edb0342a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ description = "Ophyd devices and other utils that could be used across DLS beaml dependencies = [ "click", "ophyd", - "ophyd-async[ca,pva]>=v0.17a4", + "ophyd-async[ca,pva]>=v0.17a5", "bluesky>=1.14.5", "pyepics", "pillow", diff --git a/src/dodal/devices/electron_analyser/base/base_detector.py b/src/dodal/devices/electron_analyser/base/base_detector.py index 9cd56067c5..0b715ba916 100644 --- a/src/dodal/devices/electron_analyser/base/base_detector.py +++ b/src/dodal/devices/electron_analyser/base/base_detector.py @@ -6,7 +6,7 @@ from ophyd_async.core import ( Array1D, AsyncStatus, - DetectorArmLogic, + DetectorAcquireLogic, DetectorTriggerLogic, StandardDetector, derived_signal_r, @@ -60,7 +60,7 @@ class ElectronAnalyserDetector( def __init__( self, - arm_logic: DetectorArmLogic, + acquire_logic: DetectorAcquireLogic, trigger_logic: DetectorTriggerLogic, region_logic: RegionLogic, name: str = "", @@ -74,7 +74,7 @@ def __init__( ) self._region_logic = region_logic # ToDo - Add data logic - self.add_detector_logics(arm_logic, trigger_logic) + self.add_detector_logics(acquire_logic, trigger_logic) self.add_config_signals(self.binding_energy_axis) self.sequence = SequenceHolder() diff --git a/src/dodal/devices/tetramm.py b/src/dodal/devices/tetramm.py index a821fc4a75..7621d33dd3 100644 --- a/src/dodal/devices/tetramm.py +++ b/src/dodal/devices/tetramm.py @@ -2,7 +2,7 @@ from ophyd_async.core import ( AsyncStatus, - DetectorArmLogic, + DetectorAcquireLogic, DetectorTriggerLogic, PathProvider, SignalDict, @@ -119,13 +119,13 @@ async def set_exposure(self, exposure: float): await self.driver.averaging_time.set(samples * sample_time) -class TetrammArmLogic(DetectorArmLogic): +class TetrammArmLogic(DetectorAcquireLogic): def __init__(self, driver: TetrammDriver, writer_acquire: SignalRW): self.driver = driver self.writer_acquire = writer_acquire self.acquire_status: AsyncStatus | None = None - async def arm(self): + async def start_acquiring(self): self.acquire_status = await set_and_wait_for_value( self.driver.acquire, True, @@ -135,7 +135,7 @@ async def arm(self): async def wait_for_idle(self): await wait_for_value(self.writer_acquire, False, timeout=None) - async def disarm(self, on_unstage: bool): + async def ensure_stopped(self): await stop_busy_record(self.driver.acquire) if self.acquire_status: await self.acquire_status