This repository has been archived by the owner on Sep 2, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 5
(#1466) Wait for aperture move before DC and read it during DC #1472
Merged
DominicOram
merged 4 commits into
main
from
1466_wait_for_apsg_and_read_during_collection
Jul 10, 2024
Merged
(#1466) Wait for aperture move before DC and read it during DC #1472
DominicOram
merged 4 commits into
main
from
1466_wait_for_apsg_and_read_during_collection
Jul 10, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dperl-dls
requested review from
DominicOram and
olliesilvester
and removed request for
DominicOram
July 3, 2024 13:32
DominicOram
suggested changes
Jul 10, 2024
There was a problem hiding this 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", |
There was a problem hiding this comment.
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, |
There was a problem hiding this comment.
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
approved these changes
Jul 10, 2024
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1466 and fixes #880
To test: