Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

(#1466) Wait for aperture move before DC and read it during DC #1472

Merged
merged 4 commits into from
Jul 10, 2024

Conversation

dperl-dls
Copy link
Collaborator

@dperl-dls dperl-dls commented Jul 3, 2024

Fixes #1466 and fixes #880

To test:

  1. Run tests

@dperl-dls dperl-dls requested review from DominicOram and olliesilvester and removed request for DominicOram July 3, 2024 13:32
Copy link
Collaborator

@DominicOram DominicOram left a comment

Choose a reason for hiding this comment

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

Couple of small changes, will address myself

composite.aperture_scatterguard, parameters.selected_aperture
composite.aperture_scatterguard,
parameters.selected_aperture,
group="ready_for_data_collection",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nit: Could use GRID_READY_FOR_DC for this

Comment on lines 131 to 134
beamsize_at_samplex=beamsize.x_um,
beamsize_at_sampley=beamsize.y_um,
focal_spot_size_at_samplex=beamsize.x_um,
focal_spot_size_at_sampley=beamsize.y_um,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should: This needs the conversion from #1476 too

@DominicOram DominicOram merged commit 94bf078 into main Jul 10, 2024
6 checks passed
@DominicOram DominicOram deleted the 1466_wait_for_apsg_and_read_during_collection branch July 10, 2024 15:03
olliesilvester pushed a commit to olliesilvester/mx-bluesky that referenced this pull request Aug 23, 2024
…nd read it during DC (DiamondLightSource/hyperion#1472)

* (DiamondLightSource/hyperion#1466) Wait for aperture move before DC and read it during DC

* Use constant for dc group

* Fix connecting smargon

---------

Co-authored-by: Dominic Oram <dominic.oram@diamond.ac.uk>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wait on aperture_scatterguard move and read during collection Move or remove snapshot_plan
2 participants