Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make attenuator with enum filter values #969

Merged
merged 18 commits into from
Jan 6, 2025
Merged

Conversation

olliesilvester
Copy link
Collaborator

@olliesilvester olliesilvester commented Dec 19, 2024

Fixes some of #927

This will require a change in mx_bluesky before merging

Instructions to reviewer on how to test:

  1. Check changes are sensible
  2. dodal connect p99 should still work assuming devices are connected
  3. dodal connect i02_1 passes

Checks for reviewer

  • Would the PR title make sense to a scientist on a set of release notes
  • If a new device has been added does it follow the standards
  • If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly
  • Have the connection tests for the relevant beamline(s) been run via dodal connect ${BEAMLINE}

@olliesilvester olliesilvester force-pushed the 927_common_filter_wheel branch from 48fea8e to ac38ea6 Compare December 19, 2024 18:48
Comment on lines +28 to +31
I02_1FilterOneSelections,
I02_1FilterTwoSelections,
I02_1FilterThreeSelections,
I02_1FilterFourSelections,
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ugly, but maybe it has to be. Open to suggestions

Copy link

codecov bot commented Dec 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.47%. Comparing base (75f1019) to head (df48e84).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #969      +/-   ##
==========================================
+ Coverage   95.88%   97.47%   +1.58%     
==========================================
  Files         145      147       +2     
  Lines        6240     6208      -32     
==========================================
+ Hits         5983     6051      +68     
+ Misses        257      157     -100     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@olliesilvester olliesilvester marked this pull request as ready for review December 19, 2024 18:57
@olliesilvester olliesilvester requested a review from a team as a code owner December 19, 2024 18:57
@olliesilvester olliesilvester changed the title Make common attenuator filter Make attenuator with enum filter values Dec 19, 2024
Copy link
Contributor

@DiamondJoseph DiamondJoseph left a comment

Choose a reason for hiding this comment

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

Generally looks good, I have opinionated change requests.

src/dodal/devices/attenuator/attenuator.py Outdated Show resolved Hide resolved
src/dodal/beamlines/i02_1.py Outdated Show resolved Hide resolved
src/dodal/beamlines/i02_1.py Outdated Show resolved Hide resolved
src/dodal/beamlines/p99.py Outdated Show resolved Hide resolved
src/dodal/devices/attenuator/filter.py Outdated Show resolved Hide resolved
src/dodal/devices/attenuator/filter_selections.py Outdated Show resolved Hide resolved
tests/devices/unit_tests/p99/test_p99_stage.py Outdated Show resolved Hide resolved
@olliesilvester olliesilvester merged commit 6e13d85 into main Jan 6, 2025
19 checks passed
@olliesilvester olliesilvester deleted the 927_common_filter_wheel branch January 6, 2025 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants