Skip to content

Fix for smargon combined moves with current slow-smargon workaround#1999

Merged
rtuck99 merged 5 commits into
mainfrom
1998_serialize_omega_combined_move
May 14, 2026
Merged

Fix for smargon combined moves with current slow-smargon workaround#1999
rtuck99 merged 5 commits into
mainfrom
1998_serialize_omega_combined_move

Conversation

@rtuck99
Copy link
Copy Markdown
Contributor

@rtuck99 rtuck99 commented Mar 30, 2026

Fixes

Requires:

This removes support for omega in CombinedMove as described in the accompanying mx-bluesky PR

See also mx-bluesky PR

Instructions to reviewer on how to test:

  1. Tests pass

Checks for reviewer

  • Would the PR title make sense to a scientist on a set of release notes
  • If a new device has been added does it follow the standards
  • If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly
  • Have the connection tests for the relevant beamline(s) been run via dodal connect ${BEAMLINE}

@rtuck99 rtuck99 force-pushed the mx-bluesky_1598_mod_360 branch from a95aa88 to b610d52 Compare April 2, 2026 12:55
@rtuck99 rtuck99 added this to Hyperion Apr 8, 2026
@rtuck99 rtuck99 moved this to In Progress in Hyperion Apr 8, 2026
@rtuck99 rtuck99 force-pushed the 1998_serialize_omega_combined_move branch from 241cf4f to e1bd869 Compare April 8, 2026 09:21
@rtuck99 rtuck99 force-pushed the mx-bluesky_1598_mod_360 branch from e2e258a to 80649ec Compare April 8, 2026 14:36
@rtuck99 rtuck99 force-pushed the 1998_serialize_omega_combined_move branch from e1bd869 to c7b5425 Compare April 8, 2026 14:40
@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 99.13%. Comparing base (e7ae19f) to head (f377ba6).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1999      +/-   ##
==========================================
- Coverage   99.13%   99.13%   -0.01%     
==========================================
  Files         335      335              
  Lines       13062    13056       -6     
==========================================
- Hits        12949    12943       -6     
  Misses        113      113              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@rtuck99 rtuck99 marked this pull request as ready for review April 9, 2026 08:59
@rtuck99 rtuck99 requested a review from a team as a code owner April 9, 2026 08:59
@rtuck99 rtuck99 force-pushed the 1998_serialize_omega_combined_move branch from c47a689 to 81d30c6 Compare April 9, 2026 09:30
@rtuck99 rtuck99 moved this from In Progress to Review in Hyperion Apr 9, 2026
Base automatically changed from mx-bluesky_1598_mod_360 to main April 27, 2026 16:28
@rtuck99 rtuck99 force-pushed the 1998_serialize_omega_combined_move branch from 81d30c6 to eb7d0e6 Compare April 28, 2026 13:44
Copy link
Copy Markdown
Collaborator

@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, only have one comment about the docstring because if I hadn't read the ticket I would be wondering why omega is not part of the CombinedMove - feel free to ignore if it's written somewhere else and I missed it

return value

@AsyncStatus.wrap
async def set(self, value: CombinedMove):
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Nit: may be useful for future reference/future people looking at this mentioning either in this docstring or in the CombinedMove why it does not include the omega axis

@rtuck99 rtuck99 enabled auto-merge (squash) May 14, 2026 12:26
@rtuck99 rtuck99 merged commit ca163b9 into main May 14, 2026
18 of 20 checks passed
@rtuck99 rtuck99 deleted the 1998_serialize_omega_combined_move branch May 14, 2026 13:07
@github-project-automation github-project-automation Bot moved this from Review to Done in Hyperion May 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants