Repository navigation
Changes to support hyperion-supervisor #1804
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline | ||
| from dodal.device_manager import DeviceManager | ||
| from dodal.devices.baton import Baton | ||
| from dodal.log import set_beamline as set_log_beamline | ||
| from dodal.utils import BeamlinePrefix, get_beamline_name | ||
|
|
||
| BL = get_beamline_name("i03") | ||
| set_log_beamline(BL) | ||
| set_utils_beamline(BL) | ||
|
|
||
| PREFIX = BeamlinePrefix(BL) | ||
|
|
||
|
|
||
| devices = DeviceManager() | ||
|
|
||
|
|
||
| @devices.factory() | ||
| def baton() -> Baton: | ||
| return Baton(f"{PREFIX.beamline_prefix}-CS-BATON-01:") | ||
Empty file.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the purpose of having the supervisor as a beamline seperate to i03? Is this so you can
dodal connect i03_supervisorto just get the baton?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The supervisor beamline is loaded into the bluesky context inside the
hyperion-supervisorprocess. It only needs to access the baton as all the devices are interacted with by thehyperion-blueapiblueapi instance.I think it's cleaner to do it this way rather than loading the main i03 beamline and disabling all the other devices through some special flag, loading
i03.pyis also quite heavyweight due to all the other things it imports.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That makes sense