Skip to content

Use protocols instead of smargon type for FGS composite, rename smargon to gonio#1619

Merged
olliesilvester merged 13 commits intomainfrom
fgs_switch_smargon_for_protocol
Feb 11, 2026
Merged

Use protocols instead of smargon type for FGS composite, rename smargon to gonio#1619
olliesilvester merged 13 commits intomainfrom
fgs_switch_smargon_for_protocol

Conversation

@olliesilvester
Copy link
Contributor

@olliesilvester olliesilvester commented Feb 6, 2026

Part of #1620

We should start doing this sort of thing for all our plan types. This one is useful for vmxm as their gonio has no Y stage, so we can't use the previous typing.

Link to dodal PR: DiamondLightSource/dodal#1908

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 6, 2026 18:03
@olliesilvester olliesilvester added the vmxm Changes relating to VMXm label Feb 9, 2026
@codecov
Copy link

codecov bot commented Feb 9, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 92.85%. Comparing base (3286d6c) to head (7d1ee1f).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1619   +/-   ##
=======================================
  Coverage   92.85%   92.85%           
=======================================
  Files         153      153           
  Lines        8632     8638    +6     
=======================================
+ Hits         8015     8021    +6     
  Misses        617      617           
Components Coverage Δ
i24 SSX 78.60% <ø> (ø)
hyperion 98.22% <100.00%> (ø)
other 98.33% <100.00%> (+<0.01%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jacob720 jacob720 assigned jacob720 and unassigned jacob720 Feb 11, 2026
@jacob720 jacob720 self-requested a review February 11, 2026 10:08
Copy link
Contributor

@jacob720 jacob720 left a comment

Choose a reason for hiding this comment

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

Looks good!

omega: Motor


MotorWithOmegaType = TypeVar("MotorWithOmegaType", bound=GonioWithOmega)
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason this isn't called GonioWithOmegaType?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not really, I will rename

@olliesilvester olliesilvester enabled auto-merge (squash) February 11, 2026 15:12
@olliesilvester olliesilvester changed the title Use protocols instead of smargon type for FGS composite Use protocols instead of smargon type for FGS composite, rename smargon to gonio Feb 11, 2026
@olliesilvester olliesilvester merged commit 0f6ea7a into main Feb 11, 2026
10 checks passed
@olliesilvester olliesilvester deleted the fgs_switch_smargon_for_protocol branch February 11, 2026 15:15
adaudon pushed a commit that referenced this pull request Feb 13, 2026
* Use protocols instead of smargon type for FGS composite

* Rename devices to gonio in all plans

* Include generic type everywhere in plan
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

vmxm Changes relating to VMXm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants