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
Use ophyd oav edge detetion for grid determination #1214
Merged
DominicOram
merged 8 commits into
main
from
1068_1213_use_ophyd_oav_edge_detetion_for_grid
Mar 6, 2024
Merged
Use ophyd oav edge detetion for grid determination #1214
DominicOram
merged 8 commits into
main
from
1068_1213_use_ophyd_oav_edge_detetion_for_grid
Mar 6, 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
changed the title
1068 1213 use ophyd oav edge detetion for grid
Use ophyd oav edge detetion for grid determination
Mar 5, 2024
DominicOram
suggested changes
Mar 5, 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.
Great. Other than the one comment this looks good enough for the time being. Obviously lots to tidy up still but happy to wait for #1219 for that
Comment on lines
96
to
99
tip_x_px, tip_y_px = yield from trigger_and_return_pin_tip(pin_tip_detection) | ||
if tip_x_px is None or tip_y_px is None: | ||
timeout = yield from bps.rd(pin_tip_detection.validity_timeout) | ||
raise WarningException(f"No pin found after {timeout} seconds") |
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: Isn't this exactly what wait_for_tip_to_be_found
does? Why not use that here?
DominicOram
approved these changes
Mar 6, 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.
Great, thank you!
olliesilvester
pushed a commit
to olliesilvester/mx-bluesky
that referenced
this pull request
Aug 23, 2024
…Source/1068_1213_use_ophyd_oav_edge_detetion_for_grid Use ophyd oav edge detetion for grid determination
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 #1068 and maybe #1213
Link to dodal PR: #DiamondLightSource/dodal#358
Once we are confident in this change we should remove the resulting dead code: #1219
Tested on beamline and seems to work:
https://graylog2.diamond.ac.uk/streams/631745613d8af00a49bfee55/search?rangetype=absolute&fields=message%2Csource&width=1500&highlightMessage=&from=2024-03-05T13%3A41%3A38.000Z&to=2024-03-05T13%3A41%3A44.000Z&q=
https://ispyb.diamond.ac.uk/dc/visit/cm37235-1/dcg/11423343
To test: