Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wait for eiger to disarm before stopping it #936

Merged
merged 3 commits into from
Jan 20, 2025

Conversation

DominicOram
Copy link
Contributor

Fixes #935

Instructions to reviewer on how to test:

  1. Confirm new 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}

Copy link

codecov bot commented Nov 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.51%. Comparing base (a822a40) to head (72a8563).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #936   +/-   ##
=======================================
  Coverage   97.51%   97.51%           
=======================================
  Files         152      152           
  Lines        6347     6354    +7     
=======================================
+ Hits         6189     6196    +7     
  Misses        158      158           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

if not self.disarming_status.done:
LOGGER.info("Eiger still disarming, waiting on disarm")
self.disarming_status.wait(self.timeouts.arming_timeout)
else:
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps this fixes the issue, but I'm unclear on what exactly we should do in stop(), looking at bluesky run_engine.py it seems stop() is invoked in a variety of scenarios, including at the end of a plan, during a suspend and when pause() is invoked. The impression I get is that being stopped is at least somewhat resumable.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure but I think it's outside of the scope of this issue, I've made #994.

@DominicOram DominicOram merged commit f93183f into main Jan 20, 2025
17 checks passed
@DominicOram DominicOram deleted the 935_stop_eiger_causing_issues branch January 20, 2025 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Stopping the Eiger whilst it's disarming causes issues
3 participants