variable name changes

src/ophyd_async/core/_detector.py

@@ -5,6 +5,7 @@
 from abc import ABC, abstractmethod
 from collections.abc import AsyncGenerator, AsyncIterator, Callable, Iterator, Sequence
 from enum import Enum
+from functools import cached_property
 from typing import (
     Generic,
 )
@@ -70,8 +71,8 @@ class TriggerInfo(BaseModel):
     multiplier: int = 1
 
     @computed_field
-    @property
-    def total_frames(self) -> int:
+    @cached_property
+    def total_number_of_triggers(self) -> int:
         return (
             sum(self.number_of_triggers)
             if isinstance(self.number_of_triggers, list)
@@ -334,10 +335,10 @@ async def kickoff(self):
         assert (
             self._trigger_info and self._number_of_triggers_iter
         ), "Prepare must be called before kickoff!"
-        if self._frames_completed >= self._trigger_info.total_frames:
-            raise Exception(
+        if self._frames_completed >= self._trigger_info.total_number_of_triggers:
+            raise RuntimeError(
                 f"Kickoff called more than the configured number of "
-                f"{self._trigger_info.total_frames} iteration(s)!"
+                f"{self._trigger_info.total_number_of_triggers} iteration(s)!"
             )
         self._frames_to_complete = next(self._number_of_triggers_iter)
         self._frames_completed += self._frames_to_complete
@@ -355,16 +356,11 @@ async def complete(self):
         )
         try:
             async for index in indices_written:
-                target = (
-                    self._frames_to_complete
-                    if isinstance(self._trigger_info.number_of_triggers, list)
-                    else self._trigger_info.number_of_triggers
-                )
                 yield WatcherUpdate(
                     name=self.name,
                     current=index,
                     initial=self._initial_frame,
-                    target=target,
+                    target=self._frames_to_complete,
                     unit="",
                     precision=0,
                     time_elapsed=time.monotonic() - self._fly_start
@@ -375,8 +371,10 @@ async def complete(self):
                     break
         finally:
             await indices_written.aclose()
-            if self._frames_completed == self._trigger_info.total_frames:
+            if self._frames_completed == self._trigger_info.total_number_of_triggers:
                 self._frames_completed = 0
+                self._frames_to_complete = 0
+                self._number_of_triggers_iter = None
                 await self.controller.wait_for_idle()
 
     async def describe_collect(self) -> dict[str, DataKey]:

src/ophyd_async/epics/adaravis/_aravis_controller.py

@@ -30,7 +30,7 @@ def get_deadtime(self, exposure: float | None) -> float:
         return _HIGHEST_POSSIBLE_DEADTIME
 
     async def prepare(self, trigger_info: TriggerInfo):
-        if trigger_info.total_frames == 0:
+        if trigger_info.total_number_of_triggers == 0:
             image_mode = adcore.ImageMode.continuous
         else:
             image_mode = adcore.ImageMode.multiple
@@ -43,7 +43,7 @@ async def prepare(self, trigger_info: TriggerInfo):
 
         await asyncio.gather(
             self._drv.trigger_source.set(trigger_source),
-            self._drv.num_images.set(trigger_info.total_frames),
+            self._drv.num_images.set(trigger_info.total_number_of_triggers),
             self._drv.image_mode.set(image_mode),
         )
 

src/ophyd_async/epics/adkinetix/_kinetix_controller.py

@@ -29,7 +29,7 @@ def get_deadtime(self, exposure: float | None) -> float:
     async def prepare(self, trigger_info: TriggerInfo):
         await asyncio.gather(
             self._drv.trigger_mode.set(KINETIX_TRIGGER_MODE_MAP[trigger_info.trigger]),
-            self._drv.num_images.set(trigger_info.total_frames),
+            self._drv.num_images.set(trigger_info.total_number_of_triggers),
             self._drv.image_mode.set(adcore.ImageMode.multiple),
         )
         if trigger_info.livetime is not None and trigger_info.trigger not in [

src/ophyd_async/epics/adpilatus/_pilatus_controller.py

@@ -40,7 +40,9 @@ async def prepare(self, trigger_info: TriggerInfo):
         await asyncio.gather(
             self._drv.trigger_mode.set(self._get_trigger_mode(trigger_info.trigger)),
             self._drv.num_images.set(
-                999_999 if trigger_info.total_frames == 0 else trigger_info.total_frames
+                999_999
+                if trigger_info.total_number_of_triggers == 0
+                else trigger_info.total_number_of_triggers
             ),
             self._drv.image_mode.set(adcore.ImageMode.multiple),
         )

src/ophyd_async/epics/adsimdetector/_sim_controller.py

@@ -32,7 +32,7 @@ async def prepare(self, trigger_info: TriggerInfo):
             DEFAULT_TIMEOUT + await self.driver.acquire_time.get_value()
         )
         await asyncio.gather(
-            self.driver.num_images.set(trigger_info.total_frames),
+            self.driver.num_images.set(trigger_info.total_number_of_triggers),
             self.driver.image_mode.set(adcore.ImageMode.multiple),
         )
 

src/ophyd_async/epics/advimba/_vimba_controller.py

@@ -37,7 +37,7 @@ async def prepare(self, trigger_info: TriggerInfo):
         await asyncio.gather(
             self._drv.trigger_mode.set(TRIGGER_MODE[trigger_info.trigger]),
             self._drv.exposure_mode.set(EXPOSE_OUT_MODE[trigger_info.trigger]),
-            self._drv.num_images.set(trigger_info.total_frames),
+            self._drv.num_images.set(trigger_info.total_number_of_triggers),
             self._drv.image_mode.set(adcore.ImageMode.multiple),
         )
         if trigger_info.livetime is not None and trigger_info.trigger not in [

src/ophyd_async/epics/eiger/_eiger_controller.py

@@ -41,7 +41,7 @@ async def prepare(self, trigger_info: TriggerInfo):
             self._drv.trigger_mode.set(
                 EIGER_TRIGGER_MODE_MAP[trigger_info.trigger].value
             ),
-            self._drv.num_images.set(trigger_info.total_frames),
+            self._drv.num_images.set(trigger_info.total_number_of_triggers),
         ]
         if trigger_info.livetime is not None:
             coros.extend(

src/ophyd_async/sim/demo/_pattern_detector/_pattern_detector_controller.py

@@ -34,7 +34,7 @@ async def arm(self):
             self._coroutine_for_image_writing(
                 self._trigger_info.livetime,
                 self.period,
-                self._trigger_info.total_frames,
+                self._trigger_info.total_number_of_triggers,
             )
         )