-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
Use separate aperture and scatterguard moves #685
Use separate aperture and scatterguard moves #685
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #685 +/- ##
=======================================
Coverage 87.01% 87.02%
=======================================
Files 101 101
Lines 6970 6974 +4
=======================================
+ Hits 6065 6069 +4
Misses 905 905
|
@@ -315,7 +315,7 @@ def test_read_hardware_for_ispyb_updates_from_ophyd_devices( | |||
# fmt: on | |||
|
|||
@patch( | |||
"dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range", | |||
"dodal.devices.aperturescatterguard._safe_move_whilst_in_beam", |
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.
The assert_event
in the previous line needs updating for the new underscored device names
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.
I ended up just removing the underscore in the names, it was becoming painful trying to feed the name change through everywhere and it wasn't really in scope of the original issue
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.
Approved
Fixes #267
Requires DiamondLightSource/dodal#932
To test