Update id logic to use standard movable - #2161
Merged
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #2161 +/- ##
=======================================
Coverage 99.19% 99.19%
=======================================
Files 361 364 +3
Lines 14339 14378 +39
=======================================
+ Hits 14223 14262 +39
Misses 116 116 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Relm-Arrowny
requested changes
Aug 6, 2026
Relm-Arrowny
left a comment
Contributor
There was a problem hiding this comment.
look good thanks for doing all the work.
…b.com/DiamondLightSource/dodal into update_id_logic_to_use_standard_movable
* Create UndulatorAccessControl Device * Clean up imports * Add access control as dependency for test * Add doc string and improve set_ and wait func
This reverts commit 20383ba.
Relm-Arrowny
requested changes
Aug 17, 2026
Co-authored-by: Raymond Fan <raymond.fan@diamond.ac.uk>
Relm-Arrowny
approved these changes
Aug 18, 2026
Relm-Arrowny
left a comment
Contributor
There was a problem hiding this comment.
Thanks LGTM, love the pr note.
4 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2158
This fixes the insertion device logic to be compatible with
StandardMovable, specifically theUndulatorGap. This has also restructured the ID logic so that we now have these new files:Other notable change is
MotorStringSetpointwhich allows us to still useMotorwhich have setpoints as str still take floats using a derived signal, allowing the ID logic to not break when usingMotorMovableLogic(soon to beMotorFlyableMoveLogic).This has made the logic much more modular and easier to understand. Please note I have not altered the actual logic or the tests so this hasn't changed the ID behaviour. This was necessary because
Motorhas changed to useStandardMovable(and in ophyd-async 0.21.1StandardFlyable) which made the current API conflicting as it was overriding methods it shouldn't of. This will make the migration to ophyd-async 0.21.1 much easier to manage. I've also added more documentation to classes to make it easier for someone else to maintain in the future.Instructions to reviewer on how to test:
Checks for reviewer
dodal connect ${BEAMLINE}