891 read flux tranmission put into ispyb during collection#937
Conversation
…ions in order to fix tests + tidy up
…nt document at the end as it was not needed
|
I am attempting to resolve the conflicts by using |
…sion_put_into_ispyb_during_collection
Codecov Report
@@ Coverage Diff @@
## main #937 +/- ##
==========================================
- Coverage 93.33% 93.31% -0.02%
==========================================
Files 52 52
Lines 2506 2514 +8
==========================================
+ Hits 2339 2346 +7
- Misses 167 168 +1
... and 1 file with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
d-perl
left a comment
There was a problem hiding this comment.
This is great! I just have one minor comment I think would make it more readable - feel free to do it or not - otherwise looks good to me.
| @@ -3,6 +3,7 @@ | |||
| SIM_BEAMLINE = "BL03S" | |||
| SIM_INSERTION_PREFIX = "SR03S" | |||
| ISPYB_PLAN_NAME = "ispyb_readings" | |||
There was a problem hiding this comment.
Nit: I would like it if these names reflected the plans more closely - e.g. ISPYB_PREPLAN_READ and ISPYB_MIDPLAN_READ or something like that, to show that the two are related
Fixes #891
Split
reading hardwareinto two event streams;read_hardware_for_ispyb_pre_collectionandread_hardware_for_ispyb_during_collectionand subsequently modifying and adding new code in order to fix various tests.Merge conflicts fixed and tests pass accordingly after updating the venv dependencies.
To test: