Full grid scan sets transmission, transmission sent to ispbyb#753
Conversation
|
When this is merged, the GDA code currently handling this should be removed |
bd09fe8 to
15730bd
Compare
Codecov Report
@@ Coverage Diff @@
## main #753 +/- ##
==========================================
- Coverage 93.30% 93.28% -0.02%
==========================================
Files 37 37
Lines 1866 1861 -5
==========================================
- Hits 1741 1736 -5
Misses 125 125
... and 4 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
DominicOram
left a comment
There was a problem hiding this comment.
Looks good, thanks. I think we need to change the API to make it clearer this is now the transmission we want to set, not the readback. I suggest adding transmission to the experiment params for external API instead of ispyb params (but keep the ones in ispyb params for internal use)
| yield from bps.abs_set( | ||
| attenuator, parameters.artemis_params.ispyb_params.transmission | ||
| ) |
There was a problem hiding this comment.
Must: We need to wait on this to be done in the gridscan. In fact it falls under the same sort of wait as arming, I think we rename arming (here and in the wait) to something like "ready_for_data_collection" then put the set_transmission in the same group
| yield from read_hardware_for_ispyb(und, syn, slits, attn) | ||
| yield from bps.close_run() | ||
|
|
||
| RE( |
There was a problem hiding this comment.
Should: We should add transmission to the test values and assertions here
15b66bd to
48e15fa
Compare
|
Right now the tests are failing due to a new Pydantic version, the same as #758 (review) |
Should now be fixed with |
Fixes #716 and fixes #744
To test: