Update to ophyd-async 0.17a4 by gkalua · Pull Request #1979 · DiamondLightSource/dodal

gkalua · 2026-03-13T16:23:28Z

WIP

OOO until 1/4/26

…iamondLightSource/dodal into update_dodal_ophyd_async_v0.17a1

shihab-dls · 2026-04-16T12:37:16Z

I'm going to make a new release of ophyd-async soon, that includes changes to OdinIO, necessary to fix some existing bugs, but also includes quality of life changes that may reduce the number of operations we do in the configure_arm_trigger_and_disarm_detector plan. Let's block this until I've released the changes, then I will pick up converting the the plan and related test.

DominicOram · 2026-04-23T14:07:34Z

Where are we up to with the new release @shihab-dls? It would be really good to get this working so that we can test the new StandardDetector

codecov · 2026-04-28T17:30:58Z

Codecov Report

❌ Patch coverage is 97.29730% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 99.05%. Comparing base (d4c4ae9) to head (32e05ec).

Files with missing lines	Patch %	Lines
src/dodal/devices/single_trigger_detector.py	77.27%	5 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1979      +/-   ##
==========================================
- Coverage   99.11%   99.05%   -0.07%     
==========================================
  Files         328      325       -3     
  Lines       12774    12662     -112     
==========================================
- Hits        12661    12542     -119     
- Misses        113      120       +7

☔ View full report in Codecov by Sentry.
📢 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.

shihab-dls · 2026-04-28T18:19:48Z

Where are we up to with the new release @shihab-dls? It would be really good to get this working so that we can test the new StandardDetector

Codecov seems wrong to me, but this PR should be ready for a review now.

…iamondLightSource/dodal into update_dodal_ophyd_async_v0.17a1

oliwenmandiamond · 2026-04-29T11:07:52Z

I've tested a bunch of beamlines dodal connects to see if this change breaks beamlines

adsim
can't test locally

b01_1
fails connect (every device a part from synchrotron)
Note: Still connection errors without this change, so not related from what I can tell

b16
passes

b21
Everything connects except

ophyd_async.core._utils.NotConnectedError: 
panda1: NotConnectedError: pva://BL21B-MO-PANDA-01:PVI
waxs: NotConnectedError: pva://BL21BPVI
saxs: NotConnectedError: pva://BL21BPVI

Note: Still fails without this change

i03
Everything connects except

ophyd_async.core._utils.NotConnectedError: 
panda: NotConnectedError: pva://BL03I-EA-PANDA-01:PVI
pin_tip_detection: NotConnectedError:
    array_data: NotConnectedError: pva://BL03I-DI-OAV-01:PVA:ARRAY
fastcs_eiger: NotConnectedError: pva://BL03IPVI

Note: still fails without this change

i11

ophyd_async.core._utils.NotConnectedError: 
mythen3: NotConnectedError:
    driver: NotConnectedError:
        detector_state: TypeError: BL11I-EA-DET-07:DET:DetectorState_RBV has choices ('Idle', 'Error', 'Waiting', 'Finished', 'Transmitting', 'Running', 'Stopped', 'Waiting', 'Initializing', 'Disconnected', 'Aborted'), but <enum 'ADState'> requested ['Idle', 'Acquire', 'Readout', 'Correct', 'Saving', 'Aborting', 'Error', 'Waiting', 'Initializing', 'Disconnected', 'Aborted'] to be strictly equal to them.

NOTE: everything passes without this change, the above us wrong and broken by this change.

i13-1
connects fine

i18

it: NotConnectedError:
    driver: NotConnectedError:
        acquire_time: NotConnectedError:
            read_pv: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:AcquireTime_RBV
            write_pv: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:AcquireTime
        acquire_period: NotConnectedError:
            read_pv: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:AcquirePeriod_RBV
            write_pv: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:AcquirePeriod
        num_images: NotConnectedError:
            read_pv: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:NumImages_RBV
            write_pv: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:NumImages
        image_mode: NotConnectedError:
            read_pv: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:ImageMode_RBV
            write_pv: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:ImageMode
        detector_state: NotConnectedError: ca://BL18I-DI-XBPM-01:DRV:DetectorState_RBV
i0: NotConnectedError:
    driver: NotConnectedError:
        acquire_time: NotConnectedError:
            read_pv: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:AcquireTime_RBV
            write_pv: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:AcquireTime
        acquire_period: NotConnectedError:
            read_pv: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:AcquirePeriod_RBV
            write_pv: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:AcquirePeriod
        num_images: NotConnectedError:
            read_pv: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:NumImages_RBV
            write_pv: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:NumImages
        image_mode: NotConnectedError:
            read_pv: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:ImageMode_RBV
            write_pv: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:ImageMode
        detector_state: NotConnectedError: ca://BL18I-DI-XBPM-02:DRV:DetectorState_RBV

