Merge pull request #89 from dihm/dds_gate_kwargs

Allow passthrough of other kwargs in DDS gate DigitalOut specification.

Author: dihm

labscript/labscript.py

@@ -2860,7 +2860,7 @@ def __init__(self, name, parent_device, connection, digital_gate={}, freq_limits
             digital_gate (dict, optional): Configures a digital output to use as an enable/disable
                 gate for the output. Should contain keys `'device'` and `'connection'`
                 with arguments for the `parent_device` and `connection` for instantiating
-                the :obj:`DigitalOut`.
+                the :obj:`DigitalOut`. All other (optional) keys are passed as kwargs.
             freq_limits (tuple, optional): `(lower, upper)` limits for the 
                 frequency of the output
             freq_conv_class (:obj:`labscript_utils:labscript_utils.unitconversions`, optional): 
@@ -2912,8 +2912,10 @@ def __init__(self, name, parent_device, connection, digital_gate={}, freq_limits
         self.phase = AnalogQuantity(self.name + '_phase', self, 'phase', phase_limits, phase_conv_class, phase_conv_params)
 
         self.gate = None
-        if 'device' in digital_gate and 'connection' in digital_gate:            
-            self.gate = DigitalOut(name + '_gate', digital_gate['device'], digital_gate['connection'])
+        if 'device' in digital_gate and 'connection' in digital_gate:
+            dev = digital_gate.pop('device')
+            conn = digital_gate.pop('connection')
+            self.gate = DigitalOut(name + '_gate', dev, conn, **digital_gate)
         # Did they only put one key in the dictionary, or use the wrong keywords?
         elif len(digital_gate) > 0:
             raise LabscriptError('You must specify the "device" and "connection" for the digital gate of %s.' % (self.name))
@@ -3041,7 +3043,7 @@ def __init__(self,name,parent_device,connection,digital_gate = {},freq_limits =
             digital_gate (dict, optional): Configures a digital output to use as an enable/disable
                 gate for the output. Should contain keys `'device'` and `'connection'`
                 with arguments for the `parent_device` and `connection` for instantiating
-                the :obj:`DigitalOut`.
+                the :obj:`DigitalOut`. All other (optional) keys are passed as kwargs.
             freq_limits (tuple, optional): `(lower, upper)` limits for the 
                 frequency of the output
             freq_conv_class (:obj:`labscript_utils:labscript_utils.unitconversions`, optional): 
@@ -3091,8 +3093,10 @@ def __init__(self,name,parent_device,connection,digital_gate = {},freq_limits =
         self.amplitude = StaticAnalogQuantity(self.name+'_amp',self,'amp',amp_limits,amp_conv_class,amp_conv_params)
         self.phase = StaticAnalogQuantity(self.name+'_phase',self,'phase',phase_limits,phase_conv_class,phase_conv_params)        
 
-        if 'device' in digital_gate and 'connection' in digital_gate:            
-            self.gate = DigitalOut(self.name+'_gate',digital_gate['device'],digital_gate['connection'])
+        if 'device' in digital_gate and 'connection' in digital_gate:
+            dev = digital_gate.pop('device')
+            conn = digital_gate.pop('connection')
+            self.gate = DigitalOut(name + '_gate', dev, conn, **digital_gate)
         # Did they only put one key in the dictionary, or use the wrong keywords?
         elif len(digital_gate) > 0:
             raise LabscriptError('You must specify the "device" and "connection" for the digital gate of %s.'%(self.name))