ophyd-async 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ophyd_async/_version.py +2 -2
- ophyd_async/core/__init__.py +4 -3
- ophyd_async/core/_providers.py +6 -2
- ophyd_async/core/_signal.py +1 -1
- ophyd_async/core/_status.py +17 -1
- ophyd_async/epics/adaravis/_aravis.py +1 -1
- ophyd_async/epics/adcore/__init__.py +2 -2
- ophyd_async/epics/adcore/_core_logic.py +7 -4
- ophyd_async/epics/adcore/_hdf_writer.py +7 -13
- ophyd_async/epics/adkinetix/_kinetix.py +1 -1
- ophyd_async/epics/adpilatus/_pilatus.py +1 -1
- ophyd_async/epics/adsimdetector/_sim.py +1 -1
- ophyd_async/epics/advimba/_vimba.py +1 -1
- ophyd_async/epics/eiger/__init__.py +5 -0
- ophyd_async/epics/eiger/_eiger.py +43 -0
- ophyd_async/epics/eiger/_eiger_controller.py +66 -0
- ophyd_async/epics/eiger/_eiger_io.py +42 -0
- ophyd_async/epics/eiger/_odin_io.py +125 -0
- ophyd_async/epics/motor.py +1 -1
- {ophyd_async-0.5.1.dist-info → ophyd_async-0.5.2.dist-info}/METADATA +1 -1
- {ophyd_async-0.5.1.dist-info → ophyd_async-0.5.2.dist-info}/RECORD +25 -20
- {ophyd_async-0.5.1.dist-info → ophyd_async-0.5.2.dist-info}/WHEEL +1 -1
- {ophyd_async-0.5.1.dist-info → ophyd_async-0.5.2.dist-info}/LICENSE +0 -0
- {ophyd_async-0.5.1.dist-info → ophyd_async-0.5.2.dist-info}/entry_points.txt +0 -0
- {ophyd_async-0.5.1.dist-info → ophyd_async-0.5.2.dist-info}/top_level.txt +0 -0
ophyd_async/_version.py
CHANGED
ophyd_async/core/__init__.py
CHANGED
|
@@ -33,11 +33,11 @@ from ._protocol import AsyncConfigurable, AsyncReadable, AsyncStageable
|
|
|
33
33
|
from ._providers import (
|
|
34
34
|
AutoIncrementFilenameProvider,
|
|
35
35
|
AutoIncrementingPathProvider,
|
|
36
|
+
DatasetDescriber,
|
|
36
37
|
FilenameProvider,
|
|
37
38
|
NameProvider,
|
|
38
39
|
PathInfo,
|
|
39
40
|
PathProvider,
|
|
40
|
-
ShapeProvider,
|
|
41
41
|
StaticFilenameProvider,
|
|
42
42
|
StaticPathProvider,
|
|
43
43
|
UUIDFilenameProvider,
|
|
@@ -63,7 +63,7 @@ from ._signal import (
|
|
|
63
63
|
)
|
|
64
64
|
from ._signal_backend import RuntimeSubsetEnum, SignalBackend, SubsetEnum
|
|
65
65
|
from ._soft_signal_backend import SignalMetadata, SoftSignalBackend
|
|
66
|
-
from ._status import AsyncStatus, WatchableAsyncStatus
|
|
66
|
+
from ._status import AsyncStatus, WatchableAsyncStatus, completed_status
|
|
67
67
|
from ._utils import (
|
|
68
68
|
DEFAULT_TIMEOUT,
|
|
69
69
|
CalculatableTimeout,
|
|
@@ -117,7 +117,7 @@ __all__ = [
|
|
|
117
117
|
"NameProvider",
|
|
118
118
|
"PathInfo",
|
|
119
119
|
"PathProvider",
|
|
120
|
-
"
|
|
120
|
+
"DatasetDescriber",
|
|
121
121
|
"StaticFilenameProvider",
|
|
122
122
|
"StaticPathProvider",
|
|
123
123
|
"UUIDFilenameProvider",
|
|
@@ -158,4 +158,5 @@ __all__ = [
|
|
|
158
158
|
"get_unique",
|
|
159
159
|
"in_micros",
|
|
160
160
|
"wait_for_connection",
|
|
161
|
+
"completed_status",
|
|
161
162
|
]
|
ophyd_async/core/_providers.py
CHANGED
|
@@ -211,7 +211,11 @@ class NameProvider(Protocol):
|
|
|
211
211
|
"""Get the name to be used as a data_key in the descriptor document"""
|
|
212
212
|
|
|
213
213
|
|
|
214
|
-
class
|
|
214
|
+
class DatasetDescriber(Protocol):
|
|
215
215
|
@abstractmethod
|
|
216
|
-
async def
|
|
216
|
+
async def np_datatype(self) -> str:
|
|
217
|
+
"""Represents the numpy datatype"""
|
|
218
|
+
|
|
219
|
+
@abstractmethod
|
|
220
|
+
async def shape(self) -> tuple[int, ...]:
|
|
217
221
|
"""Get the shape of the data collection"""
|
ophyd_async/core/_signal.py
CHANGED
ophyd_async/core/_status.py
CHANGED
|
@@ -4,7 +4,16 @@ import asyncio
|
|
|
4
4
|
import functools
|
|
5
5
|
import time
|
|
6
6
|
from dataclasses import asdict, replace
|
|
7
|
-
from typing import
|
|
7
|
+
from typing import (
|
|
8
|
+
AsyncIterator,
|
|
9
|
+
Awaitable,
|
|
10
|
+
Callable,
|
|
11
|
+
Generic,
|
|
12
|
+
Optional,
|
|
13
|
+
Type,
|
|
14
|
+
TypeVar,
|
|
15
|
+
cast,
|
|
16
|
+
)
|
|
8
17
|
|
|
9
18
|
from bluesky.protocols import Status
|
|
10
19
|
|
|
@@ -132,3 +141,10 @@ class WatchableAsyncStatus(AsyncStatusBase, Generic[T]):
|
|
|
132
141
|
return cls(f(*args, **kwargs))
|
|
133
142
|
|
|
134
143
|
return cast(Callable[P, WAS], wrap_f)
|
|
144
|
+
|
|
145
|
+
|
|
146
|
+
@AsyncStatus.wrap
|
|
147
|
+
async def completed_status(exception: Optional[Exception] = None):
|
|
148
|
+
if exception:
|
|
149
|
+
raise exception
|
|
150
|
+
return None
|
|
@@ -7,7 +7,7 @@ from ._core_io import (
|
|
|
7
7
|
)
|
|
8
8
|
from ._core_logic import (
|
|
9
9
|
DEFAULT_GOOD_STATES,
|
|
10
|
-
|
|
10
|
+
ADBaseDatasetDescriber,
|
|
11
11
|
set_exposure_time_and_acquire_period_if_supplied,
|
|
12
12
|
start_acquiring_driver_and_ensure_status,
|
|
13
13
|
)
|
|
@@ -31,7 +31,7 @@ __all__ = [
|
|
|
31
31
|
"NDFileHDFIO",
|
|
32
32
|
"NDPluginStatsIO",
|
|
33
33
|
"DEFAULT_GOOD_STATES",
|
|
34
|
-
"
|
|
34
|
+
"ADBaseDatasetDescriber",
|
|
35
35
|
"set_exposure_time_and_acquire_period_if_supplied",
|
|
36
36
|
"start_acquiring_driver_and_ensure_status",
|
|
37
37
|
"ADHDFWriter",
|
|
@@ -4,10 +4,11 @@ from typing import FrozenSet, Set
|
|
|
4
4
|
from ophyd_async.core import (
|
|
5
5
|
DEFAULT_TIMEOUT,
|
|
6
6
|
AsyncStatus,
|
|
7
|
+
DatasetDescriber,
|
|
7
8
|
DetectorControl,
|
|
8
|
-
ShapeProvider,
|
|
9
9
|
set_and_wait_for_value,
|
|
10
10
|
)
|
|
11
|
+
from ophyd_async.epics.adcore._utils import convert_ad_dtype_to_np
|
|
11
12
|
|
|
12
13
|
from ._core_io import ADBaseIO, DetectorState
|
|
13
14
|
|
|
@@ -18,15 +19,17 @@ DEFAULT_GOOD_STATES: FrozenSet[DetectorState] = frozenset(
|
|
|
18
19
|
)
|
|
19
20
|
|
|
20
21
|
|
|
21
|
-
class
|
|
22
|
+
class ADBaseDatasetDescriber(DatasetDescriber):
|
|
22
23
|
def __init__(self, driver: ADBaseIO) -> None:
|
|
23
24
|
self._driver = driver
|
|
24
25
|
|
|
25
|
-
async def
|
|
26
|
+
async def np_datatype(self) -> str:
|
|
27
|
+
return convert_ad_dtype_to_np(await self._driver.data_type.get_value())
|
|
28
|
+
|
|
29
|
+
async def shape(self) -> tuple[int, int]:
|
|
26
30
|
shape = await asyncio.gather(
|
|
27
31
|
self._driver.array_size_y.get_value(),
|
|
28
32
|
self._driver.array_size_x.get_value(),
|
|
29
|
-
self._driver.data_type.get_value(),
|
|
30
33
|
)
|
|
31
34
|
return shape
|
|
32
35
|
|
|
@@ -8,12 +8,12 @@ from bluesky.protocols import DataKey, Hints, StreamAsset
|
|
|
8
8
|
from ophyd_async.core import (
|
|
9
9
|
DEFAULT_TIMEOUT,
|
|
10
10
|
AsyncStatus,
|
|
11
|
+
DatasetDescriber,
|
|
11
12
|
DetectorWriter,
|
|
12
13
|
HDFDataset,
|
|
13
14
|
HDFFile,
|
|
14
15
|
NameProvider,
|
|
15
16
|
PathProvider,
|
|
16
|
-
ShapeProvider,
|
|
17
17
|
observe_value,
|
|
18
18
|
set_and_wait_for_value,
|
|
19
19
|
wait_for_value,
|
|
@@ -22,7 +22,6 @@ from ophyd_async.core import (
|
|
|
22
22
|
from ._core_io import NDArrayBaseIO, NDFileHDFIO
|
|
23
23
|
from ._utils import (
|
|
24
24
|
FileWriteMode,
|
|
25
|
-
convert_ad_dtype_to_np,
|
|
26
25
|
convert_param_dtype_to_np,
|
|
27
26
|
convert_pv_dtype_to_np,
|
|
28
27
|
)
|
|
@@ -34,13 +33,13 @@ class ADHDFWriter(DetectorWriter):
|
|
|
34
33
|
hdf: NDFileHDFIO,
|
|
35
34
|
path_provider: PathProvider,
|
|
36
35
|
name_provider: NameProvider,
|
|
37
|
-
|
|
36
|
+
dataset_describer: DatasetDescriber,
|
|
38
37
|
*plugins: NDArrayBaseIO,
|
|
39
38
|
) -> None:
|
|
40
39
|
self.hdf = hdf
|
|
41
40
|
self._path_provider = path_provider
|
|
42
41
|
self._name_provider = name_provider
|
|
43
|
-
self.
|
|
42
|
+
self._dataset_describer = dataset_describer
|
|
44
43
|
|
|
45
44
|
self._plugins = plugins
|
|
46
45
|
self._capture_status: Optional[AsyncStatus] = None
|
|
@@ -79,23 +78,18 @@ class ADHDFWriter(DetectorWriter):
|
|
|
79
78
|
# Wait for it to start, stashing the status that tells us when it finishes
|
|
80
79
|
self._capture_status = await set_and_wait_for_value(self.hdf.capture, True)
|
|
81
80
|
name = self._name_provider()
|
|
82
|
-
detector_shape =
|
|
81
|
+
detector_shape = await self._dataset_describer.shape()
|
|
82
|
+
np_dtype = await self._dataset_describer.np_datatype()
|
|
83
83
|
self._multiplier = multiplier
|
|
84
84
|
outer_shape = (multiplier,) if multiplier > 1 else ()
|
|
85
|
-
frame_shape = detector_shape[:-1] if len(detector_shape) > 0 else []
|
|
86
|
-
dtype_numpy = (
|
|
87
|
-
convert_ad_dtype_to_np(detector_shape[-1])
|
|
88
|
-
if len(detector_shape) > 0
|
|
89
|
-
else ""
|
|
90
|
-
)
|
|
91
85
|
|
|
92
86
|
# Add the main data
|
|
93
87
|
self._datasets = [
|
|
94
88
|
HDFDataset(
|
|
95
89
|
data_key=name,
|
|
96
90
|
dataset="/entry/data/data",
|
|
97
|
-
shape=
|
|
98
|
-
dtype_numpy=
|
|
91
|
+
shape=detector_shape,
|
|
92
|
+
dtype_numpy=np_dtype,
|
|
99
93
|
multiplier=multiplier,
|
|
100
94
|
)
|
|
101
95
|
]
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
from pydantic import Field
|
|
2
|
+
|
|
3
|
+
from ophyd_async.core import AsyncStatus, PathProvider, StandardDetector
|
|
4
|
+
from ophyd_async.core._detector import TriggerInfo
|
|
5
|
+
|
|
6
|
+
from ._eiger_controller import EigerController
|
|
7
|
+
from ._eiger_io import EigerDriverIO
|
|
8
|
+
from ._odin_io import Odin, OdinWriter
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
class EigerTriggerInfo(TriggerInfo):
|
|
12
|
+
energy_ev: float = Field(gt=0)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
class EigerDetector(StandardDetector):
|
|
16
|
+
"""
|
|
17
|
+
Ophyd-async implementation of an Eiger Detector.
|
|
18
|
+
"""
|
|
19
|
+
|
|
20
|
+
_controller: EigerController
|
|
21
|
+
_writer: Odin
|
|
22
|
+
|
|
23
|
+
def __init__(
|
|
24
|
+
self,
|
|
25
|
+
prefix: str,
|
|
26
|
+
path_provider: PathProvider,
|
|
27
|
+
drv_suffix="-EA-EIGER-01:",
|
|
28
|
+
hdf_suffix="-EA-ODIN-01:",
|
|
29
|
+
name="",
|
|
30
|
+
):
|
|
31
|
+
self.drv = EigerDriverIO(prefix + drv_suffix)
|
|
32
|
+
self.odin = Odin(prefix + hdf_suffix + "FP:")
|
|
33
|
+
|
|
34
|
+
super().__init__(
|
|
35
|
+
EigerController(self.drv),
|
|
36
|
+
OdinWriter(path_provider, lambda: self.name, self.odin),
|
|
37
|
+
name=name,
|
|
38
|
+
)
|
|
39
|
+
|
|
40
|
+
@AsyncStatus.wrap
|
|
41
|
+
async def prepare(self, value: EigerTriggerInfo) -> None:
|
|
42
|
+
await self._controller.set_energy(value.energy_ev)
|
|
43
|
+
await super().prepare(value)
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import asyncio
|
|
2
|
+
from typing import Optional
|
|
3
|
+
|
|
4
|
+
from ophyd_async.core import (
|
|
5
|
+
DEFAULT_TIMEOUT,
|
|
6
|
+
AsyncStatus,
|
|
7
|
+
DetectorControl,
|
|
8
|
+
DetectorTrigger,
|
|
9
|
+
set_and_wait_for_other_value,
|
|
10
|
+
)
|
|
11
|
+
|
|
12
|
+
from ._eiger_io import EigerDriverIO, EigerTriggerMode
|
|
13
|
+
|
|
14
|
+
EIGER_TRIGGER_MODE_MAP = {
|
|
15
|
+
DetectorTrigger.internal: EigerTriggerMode.internal,
|
|
16
|
+
DetectorTrigger.constant_gate: EigerTriggerMode.gate,
|
|
17
|
+
DetectorTrigger.variable_gate: EigerTriggerMode.gate,
|
|
18
|
+
DetectorTrigger.edge_trigger: EigerTriggerMode.edge,
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
class EigerController(DetectorControl):
|
|
23
|
+
def __init__(
|
|
24
|
+
self,
|
|
25
|
+
driver: EigerDriverIO,
|
|
26
|
+
) -> None:
|
|
27
|
+
self._drv = driver
|
|
28
|
+
|
|
29
|
+
def get_deadtime(self, exposure: float) -> float:
|
|
30
|
+
# See https://media.dectris.com/filer_public/30/14/3014704e-5f3b-43ba-8ccf-8ef720e60d2a/240202_usermanual_eiger2.pdf
|
|
31
|
+
return 0.0001
|
|
32
|
+
|
|
33
|
+
async def set_energy(self, energy: float, tolerance: float = 0.1):
|
|
34
|
+
"""Changing photon energy takes some time so only do so if the current energy is
|
|
35
|
+
outside the tolerance."""
|
|
36
|
+
current_energy = await self._drv.photon_energy.get_value()
|
|
37
|
+
if abs(current_energy - energy) > tolerance:
|
|
38
|
+
await self._drv.photon_energy.set(energy)
|
|
39
|
+
|
|
40
|
+
@AsyncStatus.wrap
|
|
41
|
+
async def arm(
|
|
42
|
+
self,
|
|
43
|
+
num: int,
|
|
44
|
+
trigger: DetectorTrigger = DetectorTrigger.internal,
|
|
45
|
+
exposure: Optional[float] = None,
|
|
46
|
+
):
|
|
47
|
+
coros = [
|
|
48
|
+
self._drv.trigger_mode.set(EIGER_TRIGGER_MODE_MAP[trigger].value),
|
|
49
|
+
self._drv.num_images.set(num),
|
|
50
|
+
]
|
|
51
|
+
if exposure is not None:
|
|
52
|
+
coros.extend(
|
|
53
|
+
[
|
|
54
|
+
self._drv.acquire_time.set(exposure),
|
|
55
|
+
self._drv.acquire_period.set(exposure),
|
|
56
|
+
]
|
|
57
|
+
)
|
|
58
|
+
await asyncio.gather(*coros)
|
|
59
|
+
|
|
60
|
+
# TODO: Detector state should be an enum see https://github.com/DiamondLightSource/eiger-fastcs/issues/43
|
|
61
|
+
await set_and_wait_for_other_value(
|
|
62
|
+
self._drv.arm, 1, self._drv.state, "ready", timeout=DEFAULT_TIMEOUT
|
|
63
|
+
)
|
|
64
|
+
|
|
65
|
+
async def disarm(self):
|
|
66
|
+
await self._drv.disarm.set(1)
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
from enum import Enum
|
|
2
|
+
|
|
3
|
+
from ophyd_async.core import Device
|
|
4
|
+
from ophyd_async.epics.signal import epics_signal_r, epics_signal_rw_rbv, epics_signal_w
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
class EigerTriggerMode(str, Enum):
|
|
8
|
+
internal = "ints"
|
|
9
|
+
edge = "exts"
|
|
10
|
+
gate = "exte"
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
class EigerDriverIO(Device):
|
|
14
|
+
def __init__(self, prefix: str, name: str = "") -> None:
|
|
15
|
+
self.bit_depth = epics_signal_r(int, f"{prefix}BitDepthReadout")
|
|
16
|
+
self.stale_parameters = epics_signal_r(bool, f"{prefix}StaleParameters")
|
|
17
|
+
self.state = epics_signal_r(str, f"{prefix}DetectorState")
|
|
18
|
+
self.roi_mode = epics_signal_rw_rbv(str, f"{prefix}RoiMode")
|
|
19
|
+
|
|
20
|
+
self.acquire_time = epics_signal_rw_rbv(float, f"{prefix}CountTime")
|
|
21
|
+
self.acquire_period = epics_signal_rw_rbv(float, f"{prefix}FrameTime")
|
|
22
|
+
|
|
23
|
+
self.num_images = epics_signal_rw_rbv(int, f"{prefix}Nimages")
|
|
24
|
+
self.num_triggers = epics_signal_rw_rbv(int, f"{prefix}Ntrigger")
|
|
25
|
+
|
|
26
|
+
# TODO: Should be EigerTriggerMode enum, see https://github.com/DiamondLightSource/eiger-fastcs/issues/43
|
|
27
|
+
self.trigger_mode = epics_signal_rw_rbv(str, f"{prefix}TriggerMode")
|
|
28
|
+
|
|
29
|
+
self.arm = epics_signal_w(int, f"{prefix}Arm")
|
|
30
|
+
self.disarm = epics_signal_w(int, f"{prefix}Disarm")
|
|
31
|
+
self.abort = epics_signal_w(int, f"{prefix}Abort")
|
|
32
|
+
|
|
33
|
+
self.beam_centre_x = epics_signal_rw_rbv(float, f"{prefix}BeamCenterX")
|
|
34
|
+
self.beam_centre_y = epics_signal_rw_rbv(float, f"{prefix}BeamCenterY")
|
|
35
|
+
|
|
36
|
+
self.det_distance = epics_signal_rw_rbv(float, f"{prefix}DetectorDistance")
|
|
37
|
+
self.omega_start = epics_signal_rw_rbv(float, f"{prefix}OmegaStart")
|
|
38
|
+
self.omega_increment = epics_signal_rw_rbv(float, f"{prefix}OmegaIncrement")
|
|
39
|
+
|
|
40
|
+
self.photon_energy = epics_signal_rw_rbv(float, f"{prefix}PhotonEnergy")
|
|
41
|
+
|
|
42
|
+
super().__init__(name)
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import asyncio
|
|
2
|
+
from enum import Enum
|
|
3
|
+
from typing import AsyncGenerator, AsyncIterator, Dict
|
|
4
|
+
|
|
5
|
+
from bluesky.protocols import StreamAsset
|
|
6
|
+
from event_model.documents.event_descriptor import DataKey
|
|
7
|
+
|
|
8
|
+
from ophyd_async.core import (
|
|
9
|
+
DEFAULT_TIMEOUT,
|
|
10
|
+
DetectorWriter,
|
|
11
|
+
Device,
|
|
12
|
+
DeviceVector,
|
|
13
|
+
NameProvider,
|
|
14
|
+
PathProvider,
|
|
15
|
+
observe_value,
|
|
16
|
+
set_and_wait_for_value,
|
|
17
|
+
)
|
|
18
|
+
from ophyd_async.epics.signal import (
|
|
19
|
+
epics_signal_r,
|
|
20
|
+
epics_signal_rw,
|
|
21
|
+
epics_signal_rw_rbv,
|
|
22
|
+
)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
class Writing(str, Enum):
|
|
26
|
+
ON = "ON"
|
|
27
|
+
OFF = "OFF"
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
class OdinNode(Device):
|
|
31
|
+
def __init__(self, prefix: str, name: str = "") -> None:
|
|
32
|
+
self.writing = epics_signal_r(Writing, f"{prefix}HDF:Writing")
|
|
33
|
+
self.connected = epics_signal_r(bool, f"{prefix}Connected")
|
|
34
|
+
|
|
35
|
+
super().__init__(name)
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
class Odin(Device):
|
|
39
|
+
def __init__(self, prefix: str, name: str = "") -> None:
|
|
40
|
+
self.nodes = DeviceVector({i: OdinNode(f"{prefix}FP{i}:") for i in range(4)})
|
|
41
|
+
|
|
42
|
+
self.capture = epics_signal_rw(
|
|
43
|
+
Writing, f"{prefix}Writing", f"{prefix}ConfigHdfWrite"
|
|
44
|
+
)
|
|
45
|
+
self.num_captured = epics_signal_r(int, f"{prefix}FramesWritten")
|
|
46
|
+
self.num_to_capture = epics_signal_rw_rbv(int, f"{prefix}ConfigHdfFrames")
|
|
47
|
+
|
|
48
|
+
self.start_timeout = epics_signal_rw_rbv(int, f"{prefix}TimeoutTimerPeriod")
|
|
49
|
+
|
|
50
|
+
self.image_height = epics_signal_rw_rbv(int, f"{prefix}DatasetDataDims0")
|
|
51
|
+
self.image_width = epics_signal_rw_rbv(int, f"{prefix}DatasetDataDims1")
|
|
52
|
+
|
|
53
|
+
self.num_row_chunks = epics_signal_rw_rbv(int, f"{prefix}DatasetDataChunks1")
|
|
54
|
+
self.num_col_chunks = epics_signal_rw_rbv(int, f"{prefix}DatasetDataChunks2")
|
|
55
|
+
|
|
56
|
+
self.file_path = epics_signal_rw_rbv(str, f"{prefix}ConfigHdfFilePath")
|
|
57
|
+
self.file_name = epics_signal_rw_rbv(str, f"{prefix}ConfigHdfFilePrefix")
|
|
58
|
+
|
|
59
|
+
self.acquisition_id = epics_signal_rw_rbv(
|
|
60
|
+
str, f"{prefix}ConfigHdfAcquisitionId"
|
|
61
|
+
)
|
|
62
|
+
|
|
63
|
+
self.data_type = epics_signal_rw_rbv(str, f"{prefix}DatasetDataDatatype")
|
|
64
|
+
|
|
65
|
+
super().__init__(name)
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
class OdinWriter(DetectorWriter):
|
|
69
|
+
def __init__(
|
|
70
|
+
self,
|
|
71
|
+
path_provider: PathProvider,
|
|
72
|
+
name_provider: NameProvider,
|
|
73
|
+
odin_driver: Odin,
|
|
74
|
+
) -> None:
|
|
75
|
+
self._drv = odin_driver
|
|
76
|
+
self._path_provider = path_provider
|
|
77
|
+
self._name_provider = name_provider
|
|
78
|
+
super().__init__()
|
|
79
|
+
|
|
80
|
+
async def open(self, multiplier: int = 1) -> Dict[str, DataKey]:
|
|
81
|
+
info = self._path_provider(device_name=self._name_provider())
|
|
82
|
+
|
|
83
|
+
await asyncio.gather(
|
|
84
|
+
self._drv.file_path.set(str(info.directory_path)),
|
|
85
|
+
self._drv.file_name.set(info.filename),
|
|
86
|
+
self._drv.data_type.set(
|
|
87
|
+
"uint16"
|
|
88
|
+
), # TODO: Get from eiger https://github.com/bluesky/ophyd-async/issues/529
|
|
89
|
+
self._drv.num_to_capture.set(0),
|
|
90
|
+
)
|
|
91
|
+
|
|
92
|
+
await self._drv.capture.set(Writing.ON)
|
|
93
|
+
|
|
94
|
+
return await self._describe()
|
|
95
|
+
|
|
96
|
+
async def _describe(self) -> Dict[str, DataKey]:
|
|
97
|
+
data_shape = await asyncio.gather(
|
|
98
|
+
self._drv.image_height.get_value(), self._drv.image_width.get_value()
|
|
99
|
+
)
|
|
100
|
+
|
|
101
|
+
return {
|
|
102
|
+
"data": DataKey(
|
|
103
|
+
source=self._drv.file_name.source,
|
|
104
|
+
shape=data_shape,
|
|
105
|
+
dtype="array",
|
|
106
|
+
dtype_numpy="<u2", # TODO: Use correct type based on eiger https://github.com/bluesky/ophyd-async/issues/529
|
|
107
|
+
external="STREAM:",
|
|
108
|
+
)
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
async def observe_indices_written(
|
|
112
|
+
self, timeout=DEFAULT_TIMEOUT
|
|
113
|
+
) -> AsyncGenerator[int, None]:
|
|
114
|
+
async for num_captured in observe_value(self._drv.num_captured, timeout):
|
|
115
|
+
yield num_captured
|
|
116
|
+
|
|
117
|
+
async def get_indices_written(self) -> int:
|
|
118
|
+
return await self._drv.num_captured.get_value()
|
|
119
|
+
|
|
120
|
+
def collect_stream_docs(self, indices_written: int) -> AsyncIterator[StreamAsset]:
|
|
121
|
+
# TODO: Correctly return stream https://github.com/bluesky/ophyd-async/issues/530
|
|
122
|
+
raise NotImplementedError()
|
|
123
|
+
|
|
124
|
+
async def close(self) -> None:
|
|
125
|
+
await set_and_wait_for_value(self._drv.capture, Writing.OFF)
|
ophyd_async/epics/motor.py
CHANGED
|
@@ -119,7 +119,7 @@ class Motor(StandardReadable, Locatable, Stoppable, Flyable, Preparable):
|
|
|
119
119
|
)
|
|
120
120
|
|
|
121
121
|
await self.set(fly_prepared_position)
|
|
122
|
-
await self.velocity.set(fly_velocity)
|
|
122
|
+
await self.velocity.set(abs(fly_velocity))
|
|
123
123
|
|
|
124
124
|
@AsyncStatus.wrap
|
|
125
125
|
async def kickoff(self):
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: ophyd-async
|
|
3
|
-
Version: 0.5.
|
|
3
|
+
Version: 0.5.2
|
|
4
4
|
Summary: Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
|
|
5
5
|
Author-email: Tom Cobb <tom.cobb@diamond.ac.uk>
|
|
6
6
|
License: BSD 3-Clause License
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
ophyd_async/__init__.py,sha256=v-rRiDOgZ3sQSMQKq0vgUQZvpeOkoHFXissAx6Ktg84,61
|
|
2
2
|
ophyd_async/__main__.py,sha256=G-Zcv_G9zK7Nhx6o5L5w-wyhMxdl_WgyMELu8IMFqAE,328
|
|
3
|
-
ophyd_async/_version.py,sha256=
|
|
4
|
-
ophyd_async/core/__init__.py,sha256=
|
|
3
|
+
ophyd_async/_version.py,sha256=9wH2PDsTkkxdqSU9YziEjDTHYLEcKPSYr6RofNSEaJk,411
|
|
4
|
+
ophyd_async/core/__init__.py,sha256=Ci9J1fxdaUHT45gRQNxzNEqEdbI6xBseSUrFcOIhhlg,3793
|
|
5
5
|
ophyd_async/core/_detector.py,sha256=n5MKTVAzTHVUWH5ZMxcSq7u4qP2nAGemaPyGrPAZQq4,11811
|
|
6
6
|
ophyd_async/core/_device.py,sha256=DDdRujYLCDSuGDB0gqElkzI0qEGb3sMlFP6FgmH2u3A,7554
|
|
7
7
|
ophyd_async/core/_device_save_loader.py,sha256=pTom5EOFa9_5Z3bV37zOnbGx2ujWIOl_D9PVYhpY1FY,8232
|
|
@@ -11,38 +11,38 @@ ophyd_async/core/_log.py,sha256=Hsk2Iwx81n3HpxNR30xGTnLJh_lPGd_CGy2MI3OGpWs,3588
|
|
|
11
11
|
ophyd_async/core/_mock_signal_backend.py,sha256=M_I2LxxJrJmBAbmILjVoAR6E2U8K2UswvHGiHluMqHc,2799
|
|
12
12
|
ophyd_async/core/_mock_signal_utils.py,sha256=LTrmjQTqvP4yY2bsaOmfLNJAegD850_BNZ6Y8uY5XPQ,4717
|
|
13
13
|
ophyd_async/core/_protocol.py,sha256=aRoqet0ThyVK_wrULh4k_StnpeHnNhXc0YffWdRJNZw,3391
|
|
14
|
-
ophyd_async/core/_providers.py,sha256=
|
|
14
|
+
ophyd_async/core/_providers.py,sha256=unFdSAm5Hz4B6s3WSSGRCZo0l9FYMbJwI7DOBIAI_n4,7148
|
|
15
15
|
ophyd_async/core/_readable.py,sha256=WayM35JOJj732-YgvGsjUSlCZwZ_zq1zbAmk-1U0uwU,8998
|
|
16
|
-
ophyd_async/core/_signal.py,sha256=
|
|
16
|
+
ophyd_async/core/_signal.py,sha256=MzB2KGHogo2mKeSHRkqyAiELv22xnnkPuroXU-RuMWI,19609
|
|
17
17
|
ophyd_async/core/_signal_backend.py,sha256=-Vze8-57W0jpcC4gq4P4rZpXXJvi2qrbu0A8AjqA594,2638
|
|
18
18
|
ophyd_async/core/_soft_signal_backend.py,sha256=Z4LiADd9xKrxhhPOx8q5xq4yrJRdJbfuKeB0o2wBjCk,6653
|
|
19
|
-
ophyd_async/core/_status.py,sha256=
|
|
19
|
+
ophyd_async/core/_status.py,sha256=lnhy-gt2XV8ZE0EuzrDddHCEYuoquBI5ovTOJxwtSYk,4526
|
|
20
20
|
ophyd_async/core/_utils.py,sha256=3oZcXNqAUHX4ZWMBH5gSuK6cFWEhSkZ9GSDYv0pf8jc,5783
|
|
21
21
|
ophyd_async/epics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
22
|
-
ophyd_async/epics/motor.py,sha256=
|
|
22
|
+
ophyd_async/epics/motor.py,sha256=x9ysc5tLqJiVYYqyhEd5ornEYQ5aQamg7pB4e5ygwR4,8776
|
|
23
23
|
ophyd_async/epics/adaravis/__init__.py,sha256=u979_9nQTYB0TvDOTXFN4qMrbDP8-xQFfXYMGzLVBo4,207
|
|
24
|
-
ophyd_async/epics/adaravis/_aravis.py,sha256=
|
|
24
|
+
ophyd_async/epics/adaravis/_aravis.py,sha256=XBuLQBZYj2tptY39bVzXjl6t-ZpPwqrUOwpR54l-hSo,1952
|
|
25
25
|
ophyd_async/epics/adaravis/_aravis_controller.py,sha256=SzyajBNoqvBOUVtNE0t8ghffY2pYP8U99XgQ-4u2pVI,2635
|
|
26
26
|
ophyd_async/epics/adaravis/_aravis_io.py,sha256=GY2thPUJ-6821GvfZTBLoX8g9d-U1YgyoXe3wYRVw-g,1554
|
|
27
|
-
ophyd_async/epics/adcore/__init__.py,sha256=
|
|
27
|
+
ophyd_async/epics/adcore/__init__.py,sha256=3wMOyFGaq1X61LqK4iY4pq-m_BjhOgYZD2-mNCAjpzk,1086
|
|
28
28
|
ophyd_async/epics/adcore/_core_io.py,sha256=F4TlnWW0ntAekZlr8qxCpKhFyEThSgjYQCOoKOg4DN8,5918
|
|
29
|
-
ophyd_async/epics/adcore/_core_logic.py,sha256=
|
|
30
|
-
ophyd_async/epics/adcore/_hdf_writer.py,sha256=
|
|
29
|
+
ophyd_async/epics/adcore/_core_logic.py,sha256=2iAF64HLRGxg_By-7feGP8eUtujsXYzOhysP0_SuMTM,3577
|
|
30
|
+
ophyd_async/epics/adcore/_hdf_writer.py,sha256=fUvduWqw9aNNwroH5Wutq_8Q8c0Aqb0vMIs2r5ouYjM,6697
|
|
31
31
|
ophyd_async/epics/adcore/_single_trigger.py,sha256=LGhAZV0GoRwRTNFQmgLpkfq73HsiMCu20JKYGOzxt0I,1159
|
|
32
32
|
ophyd_async/epics/adcore/_utils.py,sha256=A5AUQIfdbzLgF7A4V-1TSoPD6Kvgs4sbZBGOV7zb8SY,3909
|
|
33
33
|
ophyd_async/epics/adkinetix/__init__.py,sha256=QEft12PURied6LRzjw-NhUmngjAm1XNA3k-5o5aMXDQ,216
|
|
34
|
-
ophyd_async/epics/adkinetix/_kinetix.py,sha256=
|
|
34
|
+
ophyd_async/epics/adkinetix/_kinetix.py,sha256=JsQVc4d7lRCnVObJlM775hHLfp3rYRSRgOoIyRvrSek,1184
|
|
35
35
|
ophyd_async/epics/adkinetix/_kinetix_controller.py,sha256=jHe6MSfqCOdzw0jQ5L6cYq55I0TD5Bso2ZGOZmv1j3Q,1504
|
|
36
36
|
ophyd_async/epics/adkinetix/_kinetix_io.py,sha256=AbCoYliAobU3I6z3NaswQnExwGTgV458zF3uwkBEQPc,893
|
|
37
37
|
ophyd_async/epics/adpilatus/__init__.py,sha256=daimScOCCMHR2eb8VbezHOcGOkd6uIRZQiyeTQsaAx4,308
|
|
38
|
-
ophyd_async/epics/adpilatus/_pilatus.py,sha256=
|
|
38
|
+
ophyd_async/epics/adpilatus/_pilatus.py,sha256=AbWfxEds8ESB73kRXz56FzRPYqy67Ue0m11HRaNUqZY,1751
|
|
39
39
|
ophyd_async/epics/adpilatus/_pilatus_controller.py,sha256=1GfzcnhwLam8fAhf889lPz2rrn9mWDaGO3BIELP3R50,2450
|
|
40
40
|
ophyd_async/epics/adpilatus/_pilatus_io.py,sha256=WB_N2RRpcFCFI6i57PRqjIdpK6hzLpWxn71cWUHUZnc,722
|
|
41
41
|
ophyd_async/epics/adsimdetector/__init__.py,sha256=t3crUgTEvVJGI8o6FsfN42k0A-l4v9ZBwXIYtixoE-M,128
|
|
42
|
-
ophyd_async/epics/adsimdetector/_sim.py,sha256=
|
|
42
|
+
ophyd_async/epics/adsimdetector/_sim.py,sha256=ijN7K-5prJuzFD3DoNtQ8JujnvCG8_UMwYxMCGSOHCE,866
|
|
43
43
|
ophyd_async/epics/adsimdetector/_sim_controller.py,sha256=v0GrMXg7U1PUvLKW8zmx8zrunk_MfFt7GbckbVlnUys,1494
|
|
44
44
|
ophyd_async/epics/advimba/__init__.py,sha256=GSnFWGPNJsCJZ-Tgyv-L38Smwzp2bWC64U_4uD2TLvs,198
|
|
45
|
-
ophyd_async/epics/advimba/_vimba.py,sha256=
|
|
45
|
+
ophyd_async/epics/advimba/_vimba.py,sha256=E_RJ0uJQt-RWAY7uFTNkHaOdGYS5sa7ZbRgAe6ngXTA,1125
|
|
46
46
|
ophyd_async/epics/advimba/_vimba_controller.py,sha256=JvQ4M2IdixDI6TXNHSqUs0sX3ncgosecuLmT8bYhU9w,2003
|
|
47
47
|
ophyd_async/epics/advimba/_vimba_io.py,sha256=nf1BdIWey4RR7KuqyZhH6X5yB8Msg0oOtkVLOuwn6Uc,1843
|
|
48
48
|
ophyd_async/epics/demo/__init__.py,sha256=wCrgemEo-zR4TTvaqCKnQ-AIUHorotV5jhftbq1tXz0,1368
|
|
@@ -50,6 +50,11 @@ ophyd_async/epics/demo/_mover.py,sha256=7GEmF-mgN0qxiHUE3Tgboh0p9S5AuPBYR-pFeg5Q
|
|
|
50
50
|
ophyd_async/epics/demo/_sensor.py,sha256=8OyFAsB3EXMzrQreOIg_TGHrseUtI5rxXpfwwUaC76I,1165
|
|
51
51
|
ophyd_async/epics/demo/mover.db,sha256=RFz0rxZue689Wh1sWTZwWeFMUrH04ttPq2u5xJH_Fp4,998
|
|
52
52
|
ophyd_async/epics/demo/sensor.db,sha256=AVtiydrdtwAz2EFurO2Ult9SSRtre3r0akOBbL98LT0,554
|
|
53
|
+
ophyd_async/epics/eiger/__init__.py,sha256=b3Tt4pVLk23Giyj50R4e94d2MxWDDmNHWhWwNq2jlaw,221
|
|
54
|
+
ophyd_async/epics/eiger/_eiger.py,sha256=8sTPz_pBpDyJI_VUGxVb8WtfoTYvsAi3stofaPbcgt4,1155
|
|
55
|
+
ophyd_async/epics/eiger/_eiger_controller.py,sha256=B4CpwWXde71C3BWcSBwlZbt3Fnk9yAT9BZj4J4DeDoU,2139
|
|
56
|
+
ophyd_async/epics/eiger/_eiger_io.py,sha256=MlvLWEZ-n-Lf7y9e_WVoPFdw5YoHVWw_8LxSLajnkk8,1818
|
|
57
|
+
ophyd_async/epics/eiger/_odin_io.py,sha256=NY1O38yIYU0M6hPt1yXqDHxvpnc7PKDpqZasjc7bM_s,4163
|
|
53
58
|
ophyd_async/epics/pvi/__init__.py,sha256=ZvJO69ApL7N9rWT9-hD-JZMC_KsHxgeEqxe-01jNUVw,137
|
|
54
59
|
ophyd_async/epics/pvi/_pvi.py,sha256=PUst4KhX8emkbRunLrJeqTruaOMF3mm1s7YJsBB7HpQ,12099
|
|
55
60
|
ophyd_async/epics/signal/__init__.py,sha256=cJGvTnJxHNzpWyWIYXU4UGMoz3uqZ88UVXNvG-TGngo,441
|
|
@@ -82,9 +87,9 @@ ophyd_async/sim/demo/_pattern_detector/_pattern_detector_writer.py,sha256=ayJJ2Y
|
|
|
82
87
|
ophyd_async/sim/demo/_pattern_detector/_pattern_generator.py,sha256=KRB8y3rwoaemeQx4ewoFO7CCTHtvokWe4zTE0Rg3K0Q,7176
|
|
83
88
|
ophyd_async/sim/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
84
89
|
ophyd_async/tango/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
85
|
-
ophyd_async-0.5.
|
|
86
|
-
ophyd_async-0.5.
|
|
87
|
-
ophyd_async-0.5.
|
|
88
|
-
ophyd_async-0.5.
|
|
89
|
-
ophyd_async-0.5.
|
|
90
|
-
ophyd_async-0.5.
|
|
90
|
+
ophyd_async-0.5.2.dist-info/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
|
|
91
|
+
ophyd_async-0.5.2.dist-info/METADATA,sha256=WT4LFUgG_L4M56zH19WNULHbqAdJg2_D9AAYGEXTWB8,6511
|
|
92
|
+
ophyd_async-0.5.2.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
|
|
93
|
+
ophyd_async-0.5.2.dist-info/entry_points.txt,sha256=O0YNJTEufO0w9BozXi-JurTy2U1_o0ypeCgJLQ727Jk,58
|
|
94
|
+
ophyd_async-0.5.2.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
|
|
95
|
+
ophyd_async-0.5.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|