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

Fixes for ophyd-async 0.9.0a2 #1014

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Fixes for ophyd-async 0.9.0a2 #1014

wants to merge 10 commits into from

Conversation

DiamondJoseph
Copy link
Contributor

@DiamondJoseph DiamondJoseph commented Jan 24, 2025

Fixes #1017

  • DeviceCollector renamed to init_device

  • sim.demo module renamed to sim

  • Initialisation arguments for HDF detectors change slightly as a result of added support for non-hdf writers

  • save_panda utility plan updated to use new ophyd-async save

  • Merlin now inherits from ADBaseController

Instructions to reviewer on how to test:

  1. Do thing x
  2. Confirm thing y happens

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}

@DiamondJoseph DiamondJoseph requested a review from a team as a code owner January 24, 2025 14:03
@DiamondJoseph DiamondJoseph linked an issue Jan 24, 2025 that may be closed by this pull request
@DiamondJoseph DiamondJoseph linked an issue Jan 24, 2025 that may be closed by this pull request

from dodal.devices.i13_1.merlin_io import MerlinDriverIO, MerlinImageMode


class MerlinController(DetectorController):
class MerlinController(ADBaseController):
Copy link
Collaborator

Choose a reason for hiding this comment

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

I didn't properly check if this is correct but it looked about right

@@ -327,7 +327,7 @@ async def test_prepare_sets_up_writer(
assert (await tetramm.hdf.num_extra_dims.get_value()) == 0
assert await tetramm.hdf.lazy_open.get_value()
assert await tetramm.hdf.swmr_mode.get_value()
assert (await tetramm.hdf.file_template.get_value()) == "%s/%s.h5"
assert (await tetramm.hdf.file_template.get_value()) == "%s%s.h5"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Don't know if this change in syntax could break anything for anyone?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looking to try and find where this has even come from

Copy link

codecov bot commented Jan 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.54%. Comparing base (5c82bbd) to head (ddbc5d6).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1014      +/-   ##
==========================================
+ Coverage   97.52%   97.54%   +0.01%     
==========================================
  Files         154      154              
  Lines        6393     6395       +2     
==========================================
+ Hits         6235     6238       +3     
+ Misses        158      157       -1     

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

@olliesilvester
Copy link
Collaborator

@DiamondJoseph It's pretty much there now but please can you check the linting ins tetramm and test_dcm ?

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.

Update use of save/load from ophyd-async to version 0.9.0a2
2 participants