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

DNM Fixes for ophyd async types mega merge #858

Draft
wants to merge 12 commits into
base: mx-bluesky_475_multi_centre_plan
Choose a base branch
from

Conversation

rtuck99
Copy link
Contributor

@rtuck99 rtuck99 commented Oct 22, 2024

Fixes breakages in dodal for bluesky/ophyd-async#594

Note this fix depends on #814

TODO

  • Unit tests currently failing due to signal names being clobbered on assignment
  • Unit tests currently ignored due to assert_configuration() in ophyd async not working for numpy arrays
  • panda constructor needs an appropriate URI
  • PMACStringFoo devices need to be changed as Signals-inside-signals are no longer permitted
  • FluorescenceDetectorControlState needs to be either a str-based StrictEnum with appropriate values

Instructions to reviewer on how to test:

  1. Unit tests pass
  2. Check the following changes:
    • Usage of StrictEnum/SubsetEnum is appropriate
    • Conversion of signals to numpy array types is appropriate

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}

@rtuck99 rtuck99 force-pushed the mx-bluesky_475_multi_centre_plan branch from 65bf6a3 to 303869f Compare October 22, 2024 13:41
@rtuck99 rtuck99 force-pushed the fixes_for_ophyd_async_mega_merge branch from 431b950 to 1b5cfd6 Compare October 23, 2024 15:10
@rtuck99 rtuck99 force-pushed the fixes_for_ophyd_async_mega_merge branch from 1b5cfd6 to 9b8109d Compare October 23, 2024 15:14
Copy link

codecov bot commented Oct 23, 2024

Codecov Report

Attention: Patch coverage is 96.55172% with 4 lines in your changes missing coverage. Please review.

Project coverage is 95.19%. Comparing base (1dfa59a) to head (3732d8f).

Files with missing lines Patch % Lines
src/dodal/devices/fluorescence_detector_motion.py 0.00% 4 Missing ⚠️
Additional details and impacted files
@@                        Coverage Diff                        @@
##           mx-bluesky_475_multi_centre_plan     #858   +/-   ##
=================================================================
  Coverage                             95.19%   95.19%           
=================================================================
  Files                                   120      120           
  Lines                                  4997     4978   -19     
=================================================================
- Hits                                   4757     4739   -18     
+ Misses                                  240      239    -1     

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

@rtuck99 rtuck99 force-pushed the fixes_for_ophyd_async_mega_merge branch from def6e22 to 3732d8f Compare October 25, 2024 12:14
@stan-dot stan-dot added bug Something isn't working python Pull requests that update Python code tests labels Oct 28, 2024
Comment on lines +109 to +111
uri = kwargs.get("uri")
uri_or_prefix = uri or prefix
kwargs_with_prefix_or_uri = dict(kwargs)
Copy link
Contributor

Choose a reason for hiding this comment

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

please better naming or typing, that uri_or_prefix: str for clarity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working python Pull requests that update Python code tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants