Use dodal devices more widely for I24 #116
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #116 +/- ##
==========================================
+ Coverage 52.82% 54.10% +1.28%
==========================================
Files 23 26 +3
Lines 3311 3188 -123
==========================================
- Hits 1749 1725 -24
+ Misses 1562 1463 -99 ☔ View full report in Codecov by Sentry. |
| yield from bps.abs_set( | ||
| beamstop.pos_select, BeamstopPositions.ROBOT, group=place | ||
| ) | ||
| yield from bps.abs_set(backlight, BacklightPositions.OUT, group=place) | ||
| yield from bps.mv(det_stage.z, 1300) | ||
| yield from bps.wait(group=place) |
There was a problem hiding this comment.
Nit: mixing abs_set with group and mv like this seems a bit odd it would be a bit better to do one of:
yield from bps.mv(
beamstop.pos_select, BeamstopPositions.ROBOT,
backlight, BacklightPositions.OUT,
det_stage.z, 1300
)or
yield from bps.abs_set(
beamstop.pos_select, BeamstopPositions.ROBOT, group=place
)
yield from bps.abs_set(backlight, BacklightPositions.OUT, group=place)
yield from bps.abs_set(det_stage.z, 1300, group=place)
yield from bps.wait(group=place)There was a problem hiding this comment.
I'd go with the second one because for the backlight I've overloaded set as it needs to turn it on and off depending on position. Not sure move would achieve that in this case...
| yield from bps.abs_set( | ||
| beamstop.pos_select, BeamstopPositions.DATA_COLLECTION, group=place | ||
| ) | ||
| yield from bps.abs_set(backlight, BacklightPositions.IN, group=place) | ||
| yield from bps.wait(group=place) |
There was a problem hiding this comment.
Nit: As above, a mv might be nicer?
| @@ -665,12 +668,14 @@ def run_fixed_target_plan( | |||
| tot_num_imgs = datasetsizei24( | |||
| parameters.num_exposures, parameters.chip_type, parameters.map_type | |||
| ) | |||
| wavelength = yield from bps.rd(dcm.wavelength_in_a) | |||
| if parameters.detector_name == "eiger": | |||
| logger.debug("Start nexus writing service.") | |||
| call_nexgen( | |||
There was a problem hiding this comment.
Could: It would be nice to have a test that covered that call_nexgen has been called with the expected params
... plus various tidy ups
Closes #115
(Edit: forgot to add, needs Dodal652)