NOTE: dodal connect passes for all devices without this change, something in this change broke it.

i19-2

ophyd_async.core._utils.NotConnectedError: 
eiger: NotConnectedError: pva://BL19IPVI
panda: NotConnectedError: pva://BL19I-EA-PANDA-01:PVI

Note: without this change, the dodal connect error is

ophyd_async.core._utils.NotConnectedError: 
panda: NotConnectedError: pva://BL19I-EA-PANDA-01:PVI
eiger: NotConnectedError:
    drv: NotConnectedError: pva://BL19I-EA-EIGER-01:PVI

i22

it: NotConnectedError:
    driver: NotConnectedError:
        acquire_time: NotConnectedError:
            read_pv: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:AcquireTime_RBV
            write_pv: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:AcquireTime
        acquire_period: NotConnectedError:
            read_pv: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:AcquirePeriod_RBV
            write_pv: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:AcquirePeriod
        num_images: NotConnectedError:
            read_pv: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:NumImages_RBV
            write_pv: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:NumImages
        image_mode: NotConnectedError:
            read_pv: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:ImageMode_RBV
            write_pv: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:ImageMode
        detector_state: NotConnectedError: ca://BL22I-EA-TTRM-02:DRV:DetectorState_RBV
...
i0: NotConnectedError:
    driver: NotConnectedError:
        acquire_time: NotConnectedError:
            read_pv: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:AcquireTime_RBV
            write_pv: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:AcquireTime
        acquire_period: NotConnectedError:
            read_pv: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:AcquirePeriod_RBV
            write_pv: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:AcquirePeriod
        num_images: NotConnectedError:
            read_pv: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:NumImages_RBV
            write_pv: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:NumImages
        image_mode: NotConnectedError:
            read_pv: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:ImageMode_RBV
            write_pv: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:ImageMode
        detector_state: NotConnectedError: ca://BL22I-EA-XBPM-02:DRV:DetectorState_RBV

NOTE: without this change the above connects, something in this change broke it.

i23
connects fine

i24

oav: KeyError: '1.0'
jungfrau: NotConnectedError:
    detector: NotConnectedError: pva://BL24I-EA-JFRAU-01:CAM:PVI
    odin: NotConnectedError: pva://BL24I-EA-JFRAU-01:OD:PVI

Note: different connect error without this change

commissioning_jungfrau: NotConnectedError:
    drv: NotConnectedError: pva://BL24I-EA-JFRAU-01:PVI
    _writer: NotConnectedError:
        frame_counter: NotConnectedError: ca://BL24I-JUNGFRAU-META:FD:NumCaptured
        file_name: NotConnectedError:
            read_pv: NotConnectedError: ca://BL24I-JUNGFRAU-META:FD:FileName_RBV
            write_pv: NotConnectedError: ca://BL24I-JUNGFRAU-META:FD:FileName
        file_path: NotConnectedError:
            read_pv: NotConnectedError: ca://BL24I-JUNGFRAU-META:FD:FilePath_RBV
            write_pv: NotConnectedError: ca://BL24I-JUNGFRAU-META:FD:FilePath
        writer_ready: NotConnectedError: ca://BL24I-JUNGFRAU-META:FD:Ready_RBV
        expected_frames: NotConnectedError: ca://BL24I-JUNGFRAU-META:FD:NumCapture
oav: KeyError: '1.0'

p38
Can't test locally

p45
can't test locally

p99
can't test locally

training_rig
can't test locally?

There is still some stuff to fix...

oliwenmandiamond · 2026-04-29T13:26:21Z

So in summary, changes that need to be made in ophyd-async in a new alpha release @coretl @shihab-dls from what I've spotted so far:

i18, 122
TetrammDriver has been changed to inherit from NDArrayBaseIO to ADBaseIO. This needs to be reverted.

Then for i11

mythen3: NotConnectedError:
    driver: NotConnectedError:
        detector_state: TypeError: BL11I-EA-DET-07:DET:DetectorState_RBV has choices ('Idle', 'Error', 'Waiting', 'Finished', 'Transmitting', 'Running', 'Stopped', 'Waiting', 'Initializing', 'Disconnected', 'Aborted'), but <enum 'ADState'> requested ['Idle', 'Acquire', 'Readout', 'Correct', 'Saving', 'Aborting', 'Error', 'Waiting', 'Initializing', 'Disconnected', 'Aborted'] to be strictly equal to them.

