Skip to content

Include pmac trigger logic as visr device #1952

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.

Sign up for GitHub

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

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

Include pmac trigger logic as visr device #1952

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00c3d06
Update AD suffixes
Mar 3, 2026
c85b36b
Includes pmac trigger logic as a device
Mar 3, 2026
70811b1
revert AD suffixes
Mar 4, 2026
ebd5690
Update src/dodal/beamlines/b01_1.py
gkalua Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/dodal/beamlines/b01_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from ophyd_async.core import PathProvider, StaticPathProvider, UUIDFilenameProvider
from ophyd_async.epics.adaravis import AravisDetector
from ophyd_async.epics.adcore import NDROIStatIO
from ophyd_async.epics.pmac import PmacIO
from ophyd_async.epics.pmac import PmacIO, PmacTrajectoryTriggerLogic
from ophyd_async.fastcs.panda import HDFPanda

from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
Expand Down Expand Up @@ -137,3 +137,13 @@ def pmac(sample_stage: XYZStage) -> PmacIO:
raw_motors=[sample_stage.y, sample_stage.x],
coord_nums=[1],
)


@devices.factory()
def pmac_trigger_logic(pmac: PmacIO) -> PmacTrajectoryTriggerLogic:
"""The trigger logic for the Power PMAC.

Returns:
PmacTrajectoryTriggerLogic: Flyable device for Power PMAC flyscanning.
"""
return PmacTrajectoryTriggerLogic(pmac)