Set xspress3 trigger mode and STAT plugin input in configure()

dls-controls · Nov 30, 2016 · dc2105e · dc2105e
1 parent cf0cc0a
commit dc2105e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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)