From dc2105efda324eda64ac0067764729d2f6901caa Mon Sep 17 00:00:00 2001 From: Nic Bricknell Date: Wed, 30 Nov 2016 15:53:59 +0000 Subject: [PATCH] Set xspress3 trigger mode and STAT plugin input in configure() --- malcolm/blocks/xspress3/Xspress3DetectorDriver.yaml | 7 +++++++ malcolm/parts/ADCore/statspluginpart.py | 3 ++- malcolm/parts/xspress3/xspress3driverpart.py | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/malcolm/blocks/xspress3/Xspress3DetectorDriver.yaml b/malcolm/blocks/xspress3/Xspress3DetectorDriver.yaml index 78b855bd0..6ca667ee1 100644 --- a/malcolm/blocks/xspress3/Xspress3DetectorDriver.yaml +++ b/malcolm/blocks/xspress3/Xspress3DetectorDriver.yaml @@ -19,6 +19,13 @@ rbvSuff: _RBV widget: textinput +- parts.ca.CAChoicePart: + name: triggerMode + description: Triggering and behaviour of xspress3 time frames + pv: $(prefix):TriggerMode + rbvSuff: _RBV + widget: textinput + - parts.ca.CADoublePart: name: exposure description: Exposure time for each frame diff --git a/malcolm/parts/ADCore/statspluginpart.py b/malcolm/parts/ADCore/statspluginpart.py index c0ba21975..71821cdf4 100644 --- a/malcolm/parts/ADCore/statspluginpart.py +++ b/malcolm/parts/ADCore/statspluginpart.py @@ -14,4 +14,5 @@ def report_info(self, _): def configure(self, task, completed_steps, steps_to_do, part_info): task.put_many(self.child, dict( enableCallbacks=True, - computeStatistics=True)) + computeStatistics=True, + inp="XSP3.POS")) diff --git a/malcolm/parts/xspress3/xspress3driverpart.py b/malcolm/parts/xspress3/xspress3driverpart.py index 95dcbcfc0..d2acdd43d 100644 --- a/malcolm/parts/xspress3/xspress3driverpart.py +++ b/malcolm/parts/xspress3/xspress3driverpart.py @@ -19,5 +19,6 @@ def configure(self, task, completed_steps, steps_to_do, part_info, params): else: steps_per_row = steps_to_do task.put(self.child["pointsPerRow"], steps_per_row) + task.put(self.child["triggerMode"], "Hardware") super(Xspress3DriverPart, self).configure( task, completed_steps, steps_to_do, part_info, params)