From 0d7892a1e5151e28213808354484d48f2cdc0a38 Mon Sep 17 00:00:00 2001
From: Mark Johnson <mark.johnson.ai@gmail.com>
Date: Tue, 14 Mar 2017 10:57:10 +1100
Subject: [PATCH] fix : removed parameters to deal with clockResetPhase
 functionality and replaced with a user function.

---
 .../Signadyne/signadyne_common/SD_DIG.py      | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/qcodes/instrument_drivers/Signadyne/signadyne_common/SD_DIG.py b/qcodes/instrument_drivers/Signadyne/signadyne_common/SD_DIG.py
index 4069464bf64..295ca4faf74 100644
--- a/qcodes/instrument_drivers/Signadyne/signadyne_common/SD_DIG.py
+++ b/qcodes/instrument_drivers/Signadyne/signadyne_common/SD_DIG.py
@@ -98,33 +98,6 @@ def __init__(self, **kwargs):
             docstring='The frequency of internal CLKsys in Hz'
         )
 
-        # for clockResetPhase
-        self.add_parameter(
-            'trigger_behaviour',
-            label='Trigger behaviour for resetting CLKsys phase',
-            vals=Ints(),
-            set_cmd=None,
-            get_cmd=None,
-            docstring='The trigger behaviour for resetting CLKsys phase'
-        )
-
-        self.add_parameter(
-            'PXI_trigger',
-            label='PXI trigger for clockResetPhase',
-            vals=Ints(),
-            set_cmd=None,
-            get_cmd=None,
-            docstring='The PXI trigger which resets CLKsys'
-        )
-
-        self.add_parameter(
-            'skew',
-            label='Skew between PXI_CLK10 and CLKsync',
-            vals=Ints(),
-            set_cmd=None,
-            get_cmd=None,
-            docstring='The skew between PXI_CLK10 and CLKsync in multiples of 10 ns'
-        )
 
         for n in range(n_channels):
 
@@ -353,6 +326,17 @@ def DAQ_flush_multiple(self, DAQ):
         pass
 
 
+    def clock_reset_phase(self, trigger_behaviour, trigger_source, skew = 0.0):
+        """ Reset the clock phase between CLKsync and CLKsys
+        
+        Args:
+            trigger_behaviour (int) : 
+            trigger_source    (int) : the PXI trigger number
+            [skew]         (double) : the skew between PXI_CLK10 and CLKsync in multiples of 10ns
+    
+        """
+        self.SD_AIN.clockResetPhase(trigger_behaviour, trigger_source, skew)
+
     #######################################################
     ### Functions used internally to set/get parameters ###
     #######################################################