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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

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

Copy link

codecov bot commented Nov 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.54%. Comparing base (e710442) to head (4eaff9e).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #685      +/-   ##
==========================================
+ Coverage   85.31%   85.54%   +0.23%     
==========================================
  Files         101      102       +1     
  Lines        6726     6913     +187     
==========================================
+ Hits         5738     5914     +176     
- Misses        988      999      +11     
Components Coverage Δ
i24 SSX 69.57% <ø> (ø)
hyperion 96.85% <100.00%> (+0.07%) ⬆️
other 94.15% <ø> (-0.98%) ⬇️

@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

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