This repository has been archived by the owner on Sep 2, 2024. It is now read-only.
Correctly read pin tip location using ophyd #1143
Merged
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
| tip_x_y_px = yield from bps.rd(pin_tip) | ||
| if isinstance(pin_tip, PinTipDetection): | ||
| tip_x_y_px = yield from bps.rd(pin_tip) | ||
| LOGGER.info("Pin tip not found, waiting a second and trying again") |
There was a problem hiding this comment.
Should: This logging message should be in the below if statement
| @@ -266,6 +266,13 @@ def flux(): | |||
| return i03.flux(fake_with_ophyd_sim=True) | |||
|
|
|||
|
|
|||
| @pytest.fixture | |||
| def ophyd_pin_tip_detection(): | |||
| RunEngine() # A RE is needed to start the bluesky loop | |||
There was a problem hiding this comment.
Should: Use the RE from this conftest
olliesilvester
approved these changes
Feb 14, 2024
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #1143 +/- ##
==========================================
- Coverage 93.09% 92.83% -0.26%
==========================================
Files 69 65 -4
Lines 3419 3351 -68
==========================================
- Hits 3183 3111 -72
- Misses 236 240 +4 ☔ View full report in Codecov by Sentry. |
olliesilvester
added a commit
to olliesilvester/mx-bluesky
that referenced
this pull request
Aug 23, 2024
…Source/1125_ophyd_pin_tip_hotfixes Correctly read pin tip location using ophyd
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 #1125
Link to dodal PR (if required): DiamondLightSource/dodal#328
Note, will be tidied up in #1069
To test: