ophyd-async 0.10.1__py3-none-any.whl → 0.11__py3-none-any.whl

ophyd_async/epics/pmac/_pmac_io.py

@@ -0,0 +1,100 @@
+from collections.abc import Sequence
+
+import numpy as np
+
+from ophyd_async.core import Array1D, Device, DeviceVector, StandardReadable
+from ophyd_async.epics.core import epics_signal_r, epics_signal_rw
+
+CS_LETTERS = "ABCUVWXYZ"
+
+
+class PmacTrajectoryIO(StandardReadable):
+    """Device that moves a PMAC Motor record."""
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        self.time_array = epics_signal_rw(
+            Array1D[np.float64], prefix + ":ProfileTimeArray"
+        )
+        self.user_array = epics_signal_rw(Array1D[np.int32], prefix + ":UserArray")
+        # 1 indexed CS axes so we can index into them from the compound motor input link
+        self.positions = DeviceVector(
+            {
+                i + 1: epics_signal_rw(
+                    Array1D[np.float64], f"{prefix}:{letter}:Positions"
+                )
+                for i, letter in enumerate(CS_LETTERS)
+            }
+        )
+        self.use_axis = DeviceVector(
+            {
+                i + 1: epics_signal_rw(bool, f"{prefix}:{letter}:UseAxis")
+                for i, letter in enumerate(CS_LETTERS)
+            }
+        )
+        self.velocities = DeviceVector(
+            {
+                i + 1: epics_signal_rw(
+                    Array1D[np.float64], f"{prefix}:{letter}:Velocities"
+                )
+                for i, letter in enumerate(CS_LETTERS)
+            }
+        )
+        self.points_to_build = epics_signal_rw(int, prefix + ":ProfilePointsToBuild")
+        self.build_profile = epics_signal_rw(bool, prefix + ":ProfileBuild")
+        self.execute_profile = epics_signal_rw(bool, prefix + ":ProfileExecute")
+        self.scan_percent = epics_signal_r(float, prefix + ":TscanPercent_RBV")
+        self.abort_profile = epics_signal_rw(bool, prefix + ":ProfileAbort")
+        self.profile_cs_name = epics_signal_rw(str, prefix + ":ProfileCsName")
+        self.calculate_velocities = epics_signal_rw(bool, prefix + ":ProfileCalcVel")
+
+        super().__init__(name=name)
+
+
+class PmacAxisIO(Device):
+    """A Device that (direct) moves a PMAC Coordinate System Motor.
+
+    Note that this does not go through a motor record.
+    """
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        self.cs_axis_letter = epics_signal_r(str, f"{prefix}:CsAxis_RBV")
+        self.cs_port = epics_signal_r(str, f"{prefix}:CsPort_RBV")
+        super().__init__(name=name)
+
+
+class PmacCoordIO(Device):
+    """A Device that represents a Pmac Coordinate System."""
+
+    def __init__(self, prefix: str, name: str = "") -> None:
+        self.defer_moves = epics_signal_r(bool, f"{prefix}:DeferMoves")
+        self.cs_axis_setpoint = DeviceVector(
+            {
+                i + 1: epics_signal_rw(
+                    Array1D[np.float64], f"{prefix}:M{i + 1}:DirectDemand"
+                )
+                for i in range(len(CS_LETTERS))
+            }
+        )
+        super().__init__(name=name)
+
+
+class PmacIO(Device):
+    """Device that represents a pmac controller."""
+
+    def __init__(
+        self,
+        prefix: str,
+        axis_nums: Sequence[int],
+        coord_nums: Sequence[int],
+        name: str = "",
+    ) -> None:
+        self.axis = DeviceVector(
+            {axis: PmacAxisIO(f"{prefix}:M{axis}") for axis in axis_nums}
+        )
+        self.coord = DeviceVector(
+            {coord: PmacCoordIO(f"{prefix}:CS{coord}") for coord in coord_nums}
+        )
+        # Trajectory PVs have the same prefix as the pmac device
+        self.trajectory = PmacTrajectoryIO(prefix)
+
+        super().__init__(name=name)

ophyd_async/fastcs/eiger/__init__.py

@@ -1,4 +1,4 @@
-from ._eiger import EigerDetector, EigerTriggerInfo
+from ._eiger import EigerDetector
 from ._eiger_controller import EigerController
 from ._eiger_io import EigerDetectorIO, EigerDriverIO, EigerMonitorIO, EigerStreamIO
 
