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

632 get flux from pv#785

Merged
DominicOram merged 7 commits into
mainfrom
632_get-flux-from-pv
Jul 12, 2023
Merged

632 get flux from pv#785
DominicOram merged 7 commits into
mainfrom
632_get-flux-from-pv

Conversation

@noemifrisina

Copy link
Copy Markdown
Contributor

Fixes #632

Link to dodal PR (if required): #113

To test:

  1. Check that all tests still pass

@noemifrisina
noemifrisina marked this pull request as draft July 10, 2023 14:07
@noemifrisina
noemifrisina marked this pull request as ready for review July 11, 2023 10:43
@DominicOram
DominicOram self-requested a review July 12, 2023 15:33

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

Good work, thank you. The test is failing because you need to patch the device in test_when_blueskyrunner_initiated_then_plans_are_setup_and_devices_connected, can you please add it in. We should add it in to S03 though but we can merge this without doing so

@noemifrisina
noemifrisina requested a review from DominicOram July 12, 2023 16:11

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

Great, thank you!

assert test_args == ("DEBUG", True, True, True)


@patch("dodal.beamlines.i03.flux")

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.

Must: You need to patch the Device, not teh function. I've fixed it :)

@codecov

codecov Bot commented Jul 12, 2023

Copy link
Copy Markdown

Codecov Report

Merging #785 (52ed1b4) into main (0b83859) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #785      +/-   ##
==========================================
+ Coverage   93.25%   93.26%   +0.01%     
==========================================
  Files          37       37              
  Lines        1854     1857       +3     
==========================================
+ Hits         1729     1732       +3     
  Misses        125      125              
Impacted Files Coverage Δ
...rc/artemis/experiment_plans/fast_grid_scan_plan.py 93.50% <100.00%> (+0.12%) ⬆️
...emis/external_interaction/ispyb/ispyb_dataclass.py 98.18% <100.00%> (ø)

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

@DominicOram
DominicOram merged commit f8cb2d0 into main Jul 12, 2023
@DominicOram
DominicOram deleted the 632_get-flux-from-pv branch July 12, 2023 17:31
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.

Get flux from PV

2 participants