Conversation
jacob720
force-pushed
the
1593_expose_more_i04_plans
branch
from
d1e2514 to
d74a928
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1599 +/- ##
==========================================
+ Coverage 92.80% 92.81% +0.01%
==========================================
Files 152 152
Lines 8587 8604 +17
==========================================
+ Hits 7969 7986 +17
Misses 618 618
🚀 New features to boost your workflow:
|
src/mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py
Outdated
Show resolved
Hide resolved
olliesilvester
left a comment
olliesilvester
left a comment
There was a problem hiding this comment.
Sorry, I didn't notice that those dodal wrapped plans already do what we want
| robot: BartRobot = inject("robot"), | ||
| beamstop: Beamstop = inject("beamstop"), | ||
| backlight: Backlight = inject("backlight"), | ||
| scintillator: Scintillator = inject("scintillator"), | ||
| xbpm_feedback: XBPMFeedback = inject("xbpm_feedback"), | ||
| max_pixel: MaxPixel = inject("max_pixel"), | ||
| centre_ellipse: CentreEllipseMethod = inject("beam_centre"), | ||
| attenuator: BinaryFilterAttenuator = inject("attenuator"), | ||
| zoom_controller: ZoomControllerWithBeamCentres = inject("zoom_controller"), | ||
| shutter: ZebraShutter = inject("sample_shutter"), |
There was a problem hiding this comment.
Could: Make a device composite here that just lives in this file, then inject that. It'll make the code neater but isn't that important
| zoom_controller: ZoomControllerWithBeamCentres = inject("zoom_controller"), | ||
| shutter: ZebraShutter = inject("sample_shutter"), | ||
| ): | ||
| """Finds the beam centre at the current zoom level. This""" |
There was a problem hiding this comment.
Random word on docstring!
| LOGGER.info("Find beam centre plan completed!") | ||
|
|
||
|
|
||
| def find_beam_centre_at_current_zoom_and_transmission( |
There was a problem hiding this comment.
nit: maybe rename to find_and_set_beam_centre_at_current_zoom_and_transmission, it's a bit more specific
src/mx_bluesky/beamlines/i04/oav_centering_plans/oav_imaging.py
Outdated
Show resolved
Hide resolved
| from mx_bluesky.common.utils.log import LOGGER | ||
|
|
||
|
|
||
| def move(device_or_signal: Movable, location: Any): |
There was a problem hiding this comment.
Sorry, I don't think we really need this file actually. We can just expose dodal/plan_stubs/wrapped to i04.py's blueapi, and add any plans to that file that we need that are missing.
jacob720
force-pushed
the
1593_expose_more_i04_plans
branch
from
5468ef5 to
0080f17
Compare
olliesilvester
left a comment
olliesilvester
left a comment
There was a problem hiding this comment.
Great, thanks! I feel like we should test out the composite injecting on the beamline, it looks magic to me. We should sit down with David to do #1609 next and see if he's happy to call these new plans that way
|
Please can you fix linting before merging |
2 participants
Fixes #1593
Instructions to reviewer on how to test:
Checks for reviewer