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

Tidy up device creation for full grid scan #661

Merged
merged 11 commits into from
May 22, 2023

Conversation

DominicOram
Copy link
Collaborator

Fixes #660

To test:

  1. Confirm tests pass

@codecov
Copy link

codecov bot commented May 15, 2023

Codecov Report

Merging #661 (fbd1edc) into main (822aa06) will increase coverage by 0.71%.
The diff coverage is 100.00%.

❗ Current head fbd1edc differs from pull request most recent head 08ebea8. Consider uploading reports for the commit 08ebea8 to get more accurate results

@@            Coverage Diff             @@
##             main     #661      +/-   ##
==========================================
+ Coverage   89.04%   89.75%   +0.71%     
==========================================
  Files          34       34              
  Lines        1488     1494       +6     
==========================================
+ Hits         1325     1341      +16     
+ Misses        163      153      -10     
Impacted Files Coverage Δ
...rc/artemis/experiment_plans/fast_grid_scan_plan.py 82.87% <100.00%> (+0.44%) ⬆️
src/artemis/experiment_plans/full_grid_scan.py 70.31% <100.00%> (+0.95%) ⬆️
...rtemis/experiment_plans/oav_grid_detection_plan.py 100.00% <100.00%> (+3.44%) ⬆️
src/artemis/parameters/beamline_parameters.py 100.00% <100.00%> (+14.63%) ⬆️
src/artemis/parameters/constants.py 100.00% <100.00%> (ø)

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

Copy link
Collaborator

@dperl-dls dperl-dls left a comment

Choose a reason for hiding this comment

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

great, thanks for tidying this up! I just added a little sneaky change (making the get beamline params a bit more general, in prep for adding beamlines) and a couple more tests, so I'll approve this and leave for you to look at

@DominicOram
Copy link
Collaborator Author

I like moving to the dictionary for BEAMLINE_PARAMETER_PATHS but I would rather limit the places we pull out the environment variable. Can we reuse either get_beamline_name in dodal or get_beamline_name here? This will also mean we can better handle the simulation case.

@dperl-dls
Copy link
Collaborator

Done, now this depends on DiamondLightSource/dodal#66
This will require setting and S03 env var as currently implemented because I didn't want to put S03 as a default in a generic function

@dperl-dls dperl-dls merged commit 0c93e7b into main May 22, 2023
@dperl-dls dperl-dls deleted the 660_tidy_up_device_creation_for_other_scans branch May 22, 2023 12:34
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.

Make sure we initialise aperture scatterguard properly
3 participants