846 update i04 to use device_factory #986
Open
Conversation
This file contains 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
rtuck99
changed the base branch from
main
to
846_device_factory_support_for_ophyd_v1
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## 846_device_factory_support_for_ophyd_v1 #986 +/- ##
===========================================================================
+ Coverage 97.51% 97.55% +0.03%
===========================================================================
Files 148 148
Lines 6279 6299 +20
===========================================================================
+ Hits 6123 6145 +22
+ Misses 156 154 -2 ☔ View full report in Codecov by Sentry. |
callumforrester
requested changes
Jan 13, 2025
| ) | ||
|
|
||
|
|
||
| def flux(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -> Flux: | ||
| @device_factory() | ||
| def flux(mock: bool = False) -> Flux: | ||
| """Get the i04 flux device, instantiate it if it hasn't already been. | ||
| If this is called when already instantiated in i04, it will return the existing object. | ||
| """ | ||
| return device_instantiation( |
There was a problem hiding this comment.
Must: The objective of device_factory is to get rid of device_instantiation, this factory should use the Flux constructor
There was a problem hiding this comment.
Flux is an ophyd v1 device and is not yet converted to ophyd_async. See previous PR where ophyd v1 support was added to device_factory
rtuck99
force-pushed
the
846_update_mx_beamline_to_use_device_factory_part_2
branch
from
53a47cc to
cc1b1a4
Compare
callumforrester
approved these changes
Jan 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Part of a series of PRs that addresses #846
This PR builds on and depends on
Instructions to reviewer on how to test:
dodal connect i04connects to all devicesChecks for reviewer
dodal connect ${BEAMLINE}