Skip to content
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

Update _fly.py #691

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update _fly.py #691

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b3d95a
Update _fly.py
ZohebShaikh Dec 4, 2024
db06c49
copied code from collect_while_completing to ophyd_async
ZohebShaikh Dec 4, 2024
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
19 changes: 5 additions & 14 deletions src/ophyd_async/plan_stubs/_fly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
SeqTableInfo,
)

DEFAULT_FLUSH_PERIOD = 0.5


def prepare_static_pcomp_flyer_and_detectors(
flyer: StandardFlyer[PcompInfo],
Expand Down Expand Up @@ -104,6 +106,7 @@ def fly_and_collect(
stream_name: str,
flyer: StandardFlyer[SeqTableInfo] | StandardFlyer[PcompInfo],
detectors: list[StandardDetector],
flush_period: float = DEFAULT_FLUSH_PERIOD,
):
"""Kickoff, complete and collect with a flyer and multiple detectors.

Expand All @@ -116,8 +119,6 @@ def fly_and_collect(
yield from bps.kickoff(flyer, wait=True)
for detector in detectors:
yield from bps.kickoff(detector)

# collect_while_completing
group = short_uid(label="complete")

yield from bps.complete(flyer, wait=False, group=group)
Expand All @@ -126,18 +127,8 @@ def fly_and_collect(

done = False
while not done:
try:
yield from bps.wait(group=group, timeout=0.5)
except TimeoutError:
pass
else:
done = True
yield from bps.collect(
*detectors,
return_payload=False,
name=stream_name,
)
yield from bps.wait(group=group)
Comment on lines -129 to -140
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea was to change this whole code block to bps.collect_while_completing, but I have since decided that it wasn't quite correct, so please can you copy https://github.com/bluesky/bluesky/blob/1b8422beee465d4f78f285a902b170a47303a75a/src/bluesky/plan_stubs.py#L1004-L1037 into ophyd-async, update to use it, and we will iterate from there

done = yield from bps.wait(group=group, timeout=flush_period, move_on=True)
yield from bps.collect(*detectors, name=stream_name)


def fly_and_collect_with_static_pcomp(
Expand Down
Loading