@@ -6,7 +6,6 @@ __all__ = [
     "EigerDetector",
     "EigerController",
     "EigerDriverIO",
-    "EigerTriggerInfo",
     "EigerDetectorIO",
     "EigerMonitorIO",
     "EigerStreamIO",

ophyd_async/fastcs/eiger/_eiger.py

@@ -1,5 +1,3 @@
-from pydantic import Field
-
 from ophyd_async.core import (
     AsyncStatus,
     PathProvider,
@@ -12,10 +10,6 @@ from ._eiger_controller import EigerController
 from ._eiger_io import EigerDriverIO
 
 
-class EigerTriggerInfo(TriggerInfo):
-    energy_ev: float = Field(gt=0)
-
-
 class EigerDetector(StandardDetector):
     """Ophyd-async implementation of an Eiger Detector."""
 
@@ -28,10 +22,11 @@ class EigerDetector(StandardDetector):
         path_provider: PathProvider,
         drv_suffix="-EA-EIGER-01:",
         hdf_suffix="-EA-EIGER-01:OD:",
+        odin_nodes: int = 4,
         name="",
     ):
         self.drv = EigerDriverIO(prefix + drv_suffix)
-        self.odin = Odin(prefix + hdf_suffix)
+        self.odin = Odin(prefix + hdf_suffix, nodes=odin_nodes)
 
         super().__init__(
             EigerController(self.drv),
@@ -44,6 +39,5 @@ class EigerDetector(StandardDetector):
         )
 
     @AsyncStatus.wrap
-    async def prepare(self, value: EigerTriggerInfo) -> None:  # type: ignore
-        await self._controller.set_energy(value.energy_ev)
+    async def prepare(self, value: TriggerInfo) -> None:
         await super().prepare(value)

ophyd_async/fastcs/panda/_trigger.py

@@ -1,8 +1,8 @@
 import asyncio
 
-from pydantic import BaseModel, Field
+from pydantic import Field
 
-from ophyd_async.core import FlyerController, wait_for_value
+from ophyd_async.core import ConfinedModel, FlyerController, wait_for_value
 
 from ._block import (
     PandaBitMux,
@@ -14,7 +14,7 @@ from ._block import (
 from ._table import SeqTable
 
 
-class SeqTableInfo(BaseModel):
+class SeqTableInfo(ConfinedModel):
     """Info for the PandA `SeqTable` for flyscanning."""
 
     sequence_table: SeqTable = Field(strict=True)
@@ -51,7 +51,7 @@ class StaticSeqTableTriggerLogic(FlyerController[SeqTableInfo]):
         await wait_for_value(self.seq.active, False, timeout=1)
 
 
-class PcompInfo(BaseModel):
+class PcompInfo(ConfinedModel):
     """Info for the PandA `PcompBlock` for flyscanning."""
 
     start_postion: int = Field(description="start position in counts")

ophyd_async/fastcs/panda/_writer.py

@@ -33,12 +33,12 @@ class PandaHDFWriter(DetectorWriter):
 
     # Triggered on PCAP arm
     async def open(self, name: str, exposures_per_event: int = 1) -> dict[str, DataKey]:
+        self._composer = None
         """Retrieve and get descriptor of all PandA signals marked for capture."""
         self._exposures_per_event = exposures_per_event
         # Ensure flushes are immediate
         await self.panda_data_block.flush_period.set(0)
 
-        self._composer = None
         info = self._path_provider(device_name=name)
 
         # Set create dir depth first to guarantee that callback when setting
@@ -64,7 +64,15 @@ class PandaHDFWriter(DetectorWriter):
         # Wait for it to start, stashing the status that tells us when it finishes
         await self.panda_data_block.capture.set(True)
 
-        return await self._describe(name)
+        describe = await self._describe(name)
+
+        self._composer = HDFDocumentComposer(
+            Path(await self.panda_data_block.hdf_directory.get_value())
+            / Path(await self.panda_data_block.hdf_file_name.get_value()),
+            self._datasets,
+        )
+
+        return describe
 
     async def _describe(self, name: str) -> dict[str, DataKey]:
         """Return a describe based on the datasets PV."""
@@ -145,17 +153,11 @@ class PandaHDFWriter(DetectorWriter):
         self, name: str, indices_written: int
     ) -> AsyncIterator[StreamAsset]:
         # TODO: fail if we get dropped frames
-        if indices_written:
-            if not self._composer:
-                self._composer = HDFDocumentComposer(
-                    Path(await self.panda_data_block.hdf_directory.get_value())
-                    / Path(await self.panda_data_block.hdf_file_name.get_value()),
-                    self._datasets,
-                )
-                for doc in self._composer.stream_resources():
-                    yield "stream_resource", doc
-            for doc in self._composer.stream_data(indices_written):
-                yield "stream_datum", doc
+        if self._composer is None:
+            msg = f"open() not called on {self}"
+            raise RuntimeError(msg)
+        for doc in self._composer.make_stream_docs(indices_written):
+            yield doc
 
     # Could put this function as default for StandardDetector
     async def close(self):

ophyd_async/sim/__init__.py

@@ -8,14 +8,13 @@ from ._mirror_vertical import (
     TwoJackTransform,
     VerticalMirror,
 )
-from ._motor import FlySimMotorInfo, SimMotor
+from ._motor import SimMotor
 from ._pattern_generator import PatternGenerator
 from ._point_detector import SimPointDetector
 from ._stage import SimStage
 
 __all__ = [
     "SimMotor",
-    "FlySimMotorInfo",
     "SimStage",
     "PatternGenerator",
     "SimPointDetector",

ophyd_async/sim/_blob_detector_writer.py

@@ -52,7 +52,7 @@ class BlobDetectorWriter(DetectorWriter):
                 chunk_shape=(1024,),
             ),
         ]
-        self.composer = None
+        self.composer = HDFDocumentComposer(self.path, self.datasets)
         describe = {
             ds.data_key: DataKey(
                 source="sim://pattern-generator-hdf-file",
@@ -85,17 +85,11 @@ class BlobDetectorWriter(DetectorWriter):
         self, name: str, indices_written: int
     ) -> AsyncIterator[StreamAsset]:
         # When we have written something to the file
-        if indices_written:
-            # Only emit stream resource the first time we see frames in
-            # the file
-            if not self.composer:
-                if not self.path:
-                    raise RuntimeError(f"open() not called on {self}")
-                self.composer = HDFDocumentComposer(self.path, self.datasets)
-                for doc in self.composer.stream_resources():
-                    yield "stream_resource", doc
-            for doc in self.composer.stream_data(indices_written):
-                yield "stream_datum", doc
+        if self.composer is None:
+            msg = f"open() not called on {self}"
+            raise RuntimeError(msg)
+        for doc in self.composer.make_stream_docs(indices_written):
+            yield doc
 
     async def close(self) -> None:
         self.pattern_generator.close_file()

ophyd_async/sim/_mirror_horizontal.py

@@ -3,7 +3,7 @@ from typing import TypedDict
 
 from bluesky.protocols import Movable
 
-from ophyd_async.core import AsyncStatus, DerivedSignalFactory, Device, soft_signal_rw
+from ophyd_async.core import AsyncStatus, DerivedSignalFactory, Device
 
 from ._mirror_vertical import TwoJackDerived, TwoJackTransform
 from ._motor import SimMotor
@@ -20,7 +20,8 @@ class HorizontalMirror(Device, Movable):
         self.x1 = SimMotor()
         self.x2 = SimMotor()
         # Parameter
-        self.x1_x2_distance = soft_signal_rw(float, initial_value=1)
+        # This could also be set as 'soft_signal_rw(float, initial_value=1)'
+        self.x1_x2_distance = 1.0
         # Derived signals
         self._factory = DerivedSignalFactory(
             TwoJackTransform,

ophyd_async/sim/_mirror_vertical.py

@@ -51,6 +51,7 @@ class VerticalMirror(Device, Movable[TwoJackDerived]):
         self.y1 = SimMotor()
         self.y2 = SimMotor()
         # Parameter
+        # This could also be set as '1.0', if constant.
         self.y1_y2_distance = soft_signal_rw(float, initial_value=1)
         # Derived signals
         self._factory = DerivedSignalFactory(

ophyd_async/sim/_motor.py

@@ -4,14 +4,15 @@ import time
 
 import numpy as np
 from bluesky.protocols import Locatable, Location, Reading, Stoppable, Subscribable
-from pydantic import BaseModel, ConfigDict, Field
 
 from ophyd_async.core import (
     AsyncStatus,
     Callback,
+    FlyMotorInfo,
     StandardReadable,
     WatchableAsyncStatus,
     WatcherUpdate,
+    error_if_none,
     observe_value,
     soft_signal_r_and_setter,
     soft_signal_rw,
@@ -19,37 +20,6 @@ from ophyd_async.core import (
 from ophyd_async.core import StandardReadableFormat as Format
 
 
-class FlySimMotorInfo(BaseModel):
-    """Minimal set of information required to fly a [](#SimMotor)."""
-
-    model_config = ConfigDict(frozen=True)
-
-    cv_start: float
-    """Absolute position of the motor once it finishes accelerating to desired
-    velocity, in motor EGUs"""
-
-    cv_end: float
-    """Absolute position of the motor once it begins decelerating from desired
-    velocity, in EGUs"""
-
-    cv_time: float = Field(gt=0)
-    """Time taken for the motor to get from start_position to end_position, excluding
-    run-up and run-down, in seconds."""
-
-    @property
-    def velocity(self) -> float:
-        """Calculate the velocity of the constant velocity phase."""
-        return (self.cv_end - self.cv_start) / self.cv_time
-
-    def start_position(self, acceleration_time: float) -> float:
-        """Calculate the start position with run-up distance added on."""
-        return self.cv_start - acceleration_time * self.velocity / 2
-
-    def end_position(self, acceleration_time: float) -> float:
-        """Calculate the end position with run-down distance added on."""
-        return self.cv_end + acceleration_time * self.velocity / 2
-
-
 class SimMotor(StandardReadable, Stoppable, Subscribable[float], Locatable[float]):
     """For usage when simulating a motor."""
 
@@ -74,7 +44,7 @@ class SimMotor(StandardReadable, Stoppable, Subscribable[float], Locatable[float
         self._set_success = True
         self._move_status: AsyncStatus | None = None
         # Stored in prepare
-        self._fly_info: FlySimMotorInfo | None = None
+        self._fly_info: FlyMotorInfo | None = None
         # Set on kickoff(), complete when motor reaches end position
         self._fly_status: WatchableAsyncStatus | None = None
 
@@ -86,12 +56,14 @@ class SimMotor(StandardReadable, Stoppable, Subscribable[float], Locatable[float
         self.user_readback.set_name(name)
 
     @AsyncStatus.wrap
-    async def prepare(self, value: FlySimMotorInfo):
+    async def prepare(self, value: FlyMotorInfo):
         """Calculate run-up and move there, setting fly velocity when there."""
         self._fly_info = value
         # Move to start as fast as we can
         await self.velocity.set(0)
-        await self.set(value.start_position(await self.acceleration_time.get_value()))
+        await self.set(
+            value.ramp_up_start_pos(await self.acceleration_time.get_value())
+        )
         # Set the velocity for the actual move
         await self.velocity.set(value.velocity)
 
@@ -111,20 +83,18 @@ class SimMotor(StandardReadable, Stoppable, Subscribable[float], Locatable[float
     @AsyncStatus.wrap
     async def kickoff(self):
         """Begin moving motor from prepared position to final position."""
-        if not self._fly_info:
-            msg = "Motor must be prepared before attempting to kickoff"
-            raise RuntimeError(msg)
+        fly_info = error_if_none(
+            self._fly_info, "Motor must be prepared before attempting to kickoff"
+        )
         acceleration_time = await self.acceleration_time.get_value()
-        self._fly_status = self.set(self._fly_info.end_position(acceleration_time))
+        self._fly_status = self.set(fly_info.ramp_down_end_pos(acceleration_time))
         # Wait for the acceleration time to ensure we are at velocity
         await asyncio.sleep(acceleration_time)
 
     def complete(self) -> WatchableAsyncStatus:
         """Mark as complete once motor reaches completed position."""
-        if not self._fly_status:
-            msg = "kickoff not called"
-            raise RuntimeError(msg)
-        return self._fly_status
+        fly_status = error_if_none(self._fly_status, "kickoff not called")
+        return fly_status
 
     async def _move(self, old_position: float, new_position: float, velocity: float):
         if old_position == new_position:

{ophyd_async-0.10.1.dist-info → ophyd_async-0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.10.1
+Version: 0.11
 Summary: Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
 Author-email: Tom Cobb <tom.cobb@diamond.ac.uk>
 License: BSD 3-Clause License
@@ -70,7 +70,7 @@ Requires-Dist: inflection; extra == "dev"
 Requires-Dist: import-linter; extra == "dev"
 Requires-Dist: myst-parser; extra == "dev"
 Requires-Dist: numpydoc; extra == "dev"
-Requires-Dist: ophyd; extra == "dev"
+Requires-Dist: ophyd>=1.10.7; extra == "dev"
 Requires-Dist: pickleshare; extra == "dev"
 Requires-Dist: pipdeptree; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"

{ophyd_async-0.10.1.dist-info → ophyd_async-0.11.dist-info}/RECORD

@@ -1,36 +1,36 @@
 ophyd_async/__init__.py,sha256=dcAA3qsj1nNIMe5l-v2tlduZ_ypwBmyuHe45Lsq4k4w,206
 ophyd_async/__main__.py,sha256=n_U4O9bgm97OuboUB_9eK7eFiwy8BZSgXJ0OzbE0DqU,481
 ophyd_async/_docs_parser.py,sha256=gPYrigfSbYCF7QoSf2UvE-cpQu4snSssl7ZWN-kKDzI,352
-ophyd_async/_version.py,sha256=StiR6uxiq6hqMzT3MUIl_ZooIq2cetH9oWrHUI_qWFU,513
+ophyd_async/_version.py,sha256=JQGWKvS8mTtWQI0a0XtjLQOyFpNGX620dVCNBNQBiDE,508
 ophyd_async/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ophyd_async/core/__init__.py,sha256=mSoldXL3hou1UifwsUcos2Q3Vy_pAaNJJWdMc0VInyg,4516
-ophyd_async/core/_derived_signal.py,sha256=7ZZrDUnS2DGVwJZNX6_u0u-lAHKHCC7bL5auIfYV9w8,11440
-ophyd_async/core/_derived_signal_backend.py,sha256=AZpyMmt3-ssymtDIa3138qPp1srmaId137A_yzQuFD0,12243
-ophyd_async/core/_detector.py,sha256=PbWpv7lyBvYEJV-prG9qU0DadmxhyzMhQ9oLC0N7vwQ,15193
-ophyd_async/core/_device.py,sha256=QSOgjXkvBpPWE1VhQ21tIC8d9z4Oadr6C_1tk4J21W4,14617
+ophyd_async/core/__init__.py,sha256=RtYk6FdJxc7lxoSReRV1D7weTRYFu9ylhNNd3DyN904,4752
+ophyd_async/core/_derived_signal.py,sha256=TuZza_j3J1Bw4QSqBYB9Ta2FyQP5BycO3nSHVtJ890Q,13015
+ophyd_async/core/_derived_signal_backend.py,sha256=PYyyont_nUR9LBC9eqVwueHCMwLJfQ_F7R_14sivBTU,12510
+ophyd_async/core/_detector.py,sha256=x1o-eSkvemQ-fTk47440owkTmYhuckA2ILNOCoJlHCY,15201
+ophyd_async/core/_device.py,sha256=lSm8FBul9NTn9VO0rsAlV9pctJyUsMdU2ztEf5CqH5M,14716
 ophyd_async/core/_device_filler.py,sha256=MDz8eQQ-eEAwo-UEMxfqPfpcBuMG01tLCGR6utwVnmE,14825
-ophyd_async/core/_flyer.py,sha256=YPCGAokF0GofOOO2OLrsSLoZSXs_RzmmrNglBunA31o,1924
-ophyd_async/core/_hdf_dataset.py,sha256=MKgA-6uxtCg-cxpGKAIxdWOw55CZp66si8lsak5e9CA,2875
+ophyd_async/core/_flyer.py,sha256=Rvoi2AzPwbz-dnt3WlpfJTodgZDiK5cusbutfkbr_8A,3453
+ophyd_async/core/_hdf_dataset.py,sha256=qh4QMJAXuOUQUciLXdMTX9yPnmWp5l-ugGCrJWUXQDQ,2954
 ophyd_async/core/_log.py,sha256=DxKR4Nz3SgTaTzKBZWqt-w48yT8WUAr_3Qr223TEWRw,3587
 ophyd_async/core/_mock_signal_backend.py,sha256=SPdCbVWss6-iL9C3t9u0IvR_Ln9JeDypVd18WlivdjE,3156
 ophyd_async/core/_protocol.py,sha256=wQ_snxhTprHqEjQb1HgFwBljwolMY6A8C3xgV1PXwdU,4051
 ophyd_async/core/_providers.py,sha256=1XuLUw9sT1pKMfH_PsDEpIi1gulla7NfPSp3IR3KfEA,7545
 ophyd_async/core/_readable.py,sha256=iBo1YwA5bsAbzLbznvmSnzKDWUuGkLh850Br3BXsgeU,11707
 ophyd_async/core/_settings.py,sha256=_ZccbXKP7j5rG6-bMKk7aaLr8hChdRDAPY_YSR71XXM,4213
-ophyd_async/core/_signal.py,sha256=1XHhnYwXa0yusSKdaRAiPUoVA5atcWd0S1ztBSaEi9k,27369
+ophyd_async/core/_signal.py,sha256=XXbcitQ6pmQnZUjTfsAvkWXIMS-ybGTRImYBbHAaPR0,27837
 ophyd_async/core/_signal_backend.py,sha256=PvwTbbSVEGqM-2s5BNRrKGwM_MiYL71qMxYAgyZ7wRM,6930
 ophyd_async/core/_soft_signal_backend.py,sha256=zrE7H2ojHY6oQBucLkFgukszrkdvbIZuavLjEUqc_xM,6227
 ophyd_async/core/_status.py,sha256=h4TtWFM7wFtpxxyAYYSITgcVzArYZdYBHbya6qIX5t0,6553
-ophyd_async/core/_table.py,sha256=l5GzL3La68ZkXpcOOVntnYr8ofFV8kWGr1hzY1ek83w,6897
-ophyd_async/core/_utils.py,sha256=742wGL3cJD4wlDlNlS-KAbaTN5FkYDY7RXU7m6wpYaw,11737
-ophyd_async/core/_yaml_settings.py,sha256=txy4_Igbsr8Yo132yv8jnCcsLpal8klM7DcPNow2KBs,2078
+ophyd_async/core/_table.py,sha256=ai-_W-_WMZcy9f69BDYRv9vjVl-AVeOPN_uHYoGCSsc,6905
+ophyd_async/core/_utils.py,sha256=fePvt3g7eQ6CRQcMVkMeqxcbvYZboZ2sf1fVVZL-26M,12450
+ophyd_async/core/_yaml_settings.py,sha256=Qojhku9l5kPSkTnEylCRWTe0gpw6S_XP5av5dPpqFgQ,2089
 ophyd_async/epics/__init__.py,sha256=ou4yEaH9VZHz70e8oM614-arLMQvUfQyXhRJsnEpWn8,60
-ophyd_async/epics/motor.py,sha256=OgfETz_7wCLmG4WCYDpaYyUB4TomDFyCyZzwyhW1Tiw,10549
+ophyd_async/epics/motor.py,sha256=pdXaXo4kpJAEZGXXtBxbNdnfPppqyplpP0jFsdyWVkA,8473
 ophyd_async/epics/signal.py,sha256=0A-supp9ajr63O6aD7F9oG0-Q26YmRjk-ZGh57-jo1Y,239
-ophyd_async/epics/adandor/__init__.py,sha256=qsBoZdljSaqM-kJSvTf0uq5TNwXAih9lP3yOZpKxOFQ,204
+ophyd_async/epics/adandor/__init__.py,sha256=dlitllrAdhvh16PAcVMUSSEytTDNMu6_HuYk8KD1EoY,343
 ophyd_async/epics/adandor/_andor.py,sha256=SxAIP9OLefUqKcxrxhjNzil5D8-59Ps0vADdR6scO44,1281
-ophyd_async/epics/adandor/_andor_controller.py,sha256=QojcPUIKpGL6RHuoqy5OCqLpBwzMsm81ciQDWp1cSCo,1758
-ophyd_async/epics/adandor/_andor_io.py,sha256=L1HmugU6sHK3F_pT0LaN3U1hKlDkzmSwdqr6-LHieTg,1036
+ophyd_async/epics/adandor/_andor_controller.py,sha256=i0AwWdk9tqB802C9d5gTgYugZ1UOcJCQLk130gVQNeo,1779
+ophyd_async/epics/adandor/_andor_io.py,sha256=DOrni8vcncQ3lW1JOpXo_jwMCLx1qsggbg6FXlsl5Ew,819
 ophyd_async/epics/adaravis/__init__.py,sha256=ZQaJVQiwcQn9hUZADrYgBE1sDfFEwjhVBJRPth1_LBo,395
 ophyd_async/epics/adaravis/_aravis.py,sha256=Ju2wuebz9_ovl-Kza39s5VQ1pV-Omt_BaIWKqP4kcGA,1315
 ophyd_async/epics/adaravis/_aravis_controller.py,sha256=WiFR7_FAAu6_88zG-yzGLsR9YcO4L6xR73Wnjw9n0i4,1908
@@ -40,7 +40,7 @@ ophyd_async/epics/adcore/_core_detector.py,sha256=mRDaHgXCTZF-MIVsU1csoQx9jObutY
 ophyd_async/epics/adcore/_core_io.py,sha256=jm4gQUSq727xnPriuH6jFHqlDBZceKxr_XyBNj5F65U,7392
 ophyd_async/epics/adcore/_core_logic.py,sha256=IH7iOSVIsVj4e97ClhdBFpmdMkb8TznSaLkd3ohEhUs,8884
 ophyd_async/epics/adcore/_core_writer.py,sha256=S58plRmbNzig-r7gubKjDVDni_nf4CASaV1OJvudbHw,8019
-ophyd_async/epics/adcore/_hdf_writer.py,sha256=GW_3NKRTF3kc9Wwz6vf5a7eqlnl81LXgk8afLgZaeNU,6134
+ophyd_async/epics/adcore/_hdf_writer.py,sha256=FYM84XYFVH6m2lM3CmZiyW1Eb-chUWLyjHUz3YhH9EQ,5743
 ophyd_async/epics/adcore/_jpeg_writer.py,sha256=7XC4Twx_MaCBjeol27UA-hStOCQEjkEAb3ToVMPUlZ8,670
 ophyd_async/epics/adcore/_single_trigger.py,sha256=tFGLT1b_rZzAvbqWP-hyCccxJMRY26T5IER-VAqKXmc,1275
 ophyd_async/epics/adcore/_tiff_writer.py,sha256=Na30osfkgrq4VQhUzDcuS52Gy7FS08CzbgEmKwljTmk,671
@@ -80,7 +80,9 @@ ophyd_async/epics/demo/motor.db,sha256=3xb6WTXo4crrvk-M8Y16G9pUidp27vD5vIKKBpLTU
 ophyd_async/epics/demo/point_detector.db,sha256=8kBa3XKpmfXCxetT4tq5_RFXa_XqS1Z2ZNzsa2AtLds,1366
 ophyd_async/epics/demo/point_detector_channel.db,sha256=FZ9H6HjqplhcF2jgimv_dT1nn-CBlfjs7Y--iCfHp5Y,632
 ophyd_async/epics/eiger/__init__.py,sha256=7kRqVzwoD8PVtp7Nj9iQWlgbLeoWE_8oiq-B0kixwTE,93
-ophyd_async/epics/eiger/_odin_io.py,sha256=4JHHeQ2R6ukq_JROGFeWVpez1UZqKpmWP1jaDCA71gQ,5567
+ophyd_async/epics/eiger/_odin_io.py,sha256=vbIvMONlCyjI78tpyQGMIvWRX1Q2fASRRgln63N2lDY,5704
+ophyd_async/epics/pmac/__init__.py,sha256=RWqo5nYE2MMBdwvMxdeVG213MN38b9VPlpDHQWul8QQ,143
+ophyd_async/epics/pmac/_pmac_io.py,sha256=yMQpZ0Osh4l8VRd2aqWQE9ebJDfh5FwM_0pp1pe8-C0,3564
 ophyd_async/epics/testing/__init__.py,sha256=aTIv4D2DYrpnGco5RQF8QuLG1SfFkIlTyM2uYEKXltA,522
 ophyd_async/epics/testing/_example_ioc.py,sha256=uUmfMXV_Pd2SMFyb0y_4uTc6gkGRUqU1cJ-XQC2ROW8,3915
 ophyd_async/epics/testing/_utils.py,sha256=6sqJ0BCwubSkK-WOJbmpKNqZKG0AmCoevzaMGaRmuJs,1702
@@ -88,8 +90,8 @@ ophyd_async/epics/testing/test_records.db,sha256=SgWQPZgtmc__JiLkH2VPwe5KZOua6ZC
 ophyd_async/epics/testing/test_records_pva.db,sha256=HJAJSvLtPWG5B5dKv8OZ0_hPJxRFrDoYp6ROcF2lqyA,4202
 ophyd_async/fastcs/__init__.py,sha256=qlIM9-pjJ8yWfnzTM9-T9cw7zQLKjeeNROQTni5Dr6M,80
 ophyd_async/fastcs/core.py,sha256=pL_srtTrfuoBHUjDFpxES92owFq9M4Jve0Skk1oeuFA,517
-ophyd_async/fastcs/eiger/__init__.py,sha256=kwYs1PuetEOTeNcFNxtyhTvfbJvWCOu8wtEw3Knotuw,354
-ophyd_async/fastcs/eiger/_eiger.py,sha256=5mpao2j2Xc11OuecvimPTmZ9mkEndzgMlDj1x-K-5hg,1241
+ophyd_async/fastcs/eiger/__init__.py,sha256=RxwOFjERKy5tUD_IDGCGuMh716FaZgCq7R9elPixBwo,312
+ophyd_async/fastcs/eiger/_eiger.py,sha256=nTK48deELmZn9x4Pd8QlyH6qYpbThbUTiXTwjfY6eB8,1106
 ophyd_async/fastcs/eiger/_eiger_controller.py,sha256=Cucj-1M-1CaxSJxHZmHs3f_OXwtTIspcqUFhRNGzn_E,2361
 ophyd_async/fastcs/eiger/_eiger_io.py,sha256=KS1ppYt6PJvPpHiR2AaDaPAhkhYwC2ei8VuZnBBiBs8,1216
 ophyd_async/fastcs/odin/__init__.py,sha256=da1PTClDMl-IBkrSvq6JC1lnS-K_BASzCvxVhNxN5Ls,13
@@ -98,8 +100,8 @@ ophyd_async/fastcs/panda/_block.py,sha256=SM7NaWCRwLz2Pl4wgjZMrDgx3ZLdGPTw6nU0bA
 ophyd_async/fastcs/panda/_control.py,sha256=xtW3dH_MLQoycgP-4vJtYx1M9alHjWo13iu9UFTgwzY,1306
 ophyd_async/fastcs/panda/_hdf_panda.py,sha256=tL_OWHxlMQcMZGq9sxHLSeag6hP9MRIbTPn1W0u0iNI,1237
 ophyd_async/fastcs/panda/_table.py,sha256=maKGoKypEuYqTSVWGgDO6GMEKOtlDm9Dn5YiYdBzu6c,2486
-ophyd_async/fastcs/panda/_trigger.py,sha256=dy4kYdVIU4T90a2bhD7cdnfGrqMxZ_n0AZxkFI5txfA,3388
-ophyd_async/fastcs/panda/_writer.py,sha256=LcCSdEo_65bAQU_OnO_AMQ0aXSjIaWUFdUY9EM2eOI4,6381
+ophyd_async/fastcs/panda/_trigger.py,sha256=X3FV51zNq3aADeSj-mwghf_NH72_25BreTPvjkOiQTE,3400
+ophyd_async/fastcs/panda/_writer.py,sha256=9cXDrfzj_e8LyGoG7kvgmftt8D_TS6r0fnlO8uR1fHw,6298
 ophyd_async/plan_stubs/__init__.py,sha256=2ngpkB4wwqlx1dn9JPSHjQdbyWLmY6n-3XVh3RDE8-g,939
 ophyd_async/plan_stubs/_ensure_connected.py,sha256=YR6VRj7koccJ4x35NV-Ugl4ZbxgAoGN9PjVIjhv0gpw,894
 ophyd_async/plan_stubs/_fly.py,sha256=2xFae3b3bCux_1wmwKIF1tJx1vjg2JJfJ8iQ1aUExAs,6234
@@ -108,14 +110,14 @@ ophyd_async/plan_stubs/_panda.py,sha256=5_Mf9kGzNjXpf_YscpCUE8tgq284nOHWCG7o_LNF
 ophyd_async/plan_stubs/_settings.py,sha256=e3dGVSUV-Htay_9fKXyQTAQLdjunetGI3OBYp_oC_FY,5574
 ophyd_async/plan_stubs/_utils.py,sha256=zClRo5ve8RGia7wQnby41W-Zprj-slOA5da1LfYnuhw,45
 ophyd_async/plan_stubs/_wait_for_awaitable.py,sha256=PGct_dGezKrLhm0W_GD83dwevSccG_vsmj0WSlMNVWc,364
-ophyd_async/sim/__init__.py,sha256=PzmOQS7suApaZros4h9ec5K6ehFWEjf3qYMvwFGeKsc,749
+ophyd_async/sim/__init__.py,sha256=TC86iJGt4u5UtRJniNEaUJbYB2C03kmjZF-jr2zPExY,709
 ophyd_async/sim/__main__.py,sha256=mx6natJxnvUBTQXbS4R5OGH_MZVgYiXQkoh3JBJ8NxU,1693
 ophyd_async/sim/_blob_detector.py,sha256=bJa-G2JF6pPLJx4YIEvFTG07DvQ18ZNSYbtde6qnWPY,1033
 ophyd_async/sim/_blob_detector_controller.py,sha256=y1aSNQJUPnsT2qnj2sk254Mp18anmgQy7ctHlYQZ_B0,1788
-ophyd_async/sim/_blob_detector_writer.py,sha256=4sC3Kkyk4-sSaN7mSKk4A4zDH4IU_qkc1gaqt4QyTAM,3636
-ophyd_async/sim/_mirror_horizontal.py,sha256=_AfsHxp5V3rYbK-goI0iwPuDDvx1BrNoUQ4smXzqFbc,1452
-ophyd_async/sim/_mirror_vertical.py,sha256=PyWpyCrW_FCzzGN7Dk0tTB-SKbDIV4GD1fl8AXUJbEI,2029
-ophyd_async/sim/_motor.py,sha256=jrI83A6kPCkZztHDKcd1XaXq7sc6GD2Ylkn7JxlULp0,10196
+ophyd_async/sim/_blob_detector_writer.py,sha256=-Qj0uSSNgqtLNe9wwsczbWKnSXLKDXISlwX1EHR_-UY,3327
+ophyd_async/sim/_mirror_horizontal.py,sha256=Jsqa8Snjy1jQDboZtAQFJjGor5uKk8FBC7OCe-GoZDw,1478
+ophyd_async/sim/_mirror_vertical.py,sha256=HUD44mYT0jQ0GKiQKxD7k_7y6o6OdE6TztgdPUJIK_g,2085
+ophyd_async/sim/_motor.py,sha256=7s2jBNwWm4CI6I6l_LEpe7z61QdWy82JdZBKSFOnYe4,8994
 ophyd_async/sim/_pattern_generator.py,sha256=FjPEWiBQh_7tYP_8WPhbVXnTGPPOaV6By7Skz7YNIrY,3722
 ophyd_async/sim/_point_detector.py,sha256=nXgL_1aJZciNBw8Zr2wMYaMbzzAEKXV3yV8FQz2nS_4,2940
 ophyd_async/sim/_stage.py,sha256=qaeyZbUVL1v2pTHJiZxq-y6BKpA1l_DAKyzAQppQx70,772
@@ -143,8 +145,8 @@ ophyd_async/testing/_one_of_everything.py,sha256=Di0hPoKwrDOSsx50-2UdSHM2EbIKrPG
 ophyd_async/testing/_single_derived.py,sha256=5-HOTzgePcZ354NK_ssVpyIbJoJmKyjVQCxSwQXUC-4,2730
 ophyd_async/testing/_utils.py,sha256=zClRo5ve8RGia7wQnby41W-Zprj-slOA5da1LfYnuhw,45
 ophyd_async/testing/_wait_for_pending.py,sha256=YZAR48n-CW0GsPey3zFRzMJ4byDAr3HvMIoawjmTrHw,732
-ophyd_async-0.10.1.dist-info/licenses/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
-ophyd_async-0.10.1.dist-info/METADATA,sha256=T43wg7KEoYRyA7xllFJLv9fM7OvNqYjuA047uX2zNlw,7071
-ophyd_async-0.10.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ophyd_async-0.10.1.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
-ophyd_async-0.10.1.dist-info/RECORD,,
+ophyd_async-0.11.dist-info/licenses/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
+ophyd_async-0.11.dist-info/METADATA,sha256=0H2kxSQoFHWEs8JMhMkrrQRw49Bh0wV4ulAnW5pZ6Ks,7077
+ophyd_async-0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ophyd_async-0.11.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
+ophyd_async-0.11.dist-info/RECORD,,