Update id logic to use standard movable - #2161
Open
oliwenmandiamond wants to merge 18 commits into
Open
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 360 365 +5
Lines 14324 14429 +105
========================================
+ Hits 14208 14313 +105
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
Relm-Arrowny
left a comment
Contributor
There was a problem hiding this comment.
look good thanks for doing all the work.
Comment on lines
+54
to
+55
| await set_move.set(value=1, timeout=timeout) | ||
| await wait_for_value(gate, UndulatorGateStatus.CLOSE, timeout=timeout) |
Contributor
There was a problem hiding this comment.
We probably have not test it with the real system enough, should add to avoid racing condition. :
Suggested change
| await set_move.set(value=1, timeout=timeout) | |
| await wait_for_value(gate, UndulatorGateStatus.CLOSE, timeout=timeout) | |
| await set_move.set(value=1, timeout=timeout) | |
| await wait_for_value(gate, UndulatorGateStatus.OPEN, timeout=5) | |
| await wait_for_value(gate, UndulatorGateStatus.CLOSE, timeout=timeout) |
|
|
||
| def __init__(self, prefix: str, name: str = ""): | ||
| super().__init__(prefix=prefix, name=name) | ||
| self.set_move = epics_signal_rw(int, prefix + "BLGSETP") |
Contributor
There was a problem hiding this comment.
nit: we made set move SignalW through out so I am not sure which we want to change. I probably does not matter in practice.
Suggested change
| self.set_move = epics_signal_rw(int, prefix + "BLGSETP") | |
| self.set_move = epics_signal_w(int, prefix + "BLGSETP") |
| def __init__(self, prefix: str, name: str = ""): | ||
| motor_pv = f"{prefix}MTR" | ||
| super().__init__(motor_pv, prefix + "SET", name=name) | ||
| del self.motor_stop |
Contributor
There was a problem hiding this comment.
should: matching gap and its safer.
Suggested change
| del self.motor_stop | |
| self.motor_stop = None |
Comment on lines
+128
to
+170
| class UndulatorGap(SafeUndulatorMoverBase[float], Flyable, Preparable): | ||
| """Apple2 undulator gap device. | ||
|
|
||
| Wraps an internal :class:`UndulatorGapMotor` and exposes the Apple2 | ||
| controller interface, where demand positions are written separately from | ||
| triggering motion via a dedicated move PV. | ||
|
|
||
| Supports standard moves as well as fly scanning. | ||
|
|
||
| Args: | ||
| prefix: Beamline-specific PV prefix. | ||
| name: Device name. | ||
| """ | ||
|
|
||
| def __init__(self, prefix: str, name: str = ""): | ||
| super().__init__(prefix=prefix, name=name) | ||
| self.set_move = epics_signal_rw(int, prefix + "BLGSETP") | ||
| with self.add_children_as_readables(): | ||
| self.motor = UndulatorGapMotor( | ||
| prefix, self.gate, self.status, self.set_move | ||
| ) | ||
|
|
||
| async def set_demand_positions(self, value: float) -> None: | ||
| await self.motor.user_setpoint.set(value) | ||
|
|
||
| async def get_timeout(self) -> float: | ||
| return await estimate_motor_timeout_from_signals( | ||
| self.motor.user_setpoint, self.motor.user_readback, self.motor.velocity | ||
| ) | ||
|
|
||
| @AsyncStatus.wrap | ||
| async def prepare(self, value: FlyMotorInfo) -> None: | ||
| """Prepare for a fly scan by moving to the run-up position at max velocity. | ||
| Stores fly info for later use in kickoff. | ||
| """ | ||
| await self.motor.prepare(value) | ||
|
|
||
| @AsyncStatus.wrap | ||
| async def kickoff(self): | ||
| await self.motor.kickoff() | ||
|
|
||
| def complete(self) -> WatchableAsyncStatus: | ||
| return self.motor.complete() |
Contributor
There was a problem hiding this comment.
I think the safe SafeUndulatorMoverBase is already built in the UndulatorGapMotor
this: #2167
…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 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 #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 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}