Interface change of StandardDetector and Standard Controller

src/ophyd_async/epics/adpilatus/_pilatus_controller.py

@@ -27,7 +27,7 @@ def __init__(
  ) -> None:
  self._drv = driver
  self._readout_time = readout_time
- self._arm_status: AsyncStatus | None = None
+ self._arm_status: tuple[AsyncStatus, None]
 
  def get_deadtime(self, exposure: float) -> float:
  return self._readout_time
@@ -47,21 +47,22 @@ async def prepare(self, trigger_info: TriggerInfo):
 
  async def arm(self):
  # Standard arm the detector and wait for the acquire PV to be True
- self._arm_status = await adcore.start_acquiring_driver_and_ensure_status(
- self._drv
- )
- # The pilatus has an additional PV that goes True when the camserver
- # is actually ready. Should wait for that too or we risk dropping
- # a frame
- await wait_for_value(
- self._drv.armed,
- True,
- timeout=DEFAULT_TIMEOUT,
+ self._arm_status = await asyncio.gather(
+ adcore.start_acquiring_driver_and_ensure_status(self._drv),
+  # The pilatus has an additional PV that goes True when the camserver
+  # is actually ready. Should wait for that too or we risk dropping
+  # a frame
+  wait_for_value(
+  self._drv.armed,
+  True,
+  timeout=DEFAULT_TIMEOUT,
+ ),
  )
 
  async def wait_for_idle(self):
- if self._arm_status:
- await self._arm_status
+ for status in self._arm_status:
+ if status:
+ await status
 
  @classmethod
  def _get_trigger_mode(cls, trigger: DetectorTrigger) -> PilatusTriggerMode:

src/ophyd_async/epics/eiger/_eiger_controller.py

@@ -52,9 +52,7 @@ async def prepare(self, trigger_info: TriggerInfo):
  )
  await asyncio.gather(*coros)
 
- async def arm(
- self,
- ):
+ async def arm(self):
  # TODO: Detector state should be an enum see https://github.com/DiamondLightSource/eiger-fastcs/issues/43
  self._arm_status = set_and_wait_for_other_value(
  self._drv.arm, 1, self._drv.state, "ready", timeout=DEFAULT_TIMEOUT

src/ophyd_async/fastcs/panda/_control.py

@@ -6,13 +6,15 @@
  wait_for_value,
 )
 from ophyd_async.core._detector import TriggerInfo
+from ophyd_async.core._status import AsyncStatus
 
 from ._block import PcapBlock
 
 
 class PandaPcapController(DetectorControl):
  def __init__(self, pcap: PcapBlock) -> None:
  self.pcap = pcap
+ self._arm_status: tuple[AsyncStatus, None]
 
  def get_deadtime(self, exposure: float) -> float:
  return 0.000000008
@@ -24,8 +26,9 @@ async def prepare(self, trigger_info: TriggerInfo):
  ), "Only constant_gate and variable_gate triggering is supported on the PandA"
 
  async def arm(self):
- await asyncio.gather(self.pcap.arm.set(True))
- await wait_for_value(self.pcap.active, True, timeout=1)
+ self._arm_status = await asyncio.gather(
+ self.pcap.arm.set(True), wait_for_value(self.pcap.active, True, timeout=1)
+ )
 
  async def wait_for_idle(self):
  pass