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

Add plan to do pin tip centring then xray centring#852

Merged
DominicOram merged 14 commits into
mainfrom
499_full_centring_continued
Aug 21, 2023
Merged

Add plan to do pin tip centring then xray centring#852
DominicOram merged 14 commits into
mainfrom
499_full_centring_continued

Conversation

@DominicOram

@DominicOram DominicOram commented Aug 4, 2023

Copy link
Copy Markdown
Collaborator

Fixes #499

Note for setting the zoom I just changed the OAVCentring.json file. This will set all OAV parameters twice but to the same values, check on the beamline if this causes much slowness

To test:

  1. Confirm new tests pass

@DominicOram
DominicOram requested a review from d-perl August 4, 2023 15:41
@codecov

codecov Bot commented Aug 4, 2023

Copy link
Copy Markdown

Codecov Report

Merging #852 (10694ed) into main (75f1814) will increase coverage by 0.03%.
The diff coverage is 92.52%.

@@            Coverage Diff             @@
##             main     DiamondLightSource/hyperion#852      +/-   ##
==========================================
+ Coverage   92.78%   92.82%   +0.03%     
==========================================
  Files          46       49       +3     
  Lines        2301     2397      +96     
==========================================
+ Hits         2135     2225      +90     
- Misses        166      172       +6     
Files Changed Coverage Δ
...plan_specific/grid_scan_with_edge_detect_params.py 96.00% <66.66%> (ø)
...periment_plans/pin_centre_then_xray_centre_plan.py 88.88% <88.88%> (ø)
...lan_specific/pin_centre_then_xray_centre_params.py 96.00% <96.00%> (ø)
src/artemis/device_setup_plans/utils.py 100.00% <100.00%> (ø)
...rc/artemis/experiment_plans/experiment_registry.py 100.00% <100.00%> (ø)
...rc/artemis/experiment_plans/full_grid_scan_plan.py 100.00% <100.00%> (ø)
.../artemis/experiment_plans/pin_tip_centring_plan.py 98.18% <100.00%> (+0.03%) ⬆️

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

@DominicOram
DominicOram marked this pull request as draft August 7, 2023 16:59
@DominicOram

Copy link
Copy Markdown
Collaborator Author

Issue seen on beamline where this arms the eiger twice

@DominicOram

Copy link
Copy Markdown
Collaborator Author

Also had issue where we weren't sleeping after setting up the oav params

@DominicOram
DominicOram marked this pull request as ready for review August 9, 2023 15:28
Comment thread src/artemis/device_setup_plans/utils.py Outdated
Comment thread src/artemis/experiment_plans/full_grid_scan.py Outdated
Comment thread src/artemis/experiment_plans/pin_tip_centring_plan.py
Comment thread src/artemis/parameters/plan_specific/grid_scan_with_edge_detect_params.py Outdated
Comment thread src/artemis/parameters/plan_specific/grid_scan_with_edge_detect_params.py Outdated
Comment thread src/artemis/experiment_plans/pin_centre_then_xray_centre_plan.py
Comment thread src/artemis/experiment_plans/pin_centre_then_xray_centre_plan.py
Comment thread src/artemis/experiment_plans/pin_centre_then_xray_centre_plan.py Outdated
Comment thread src/artemis/parameters/plan_specific/pin_centre_then_xray_centre_params.py Outdated
Comment thread src/artemis/experiment_plans/full_grid_scan.py
Co-authored-by: Tom Willemsen <tomwillemsen1995@gmail.com>

@Tom-Willemsen Tom-Willemsen 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.

Happy that my requested changes have been addressed.

check on the beamline if this causes much slowness

Has this been done? Happy for you to do before or after merging as appropriate...

@DominicOram

Copy link
Copy Markdown
Collaborator Author

Has this been done? Happy for you to do before or after merging as appropriate...

Yh, this has been tested on the beamline and works without being too slow. May be avenues to speed up but probably not required at this stage

@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.

looks good, no additional comments over Tom's review. I like the names of the plans.

@DominicOram
DominicOram merged commit bdb5a97 into main Aug 21, 2023
@DominicOram
DominicOram deleted the 499_full_centring_continued branch August 21, 2023 12:28
@DominicOram DominicOram mentioned this pull request Aug 22, 2023
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.

Full centring algorithm

3 participants