From 00c3d062f5fa49f35ffc74bdd8119f4e11b4b623 Mon Sep 17 00:00:00 2001 From: gkalua Date: Tue, 3 Mar 2026 17:04:47 +0000 Subject: [PATCH 1/4] Update AD suffixes --- src/dodal/beamlines/b01_1.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dodal/beamlines/b01_1.py b/src/dodal/beamlines/b01_1.py index 8e0b19f3059..58d74686cfd 100644 --- a/src/dodal/beamlines/b01_1.py +++ b/src/dodal/beamlines/b01_1.py @@ -88,8 +88,8 @@ def spectroscopy_detector(path_provider: PathProvider) -> AravisDetector: return AravisDetector( pv_prefix, path_provider=path_provider, - drv_suffix=CAM_SUFFIX, - fileio_suffix=HDF5_SUFFIX, + driver_suffix=CAM_SUFFIX, + writer_suffix=HDF5_SUFFIX, plugins={ "roistat": NDROIStatIO(f"{pv_prefix}ROISTAT:", num_channels=3), }, @@ -108,8 +108,8 @@ def imaging_detector(path_provider: PathProvider) -> AravisDetector: return AravisDetector( f"{PREFIX.beamline_prefix}-DI-DCAM-01:", path_provider=path_provider, - drv_suffix=CAM_SUFFIX, - fileio_suffix=HDF5_SUFFIX, + driver_suffix=CAM_SUFFIX, + writer_suffix=HDF5_SUFFIX, ) From c85b36b6b87a499e1d7c46a4d4e41dfd238fa8fd Mon Sep 17 00:00:00 2001 From: gkalua Date: Tue, 3 Mar 2026 17:17:26 +0000 Subject: [PATCH 2/4] Includes pmac trigger logic as a device --- src/dodal/beamlines/b01_1.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/dodal/beamlines/b01_1.py b/src/dodal/beamlines/b01_1.py index 58d74686cfd..8030e19b66e 100644 --- a/src/dodal/beamlines/b01_1.py +++ b/src/dodal/beamlines/b01_1.py @@ -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 @@ -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. + """ + return PmacTrajectoryTriggerLogic(pmac) From 70811b14753051fa72e7c7331fa49da16e013168 Mon Sep 17 00:00:00 2001 From: gkalua Date: Wed, 4 Mar 2026 09:20:57 +0000 Subject: [PATCH 3/4] revert AD suffixes --- src/dodal/beamlines/b01_1.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dodal/beamlines/b01_1.py b/src/dodal/beamlines/b01_1.py index 8030e19b66e..cf1ee9dc21a 100644 --- a/src/dodal/beamlines/b01_1.py +++ b/src/dodal/beamlines/b01_1.py @@ -88,8 +88,8 @@ def spectroscopy_detector(path_provider: PathProvider) -> AravisDetector: return AravisDetector( pv_prefix, path_provider=path_provider, - driver_suffix=CAM_SUFFIX, - writer_suffix=HDF5_SUFFIX, + drv_suffix=CAM_SUFFIX, + fileio_suffix=HDF5_SUFFIX, plugins={ "roistat": NDROIStatIO(f"{pv_prefix}ROISTAT:", num_channels=3), }, @@ -108,8 +108,8 @@ def imaging_detector(path_provider: PathProvider) -> AravisDetector: return AravisDetector( f"{PREFIX.beamline_prefix}-DI-DCAM-01:", path_provider=path_provider, - driver_suffix=CAM_SUFFIX, - writer_suffix=HDF5_SUFFIX, + drv_suffix=CAM_SUFFIX, + fileio_suffix=HDF5_SUFFIX, ) From ebd5690002377e9aa3d4adab7151180289da6765 Mon Sep 17 00:00:00 2001 From: gkalua <148199949+gkalua@users.noreply.github.com> Date: Wed, 4 Mar 2026 16:13:37 +0000 Subject: [PATCH 4/4] Update src/dodal/beamlines/b01_1.py Co-authored-by: Shihab S <162436767+shihab-dls@users.noreply.github.com> --- src/dodal/beamlines/b01_1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dodal/beamlines/b01_1.py b/src/dodal/beamlines/b01_1.py index cf1ee9dc21a..0c507bbbd6c 100644 --- a/src/dodal/beamlines/b01_1.py +++ b/src/dodal/beamlines/b01_1.py @@ -144,6 +144,6 @@ def pmac_trigger_logic(pmac: PmacIO) -> PmacTrajectoryTriggerLogic: """The trigger logic for the Power PMAC. Returns: - PmacTrajectoryTriggerLogic. + PmacTrajectoryTriggerLogic: Flyable device for Power PMAC flyscanning. """ return PmacTrajectoryTriggerLogic(pmac)