Skip to content

Conversation

@Relm-Arrowny
Copy link
Contributor

@Relm-Arrowny Relm-Arrowny commented Aug 20, 2025

Fixes #1469 #1261

  • Change Apple2Val to be float
  • Added undulatorBase for safeUndulatorMover.
  • Added MotorWithoutStop
  • GapSafeUndulatorUnstoppable to overwrite motor set method to allow flyable.
  • Added overwrite prepare function in UndulatorGap to check min_velocity before prepare.

Instructions to reviewer on how to test:

  1. Check test cover use cases.
  2. run test.
  3. Confirm test passes.

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}

@Relm-Arrowny Relm-Arrowny linked an issue Aug 20, 2025 that may be closed by this pull request
@codecov
Copy link

codecov bot commented Aug 20, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 99.12%. Comparing base (00af332) to head (c9bbabc).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1470   +/-   ##
=======================================
  Coverage   99.12%   99.12%           
=======================================
  Files         283      286    +3     
  Lines       10736    10781   +45     
=======================================
+ Hits        10642    10687   +45     
  Misses         94       94           

☔ 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.

@Relm-Arrowny Relm-Arrowny marked this pull request as ready for review August 20, 2025 15:47
@Relm-Arrowny Relm-Arrowny requested a review from a team as a code owner August 20, 2025 15:47
Copy link
Collaborator

@olliesilvester olliesilvester left a comment

Choose a reason for hiding this comment

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

Logic looks good but as far as I can see this is doing the same thing as the standard ophyd-async motor.

I still think we should create a new SafeMotor in dodal/ophyd-async which is a subclass of the standard motor, and gives the behaviour that you need. It would simplify this device quite a bit now

@Relm-Arrowny
Copy link
Contributor Author

Relm-Arrowny commented Dec 18, 2025

Now that I have typed it out, probably for another issue to do and not for this ticket...

Why wait, it is done but this https://github.com/bluesky/ophyd-async/pull/1152/files is breaking test.

Copy link
Contributor

@oliwenmandiamond oliwenmandiamond left a comment

Choose a reason for hiding this comment

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

Looks much better, but you will also have to mirror this for the tests and split that into its own parts

@Relm-Arrowny Relm-Arrowny enabled auto-merge (squash) January 6, 2026 16:21
@Relm-Arrowny Relm-Arrowny merged commit 6ca1b6e into main Jan 6, 2026
8 checks passed
@Relm-Arrowny Relm-Arrowny deleted the make_undulatorGap_flyable branch January 6, 2026 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Make UndulatorGap flyable

6 participants