1495 make apple2 and pgm start flying in sync#1496
Merged
Relm-Arrowny merged 26 commits into1480-make-apple2-preparable-and-flyablefrom Jan 8, 2026
Merged
Conversation
4 tasks
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 1480-make-apple2-preparable-and-flyable #1496 +/- ##
========================================================================
Coverage 99.12% 99.13%
========================================================================
Files 286 286
Lines 10804 10825 +21
========================================================================
+ Hits 10710 10731 +21
Misses 94 94 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Relm-Arrowny
changed the base branch from
main
to
1480-make-apple2-preparable-and-flyable
…-apple2-and-pgm-start-flying-in-sync
5 tasks
…-apple2-and-pgm-start-flying-in-sync
…-apple2-and-pgm-start-flying-in-sync
…-apple2-and-pgm-start-flying-in-sync
…-apple2-and-pgm-start-flying-in-sync
…-make-apple2-and-pgm-start-flying-in-sync
…-apple2-and-pgm-start-flying-in-sync
…-apple2-and-pgm-start-flying-in-sync
oliwenmandiamond
approved these changes
Jan 8, 2026
Contributor
oliwenmandiamond
left a comment
oliwenmandiamond
left a comment
There was a problem hiding this comment.
Small nit / question, but other then that looks good
…-apple2-and-pgm-start-flying-in-sync
Relm-Arrowny
merged commit f032e03
into
1480-make-apple2-preparable-and-flyable
11 checks passed
Relm-Arrowny
added a commit
that referenced
this pull request
Jan 28, 2026
* Make id_gap flyable * add Flyable to UndulatorGap * add successful test for prepare * clean up and add logs * correct pv * first hack at motorise undulator * add test plus docstring * reduce double checking * reordering * remove tests * remove motor limit test * add typing * correct velocity * simply stop e.g. just remove it rather have it as soft signal. * group functions into UndulartorBase * make set wait * rename mover to motor for gap * add prepare, kickoff and complete to apple2 * correct spelling * add typing to set_move * remove infix in undulatorPhaseMotor * remove logger fixture * change Id motors to use Motor user_setpoint * fix lint * remove DEFAULT_MOTOR_MIN_TIMEOUT * revert velocity back to correct pv. * fixes type change in test * remove _set_pol_setpoint * typing * combine apple2vals * overriding user_setpoint in motor in order to get the correct behavior. * correct fat finger * fix typing in test * fix lint * Added test for the new structure * fix test name * change apple2 values to float * make gap into unstoppable motor * make phase motor * add test for unstoppable motor * fix dodal updates * Better naming * correct docstring * correction docstring * use partial and add decimal on test parameter instead of casting * missed the zeros * change trying to stop into warning * split code into files * add log and split out polarisation * rename id_enum to enum to be inline with convention * missed one * change id_enum to enum again * tiddy up enums * remove fat finger * split controller test out * add stand alone test for energy and polarisation * update docstring * move fixture to conftest * fix import to full path * fix yet an other path * add prepare to Insertion energy * remove empty space * move re test in the right place * 1495 make apple2 and pgm start flying in sync (#1496) * Move EnergySetter to apple2 * fix link * update to main * Correction on EnergySetter * change name of apple2 typing * add flyable and prepareable to energysetter * fix enum * correct test * add type ignore for mock * fix the final flyable * make beam energy flyable * fix test mock naming * correct energy_motor_cioverter side_effect * revert * Move super() call to the end of the constructor * fix lint * Update src/dodal/devices/insertion_device/energy.py Co-authored-by: oliwenmandiamond <136330507+oliwenmandiamond@users.noreply.github.com> --------- Co-authored-by: oliwenmandiamond <136330507+oliwenmandiamond@users.noreply.github.com>
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
2 participants
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 #1495
Last part of #1467
Instructions to reviewer on how to test:
Checks for reviewer
dodal connect ${BEAMLINE}