Skip to content

Wait on prepare when setting exposure time #13

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

Merged
callumforrester merged 2 commits into from
Aug 5, 2025
Merged

Wait on prepare when setting exposure time #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dddb61e
Wait on prepare when setting exposure time
callumforrester Aug 1, 2025
263564e
Update test config
callumforrester Aug 5, 2025
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
5 changes: 1 addition & 4 deletions configuration/b01-1-blueapi-client.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@ stomp:
auth:
username: guest
password: guest
url: http://b01-1-rabbitmq-daq.diamond.ac.uk:61613
url: tcp://b01-1-rabbitmq-daq.diamond.ac.uk:61613
enabled: true
oidc:
well_known_url: https://authn.diamond.ac.uk/realms/master/.well-known/openid-configuration
client_id: blueapi-cli
4 changes: 3 additions & 1 deletion src/test_rig_bluesky/plans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ def spectroscopy(
metadata: dict[str, Any] | None = None,
) -> MsgGenerator[None]:
"""Do a spectroscopy scan."""
yield from bps.prepare(spectroscopy_detector, TriggerInfo(livetime=exposure_time))
yield from bps.prepare(
spectroscopy_detector, TriggerInfo(livetime=exposure_time), wait=True
)

spec = spec or Line(sample_stage.x, 0, 5, 5)

Expand Down
8 changes: 8 additions & 0 deletions tests/unit_tests/test_plans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,11 @@ async def test_spectroscopy_defaults(RE: RunEngine):
"sample_stage-y": 0.0,
"sample_stage-z": 0.0,
}


def test_spectroscopy_prepares_and_waits_before_doing_anything_else(RE: RunEngine):
plan = spectroscopy()
message_1, message_2 = next(plan), next(plan)

assert message_1.command == "prepare"
assert message_2.command == "wait"