Skip to content

Fixes after waffle testing#1978

Merged
DominicOram merged 6 commits into
mainfrom
xtal_bluesky_14_fixes_after_testing
Jul 2, 2026
Merged

Fixes after waffle testing#1978
DominicOram merged 6 commits into
mainfrom
xtal_bluesky_14_fixes_after_testing

Conversation

@DominicOram

@DominicOram DominicOram commented Mar 13, 2026

Copy link
Copy Markdown
Contributor

Fixes DiamondLightSource/crystallography-bluesky#14

The Union issue on the linked issue was due to the Attenuator not being able to have a union of types in it's set method. I spent some time trying to find ways around this to allow the device to be set with floats/ints but ended up leaving it so you had to use the enum. This is the most type correct way for it to work but we'll see how users react to it...

Instructions to reviewer on how to test:

  1. Confirm new tests pass
  2. Confirm all other problems in the linked issue are covered by other issues

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}

@DominicOram DominicOram requested a review from a team as a code owner March 13, 2026 16:03
@DominicOram DominicOram changed the title Xtal bluesky 14 fixes after testing Fixes after waffle testing Mar 13, 2026
@codecov

codecov Bot commented Mar 13, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 99.16%. Comparing base (27bb849) to head (df225b0).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1978   +/-   ##
=======================================
  Coverage   99.16%   99.16%           
=======================================
  Files         347      347           
  Lines       13588    13591    +3     
=======================================
+ Hits        13474    13477    +3     
  Misses        114      114           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@jacob720

Copy link
Copy Markdown
Contributor

Tried to test this out on the beamline but got
attenuator: NotConnectedError: transmission: TypeError: BL15J-OP-ATTN-02:MP1:SELECT has choices ('In', 'Out'), but <enum 'AttenuatorPositions'> requested ['100%', '50%', '10%', '1%', '0.1%', '0.01%', '0.001%'] to be strictly equal to them.

@jacob720 jacob720 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 to me

@DominicOram DominicOram enabled auto-merge (squash) July 2, 2026 13:32
@DominicOram DominicOram merged commit 95e5a17 into main Jul 2, 2026
10 checks passed
@DominicOram DominicOram deleted the xtal_bluesky_14_fixes_after_testing branch July 2, 2026 13:36
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.

i15-1 beamline testing 16/03/2026

2 participants