Skip to content
This repository was archived by the owner on Sep 2, 2024. It is now read-only.

891 read flux tranmission put into ispyb during collection#937

Merged
5u6in merged 9 commits into
mainfrom
891_read_flux_tranmission_put_into_ispyb_during_collection
Oct 23, 2023
Merged

891 read flux tranmission put into ispyb during collection#937
5u6in merged 9 commits into
mainfrom
891_read_flux_tranmission_put_into_ispyb_during_collection

Conversation

@5u6in

@5u6in 5u6in commented Oct 17, 2023

Copy link
Copy Markdown
Contributor

Fixes #891

  1. Split reading hardware into two event streams; read_hardware_for_ispyb_pre_collection and read_hardware_for_ispyb_during_collection and subsequently modifying and adding new code in order to fix various tests.

  2. Merge conflicts fixed and tests pass accordingly after updating the venv dependencies.

To test:

  1. Run tests

@5u6in
5u6in requested a review from DominicOram October 17, 2023 12:43
@5u6in

5u6in commented Oct 17, 2023

Copy link
Copy Markdown
Contributor Author

I am attempting to resolve the conflicts by using git merge main/origin in the terminal in order to use VSCode's merge editor

@5u6in
5u6in marked this pull request as draft October 18, 2023 08:11
@codecov

codecov Bot commented Oct 18, 2023

Copy link
Copy Markdown

Codecov Report

Merging #937 (6e0c594) into main (ed29f84) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

@@            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     
Files Coverage Δ
...rion/device_setup_plans/read_hardware_for_setup.py 100.00% <100.00%> (ø)
...erion/experiment_plans/flyscan_xray_centre_plan.py 91.78% <100.00%> (+0.05%) ⬆️
...rc/hyperion/experiment_plans/rotation_scan_plan.py 99.12% <100.00%> (+<0.01%) ⬆️
...ernal_interaction/callbacks/ispyb_callback_base.py 92.30% <100.00%> (+0.15%) ⬆️
src/hyperion/parameters/constants.py 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@5u6in 5u6in self-assigned this Oct 18, 2023
@5u6in
5u6in marked this pull request as ready for review October 18, 2023 14:11
@5u6in
5u6in requested a review from d-perl October 18, 2023 14:11
@5u6in
5u6in marked this pull request as draft October 18, 2023 14:54
@5u6in
5u6in marked this pull request as ready for review October 19, 2023 09:12

@d-perl d-perl left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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"

@d-perl d-perl Oct 23, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@5u6in
5u6in merged commit 1c913cd into main Oct 23, 2023
@5u6in
5u6in deleted the 891_read_flux_tranmission_put_into_ispyb_during_collection branch October 23, 2023 11:08
@5u6in
5u6in restored the 891_read_flux_tranmission_put_into_ispyb_during_collection branch October 23, 2023 11:29
@5u6in
5u6in deleted the 891_read_flux_tranmission_put_into_ispyb_during_collection branch November 2, 2023 15:14
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Read flux and transmission (and put into ispyb) during collection

2 participants