Merge pull request #78 from ZLLentz/control-arg

MNT: Allow Controls Arg to Accept PseudoPositioners
pcdshub · Aug 29, 2020 · eb30cca · eb30cca
2 parents 9a88fa8 + 7f78e20
commit eb30cca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/pcdsdaq/daq.py b/pcdsdaq/daq.py
@@ -765,6 +765,10 @@ def _ctrl_arg(self, controls):
                 val = device.position
             except AttributeError:
                 val = device.get()
+            try:
+                val = val[0]
+            except Exception:
+                pass
             ctrl_arg.append((name, val))
         return ctrl_arg
 

diff --git a/pcdsdaq/sim/pydaq.py b/pcdsdaq/sim/pydaq.py
@@ -1,3 +1,4 @@
+import numbers
 import time
 import threading
 import logging
@@ -92,6 +93,14 @@ def configure(self, *, record=False, key=0, events=None, l1t_events=None,
                 raise RuntimeError('configure requires events or duration')
             else:
                 self._duration = dur
+            if controls is not None:
+                for name, value in controls:
+                    if not isinstance(name, str):
+                        raise RuntimeError('Expected a string name, got '
+                                           f'{name}')
+                    if not isinstance(value, numbers.Number):
+                        raise RuntimeError('Expected a numeric position, got '
+                                           f'{value}')
 
     def begin(self, *, events=None, l1t_events=None, l3t_events=None,
               duration=None, controls=None, monitors=None):