Again, this seems to be because Mythen3Driver has changed from NDArrayBaseIO to ADBaseIO. Needs to be changed back.

oliwenmandiamond · 2026-04-29T13:39:20Z

So in summary, changes that need to be made in ophyd-async in a new alpha release @coretl @shihab-dls from what I've spotted so far:

i18, 122 TetrammDriver has been changed to inherit from NDArrayBaseIO to ADBaseIO. This needs to be reverted.

Then for i11
mythen3: NotConnectedError:
    driver: NotConnectedError:
        detector_state: TypeError: BL11I-EA-DET-07:DET:DetectorState_RBV has choices ('Idle', 'Error', 'Waiting', 'Finished', 'Transmitting', 'Running', 'Stopped', 'Waiting', 'Initializing', 'Disconnected', 'Aborted'), but <enum 'ADState'> requested ['Idle', 'Acquire', 'Readout', 'Correct', 'Saving', 'Aborting', 'Error', 'Waiting', 'Initializing', 'Disconnected', 'Aborted'] to be strictly equal to them.
Again, this seems to be because Mythen3Driver has changed from NDArrayBaseIO to ADBaseIO. Needs to be changed back.

Actually, this doesn't seem possible because the API of NDArrayBaseIO and ADBaseIO has changed between versions. Thoughts on how to resolve?

DominicOram · 2026-04-29T15:18:39Z

I've tested a bunch of beamlines dodal connects to see if this change breaks beamlines

Thanks @oliwenmandiamond! It's expected that the PVI's cannot connect remotely as they use PVA and there is currently no PVA gateway on that allows us to read them remotely. We can test them fully by running dodal connect on the beamlines however, it is worrying that the PVI pvs now seem wrong e.g. pva://BL19I-EA-EIGER-01:PVI is obviously more correct than BL19IPVI, which I think does need looking into.

Actually, this doesn't seem possible because the API of NDArrayBaseIO and ADBaseIO has changed between versions. Thoughts on how to resolve?

I think for the tetramms we can just change it back. For i11 it looks like the enum on BL11I-EA-DET-07:DET:DetectorState_RBV doesn't match that on the latest version of ADCore, I will discuss with controls.

EmsArnold · 2026-05-07T09:16:51Z

b01_1
fails connect (every device a part from synchrotron)
Note: Still connection errors without this change, so not related from what I can tell

Just checked this on the beamline, we're connecting to everything that we expect to connect to (imaging_detector is physically unplugged at the moment, and we've not been able to connect to the synchrotron for a while on the beamline - a separate issue).

DominicOram

I think for the tetramms we can just change it back.

It's not quite that easy. After more investigation I think the underlying issue is that we're using https://github.com/epics-modules/quadEM/tree/master for controlling the tetramms. This doesn't inherit from ADDriver but instead from asynNDArrayDriver. I think there may also be a number of other problems such as the comment in the old driver saying:

        # tetramm never goes idle really, actually it is always acquiring
        # so need to wait for the capture to finish instead

but we're using ADArmLogic now, which does wait for the state to go to idle. Generally probably needs more thought and testing on the beamline

DominicOram · 2026-05-11T15:25:23Z

This is such a big review I think we're going to have to break it up. For now I've put off the mythen issue and then I'm happy to look at the Tetramms and double check the Eiger too.

@oliwenmandiamond are you happy that the electron analyser is still ok?
@Relm-Arrowny are you happy that the ScreenCam is ok?
@rtuck99 and @JamesOHeaDLS this PR also replaces the commissioning Jungfrau that was using @ndevenish's writer with the one using the odin writer. Is this ok?

JamesOHeaDLS · 2026-05-11T15:36:38Z

The Odin for Jungfrau is not ready yet, so it needs to keep using Nick's writer

WIP-Updates-some-imports-and-names

8eae376

DominicOram mentioned this pull request Mar 13, 2026

Update dodal to work with ophyd-async v0.17a1 #1976

Open

oliwenmandiamond and others added 25 commits March 16, 2026 11:07

Update trigger logic

5032bdf

Remove Merlin device as it is now in ophyd-async

04bf4bc

Fix b16

7e123b4

Shorten imports

f4905df

Convert Tetramm detector

b4e30c5

update electron analyser

18be4d3

Remove commissioning junfrau

ff134e4

Merge branch 'main' into update_dodal_ophyd_async_v0.17a1

cd0b977

Merge branch 'main' into update_dodal_ophyd_async_v0.17a1

5a537af

Add electron analyser detector logic

