Skip to content

Don't move gonio or aperture after hyperion gridscan. Rename XRC to gridscan#1627

Merged
rtuck99 merged 4 commits intomainfrom
1624_hyperion_doesnt_xrc_in_pin_tip
Feb 18, 2026
Merged

Don't move gonio or aperture after hyperion gridscan. Rename XRC to gridscan#1627
rtuck99 merged 4 commits intomainfrom
1624_hyperion_doesnt_xrc_in_pin_tip

Conversation

@olliesilvester
Copy link
Contributor

Fixes #1624

Also renames "XRC" to "gridscan" in a few places. Gridscan should refer to the actual scan, while XRC should refer to the "move gonio to xtal center" part.

Instructions to reviewer on how to test:

  1. Do thing x
  2. Confirm thing y happens

Checks for reviewer

  • Would the PR title make sense to a user on a set of release notes

@olliesilvester olliesilvester requested a review from a team as a code owner February 12, 2026 14:23
@olliesilvester olliesilvester changed the title don't XRC during hyperion gridscan. Rename XRC to gridscan Don't move gonio or aperture after hyperion gridscan. Rename XRC to gridscan Feb 12, 2026
@olliesilvester olliesilvester changed the title Don't move gonio or aperture after hyperion gridscan. Rename XRC to gridscan fix: Don't move gonio or aperture after hyperion gridscan. Rename XRC to gridscan Feb 12, 2026
@olliesilvester olliesilvester changed the title fix: Don't move gonio or aperture after hyperion gridscan. Rename XRC to gridscan Don't move gonio or aperture after hyperion gridscan. Rename XRC to gridscan Feb 12, 2026
@codecov
Copy link

codecov bot commented Feb 12, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.81%. Comparing base (e8416be) to head (807be74).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1627      +/-   ##
==========================================
- Coverage   92.86%   92.81%   -0.05%     
==========================================
  Files         153      153              
  Lines        8646     8642       -4     
==========================================
- Hits         8029     8021       -8     
- Misses        617      621       +4     
Components Coverage Δ
i24 SSX 78.60% <ø> (ø)
hyperion 98.22% <100.00%> (-0.01%) ⬇️
other 98.22% <ø> (-0.11%) ⬇️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

"mx_bluesky.common.experiment_plans.change_aperture_then_move_plan.change_aperture_then_move_to_xtal",
autospec=True,
)
def test_pin_tip_centre_then_xray_centre_moves_to_centre_of_first_flyscan_result(
Copy link
Contributor Author

@olliesilvester olliesilvester Feb 12, 2026

Choose a reason for hiding this comment

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

Removed this test instead of fixing it since the plan is about to be removed (and that's why codecov is sad)

@olliesilvester olliesilvester added bug Something isn't working needed_for_release i03 Changes relating to I03 labels Feb 12, 2026
@rtuck99 rtuck99 self-assigned this Feb 12, 2026
Copy link
Contributor

Choose a reason for hiding this comment

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

minor nit: would be nice to call it _grid_detect_and_gridscan_plan()

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, only one minor comment

@rtuck99 rtuck99 enabled auto-merge (squash) February 18, 2026 10:01
@rtuck99 rtuck99 merged commit e122b0b into main Feb 18, 2026
25 of 27 checks passed
@rtuck99 rtuck99 deleted the 1624_hyperion_doesnt_xrc_in_pin_tip branch February 18, 2026 10:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working i03 Changes relating to I03 needed_for_release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

hyperion pin_centre_then_xray_centre_plan shouldn't xrc or move aperture to xtal size

2 participants

Comments