Skip to content
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

Merged
merged 7 commits into from
Feb 4, 2025

Conversation

DominicOram
Copy link
Contributor

@DominicOram DominicOram commented Nov 27, 2024

Fixes #267

Requires DiamondLightSource/dodal#932

To test

  • Confirm that the use of the aperture scatterguard makes sense and tests pass

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Copy link

codecov bot commented Nov 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.02%. Comparing base (167cda7) to head (b7fb16e).
Report is 1 commits behind head on main.

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           
Components Coverage Δ
i24 SSX 72.84% <ø> (ø)
hyperion 96.55% <100.00%> (+<0.01%) ⬆️
other 96.58% <ø> (ø)

@DominicOram DominicOram marked this pull request as ready for review November 29, 2024 16:41
@@ -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",
Copy link
Contributor

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

Copy link
Contributor Author

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

@DominicOram DominicOram requested a review from rtuck99 January 24, 2025 10:04
Copy link
Contributor

@rtuck99 rtuck99 left a comment

Choose a reason for hiding this comment

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

Approved

@DominicOram DominicOram merged commit aa5f360 into main Feb 4, 2025
22 checks passed
@DominicOram DominicOram deleted the 267_move_scatterguard_and_aperture_seperately branch February 4, 2025 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move scatterguard into correct position without moving aperture
2 participants