Skip to content

Merlin ophyd-async integration#33

Merged
Thomas A Caswell (tacaswell) merged 12 commits into
mainfrom
merlin-opyhd
Jun 26, 2026
Merged

Merlin ophyd-async integration#33
Thomas A Caswell (tacaswell) merged 12 commits into
mainfrom
merlin-opyhd

Conversation

@jennmald

@jennmald Jennefer Maldonado (jennmald) commented Mar 26, 2026

Copy link
Copy Markdown
Contributor

Integrates the merlin with ophyd-async with the help of Jakub Wlodek (@jwlodek)

  • implements the fix to the TriggerMode_rbv types
  • fixes the asset path to match the directory
  • tested on the beamline and ran with overnight scan

Comment thread src/cditools/merlin.py Outdated
Comment thread src/cditools/merlin_async.py Outdated
Comment thread src/cditools/merlin_async.py Outdated
@tacaswell Thomas A Caswell (tacaswell) merged commit f1c39d9 into main Jun 26, 2026
10 checks passed
@tacaswell Thomas A Caswell (tacaswell) deleted the merlin-opyhd branch June 26, 2026 00:49
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.

3 participants