Skip to content

Update dodal to ophyd-async v0.17a5 #2065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jacob720 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update dodal to ophyd-async v0.17a5 #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/dodal/devices/electron_analyser/base/base_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from ophyd_async.core import (
Array1D,
AsyncStatus,
DetectorArmLogic,
DetectorAcquireLogic,
DetectorTriggerLogic,
StandardDetector,
derived_signal_r,
Expand Down Expand Up @@ -60,7 +60,7 @@ class ElectronAnalyserDetector(

def __init__(
self,
arm_logic: DetectorArmLogic,
acquire_logic: DetectorAcquireLogic,
trigger_logic: DetectorTriggerLogic,
region_logic: RegionLogic,
name: str = "",
Expand All @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions src/dodal/devices/tetramm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from ophyd_async.core import (
AsyncStatus,
DetectorArmLogic,
DetectorAcquireLogic,
DetectorTriggerLogic,
PathProvider,
SignalDict,
Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand Down
Loading