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

Improvements to rotation scans from live tests inc. accel & shutter time#757

Merged
DominicOram merged 33 commits into
mainfrom
756_fold_rotation_improvements_back
Aug 1, 2023
Merged

Improvements to rotation scans from live tests inc. accel & shutter time#757
DominicOram merged 33 commits into
mainfrom
756_fold_rotation_improvements_back

Conversation

@d-perl

@d-perl d-perl commented Jun 22, 2023

Copy link
Copy Markdown
Contributor

Fixes #756 and fixes #816

DODAL PR: DiamondLightSource/dodal#130

  • Adds improvements made during live testing for jungfrau commissioning on i24 including better handling of an offset for acceleration and shutter opening time
  • Adds bugfixes made during live testing on i03
  • adds moving smargon x y and z motors at the beginning IF specified in parameters; if left out does nothing
  • adds some tests for the above and improves ophyd sim testing of smargon

To test: run tests

Don't be afraid of the line count! it's almost all extra config files and test boilerplate!

@codecov

codecov Bot commented Jul 19, 2023

Copy link
Copy Markdown

Codecov Report

Merging #757 (07fb227) into main (1efedcc) will increase coverage by 0.07%.
Report is 1 commits behind head on main.
The diff coverage is 100.00%.

❗ Current head 07fb227 differs from pull request most recent head 59bc0ac. Consider uploading reports for the commit 59bc0ac to get more accurate results

@@            Coverage Diff             @@
##             main     DiamondLightSource/hyperion#757      +/-   ##
==========================================
+ Coverage   94.38%   94.46%   +0.07%     
==========================================
  Files          40       40              
  Lines        2013     2042      +29     
==========================================
+ Hits         1900     1929      +29     
  Misses        113      113              
Files Changed Coverage Δ
src/artemis/device_setup_plans/setup_zebra.py 100.00% <100.00%> (ø)
src/artemis/experiment_plans/rotation_scan_plan.py 100.00% <100.00%> (ø)
.../artemis/external_interaction/nexus/nexus_utils.py 100.00% <100.00%> (ø)
...ers/plan_specific/rotation_scan_internal_params.py 100.00% <100.00%> (ø)

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

@d-perl d-perl changed the title correctly handle acceleration and shutter time Improvements to rotation scans from live tests inc. accel & shutter time Jul 19, 2023
@d-perl
d-perl marked this pull request as ready for review July 28, 2023 14:53
@d-perl
d-perl requested a review from DominicOram July 28, 2023 14:53

@DominicOram DominicOram left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Sorry, I went quite overboard here with comments, as discussed it became a bit of a review of rotation scans in general. Feel free to spin out into PRs and/or argue with me

Comment thread live_test_rotation_params.json
Comment thread live_test_rotation_params.json
Comment thread src/artemis/experiment_plans/rotation_scan_plan.py
Comment thread live_test_rotation_params.json
Comment thread live_test_rotation_params.json
Comment thread src/artemis/experiment_plans/tests/conftest.py Outdated
Comment thread src/artemis/experiment_plans/tests/conftest.py Outdated
Comment thread src/artemis/external_interaction/nexus/nexus_utils.py
Comment thread src/artemis/experiment_plans/rotation_scan_plan.py
Comment thread src/artemis/experiment_plans/rotation_scan_plan.py
@d-perl
d-perl requested a review from DominicOram August 1, 2023 09:32
@d-perl

d-perl commented Aug 1, 2023

Copy link
Copy Markdown
Contributor Author

@DominicOram are the new issues enough or are there things that you would like fixed in this PR?

@DominicOram DominicOram left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I'm happy that all issues have either been addressed or spun out. Thanks!

@DominicOram
DominicOram merged commit c3f3d17 into main Aug 1, 2023
@DominicOram
DominicOram deleted the 756_fold_rotation_improvements_back branch August 1, 2023 12:08
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.

Notes from rotation scan testing Add improvements from jungfrau testing back to I03 rotation scans

2 participants