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

Jump to bottom

update to bps.collect_while_completeing #536

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

update to bps.collect_while_completeing #536

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
209d408
updated to collect_while_completing
ZohebShaikh Aug 14, 2024
be29b8e
moved code from bluesky
ZohebShaikh Aug 28, 2024
94bafeb
added code review changes
ZohebShaikh Oct 24, 2024
06b6b0d
Merge branch 'main' into 329-investigate-hanging-collect_while_comple…
ZohebShaikh Oct 24, 2024
3182f97
changed List to list
ZohebShaikh Oct 24, 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
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 @@ dependencies = [
"numpy<2.0.0",
"packaging",
"pint",
"bluesky>=1.13.0a3",
"bluesky>=1.13.0a4",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have change this to make sure that we are at version the hardware test was conducted

"event_model",
"p4p",
"pyyaml",
Expand Down
20 changes: 7 additions & 13 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 @@ -102,6 +102,10 @@ def prepare_static_seq_table_flyer_and_detectors_with_same_trigger(
yield from bps.wait(group="prep")


# Collect every 0.5 seconds even if the flyscan is still completing
_SECONDS_TO_FORCE_COLLECT_AFTER = 0.5


def fly_and_collect(
stream_name: str,
flyer: StandardFlyer[SeqTableInfo] | StandardFlyer[PcompInfo],
Expand All @@ -118,8 +122,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 @@ -128,18 +130,10 @@ 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,
done = yield from bps.wait(
group=group, timeout=_SECONDS_TO_FORCE_COLLECT_AFTER, move_on=True
ZohebShaikh marked this conversation as resolved.
Show resolved Hide resolved
)
yield from bps.wait(group=group)
yield from bps.collect(*detectors, name=stream_name)
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the removal of return_payload intentional?



def fly_and_collect_with_static_pcomp(
Expand Down
Loading