f1898e4

remove _get_value

42d530e

Finish up tests for electron analyser

ec05021

Merge branch 'update_dodal_ophyd_async_v0.17a1' of ssh://github.com/D…

4caf908

…iamondLightSource/dodal into update_dodal_ophyd_async_v0.17a1

Merge branch 'main' into update_dodal_ophyd_async_v0.17a1

4e67f7d

Update p99 to use AndorDetector rather than Andor2Detector

b591802

Update b21

6e75e67

Fix beamlines

75fb732

Update i19-2

55c424c

Fix mythen

060c029

Fix i22 saxs test

bad5706

Remove i24 import CommissioningJungfrau

fcef657

Attempt to fix dodal plans for eiger

5c3cac2

Update electron analyser detector doc string

c16100d

Correct eiger plan

a1ee402

partial test conversion

8239941

oliwenmandiamond changed the title ~~WIP-Updates-some-imports-and-names~~ Update to ophyd-async 0.17a1 Apr 14, 2026

tests: amend fastcs eiger test to use new signals

7a8814a

chore: marge main into update_dodal_ophyd_async_v0.17a1

df4a1c0

tests: amend pattern generator in conftest

3417ce1

shihab-dls force-pushed the update_dodal_ophyd_async_v0.17a1 branch from e3b8f9f to 914c03a Compare April 28, 2026 16:45

chore: bump ophyd-async version

ce542ed

shihab-dls force-pushed the update_dodal_ophyd_async_v0.17a1 branch from 914c03a to ce542ed Compare April 28, 2026 16:48

shihab-dls added 3 commits April 28, 2026 16:54

Merge branch 'main' into update_dodal_ophyd_async_v0.17a1

cd04a65

test: amend test assertion and mock tetram

6934ce2

tests: relax test shutter type signature

59782f4

tests: add tiff and tetram tests to fix codecov

5e44062

shihab-dls marked this pull request as ready for review April 28, 2026 18:18

shihab-dls requested a review from a team as a code owner April 28, 2026 18:18

shihab-dls changed the title ~~Update to ophyd-async 0.17a1~~ Update to ophyd-async 0.17a4 Apr 28, 2026

Merge branch 'update_dodal_ophyd_async_v0.17a1' of ssh://github.com/D…

07582fa

…iamondLightSource/dodal into update_dodal_ophyd_async_v0.17a1

Remove commented out code

32e05ec

DominicOram mentioned this pull request May 11, 2026

Add cam and webcam devices #2032

Open

4 tasks

Fix eiger PV prefixes

26e4fe1

DominicOram requested changes May 11, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to ophyd-async 0.17a4#1979

Update to ophyd-async 0.17a4#1979
gkalua wants to merge 37 commits into
mainfrom
update_dodal_ophyd_async_v0.17a1

gkalua commented Mar 13, 2026 •

edited

Loading

Uh oh!

shihab-dls commented Apr 16, 2026

Uh oh!

DominicOram commented Apr 23, 2026

Uh oh!

codecov Bot commented Apr 28, 2026 •

edited

Loading

Uh oh!

shihab-dls commented Apr 28, 2026

Uh oh!

oliwenmandiamond commented Apr 29, 2026 •

edited

Loading

Uh oh!

oliwenmandiamond commented Apr 29, 2026 •

edited

Loading

Uh oh!

oliwenmandiamond commented Apr 29, 2026

Uh oh!

DominicOram commented Apr 29, 2026

Uh oh!

EmsArnold commented May 7, 2026

Uh oh!

DominicOram left a comment

Uh oh!

DominicOram commented May 11, 2026

Uh oh!

JamesOHeaDLS commented May 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

gkalua commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shihab-dls commented Apr 16, 2026

Uh oh!

DominicOram commented Apr 23, 2026

Uh oh!

codecov Bot commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

shihab-dls commented Apr 28, 2026

Uh oh!

oliwenmandiamond commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oliwenmandiamond commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oliwenmandiamond commented Apr 29, 2026

Uh oh!

DominicOram commented Apr 29, 2026

Uh oh!

EmsArnold commented May 7, 2026

Uh oh!

DominicOram left a comment

Choose a reason for hiding this comment

Uh oh!

DominicOram commented May 11, 2026

Uh oh!

JamesOHeaDLS commented May 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

gkalua commented Mar 13, 2026 •

edited

Loading

codecov Bot commented Apr 28, 2026 •

edited

Loading

oliwenmandiamond commented Apr 29, 2026 •

edited

Loading

oliwenmandiamond commented Apr 29, 2026 •

edited

Loading