Skip to content

1998 fix smargon combined moves#1692

Merged
rtuck99 merged 7 commits into
mainfrom
1998_fix_smargon_combined_moves
May 14, 2026
Merged

1998 fix smargon combined moves#1692
rtuck99 merged 7 commits into
mainfrom
1998_fix_smargon_combined_moves

Conversation

@rtuck99
Copy link
Copy Markdown
Contributor

@rtuck99 rtuck99 commented Apr 8, 2026

Fixes

Requires:

Link to dodal PR (if required):

This removes omega from CombinedMove because a) omega moves cannot be reliably parallelised with other axes and b) following mod-360 changes, we wish to apply a phase angle and not an absolute angle which is inconsistent with the other axes in CombinedMove
Instead, when we perform a combined move, the plan explicitly moves the omega axis beforehand

Instructions to reviewer on how to test:

  1. Tests pass
  2. Functionality as described

Checks for reviewer

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

@rtuck99 rtuck99 added the hyperion Issues for Hyperion, the Bluesky UDC stack label Apr 8, 2026
@rtuck99 rtuck99 changed the base branch from main to 1598_mod_360 April 8, 2026 14:43
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 8, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.89%. Comparing base (93b2fde) to head (86ca2b1).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1692   +/-   ##
=======================================
  Coverage   92.89%   92.89%           
=======================================
  Files         159      159           
  Lines        8678     8679    +1     
=======================================
+ Hits         8061     8062    +1     
  Misses        617      617           
Components Coverage Δ
i24 SSX 77.15% <ø> (ø)
hyperion 98.73% <100.00%> (ø)
other 98.18% <100.00%> (+<0.01%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@rtuck99 rtuck99 force-pushed the 1998_fix_smargon_combined_moves branch from a29c85a to dfd8eab Compare April 9, 2026 09:17
@rtuck99 rtuck99 marked this pull request as ready for review April 9, 2026 09:33
@rtuck99 rtuck99 requested a review from a team as a code owner April 9, 2026 09:33
Base automatically changed from 1598_mod_360 to main April 28, 2026 09:39
@rtuck99 rtuck99 force-pushed the 1998_fix_smargon_combined_moves branch from 370859f to 0fcf09e Compare April 28, 2026 13:48
Copy link
Copy Markdown
Contributor

@noemifrisina noemifrisina left a comment

Choose a reason for hiding this comment

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

lgtm, thanks

@rtuck99 rtuck99 enabled auto-merge (squash) May 14, 2026 13:14
@rtuck99 rtuck99 merged commit 67e1969 into main May 14, 2026
15 checks passed
@rtuck99 rtuck99 deleted the 1998_fix_smargon_combined_moves branch May 14, 2026 13:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hyperion Issues for Hyperion, the Bluesky UDC stack

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants