Update MX beamlines to use new device factory - part 1 #975
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #975 +/- ##
==========================================
+ Coverage 97.48% 97.54% +0.06%
==========================================
Files 148 148
Lines 6238 6279 +41
==========================================
+ Hits 6081 6125 +44
+ Misses 157 154 -3 ☔ View full report in Codecov by Sentry. |
rtuck99
force-pushed
the
846_update_mx_beamlines_to_use_device_factory
branch
from
1e10ec6 to
8096af2
Compare
olliesilvester
changed the title
src/dodal/beamlines/i03.py
Outdated
| @device_factory() | ||
| @skip_device(lambda: BL == "s03") |
There was a problem hiding this comment.
Depending on how mx-bluesky/hyperion is handling this:
| @device_factory() | |
| @skip_device(lambda: BL == "s03") | |
| @device_factory(skip = BL == "s03") |
There was a problem hiding this comment.
or skip = (BL == "s03") if it's any clearer what is meant
There was a problem hiding this comment.
At this point, I think we are likely going to remove all this s03 stuff soon as I think we have pretty much given up on the simulator.
There was a problem hiding this comment.
There is a separate issue to remove the s03 system tests and I have updated that to remove s03 completely
src/dodal/beamlines/i03.py
Outdated
| @device_factory() | ||
| @skip_device(lambda: BL == "s03") | ||
| def flux(wait_for_connection: bool = True, fake_with_ophyd_sim: bool = False) -> Flux: | ||
| def flux(mock: bool = False) -> Flux: | ||
| """Get the i03 flux device, instantiate it if it hasn't already been. | ||
| If this is called when already instantiated in i03, it will return the existing object. | ||
| """ | ||
| return device_instantiation( | ||
| Flux, | ||
| "flux", | ||
| "-MO-FLUX-01:", | ||
| wait_for_connection, | ||
| fake_with_ophyd_sim, | ||
| wait=False, | ||
| fake=mock, |
There was a problem hiding this comment.
Seems to be mixing the two device factory types?
| ) -> Callable[[Callable[[], T]], DeviceInitializationController[T]]: | ||
| def decorator(factory: Callable[[], T]) -> DeviceInitializationController[T]: |
There was a problem hiding this comment.
This has to be D, Ophyd-Async only device, the connection logic does not work for Ophyd devices.
There was a problem hiding this comment.
I have made modifications so that the device factory will now work with ophyd v1 devices.
There was a problem hiding this comment.
So you have, if you can't tell that I stopped looking when I reached this point ;)
I thought MX only had the Eiger left on ophyd v1?
There was a problem hiding this comment.
Plus a few other minor devices, s4_slits, etc. There is currently a GH ticket to move those across but the Eiger is the main thing, it will probably be a little while yet before that gets moved over to ophyd_async. I thought better to make a start on this.
Once they are moved over, we will be able to get rid of a whole bunch of code including the device_instantiation stuff.
DiamondJoseph
dismissed
their stale review
Fingers quicker than brain and eyes
rtuck99
changed the title
…being created in the beamline
rtuck99
force-pushed
the
846_update_mx_beamlines_to_use_device_factory
branch
from
9c828ca to
7ec1f74
Compare
Fixes
for I03, other beamlines to follow in separate PR on top of this one.
Also fixes the following issues:
diamond_filterwas not being instantiated because python generic device types were not recognised as valid device factories.device_factorydid not support usage with sync v1 ophyd devicesSee also mx-bluesky PR
Instructions to reviewer on how to test:
Checks for reviewer
dodal connect ${BEAMLINE}