pxi6733: use a method as DoneEvent callback

fallen · fallen · commit d78a275655cf · 2015-05-22T16:08:07.000+02:00
diff --git a/artiq/devices/pxi6733/driver.py b/artiq/devices/pxi6733/driver.py
@@ -12,11 +12,6 @@ def close(self):
         pass
 
 
-def done_callback_py(taskhandle, status, callback_data):
-    callback_data.daq.DAQmxClearTask(taskhandle)
-    callback_data.tasks.remove(taskhandle)
-
-
 class DAQmx:
     """NI PXI6733 DAQ interface."""
 
@@ -29,6 +24,10 @@ def __init__(self, device, analog_output, clock):
         self.tasks = []
         self.daq = daq
 
+    def done_callback_py(self, taskhandle, status, callback_data):
+        self.daq.DAQmxClearTask(taskhandle)
+        self.tasks.remove(taskhandle)
+
     def load_sample_values(self, values):
         """Load sample values into PXI 6733 device.
 
@@ -60,9 +59,9 @@ def load_sample_values(self, values):
         if ret:
             raise IOError("Error while writing samples to the channel buffer")
 
-        done_callback = self.daq.DAQmxDoneEventCallbackPtr(done_callback_py)
+        done_cb = self.daq.DAQmxDoneEventCallbackPtr(self.done_callback_py)
         self.tasks.append(t.taskHandle)
-        self.daq.DAQmxRegisterDoneEvent(t.taskHandle, 0, done_callback, self)
+        self.daq.DAQmxRegisterDoneEvent(t.taskHandle, 0, done_cb, None)
         t.StartTask()
 
     def close(self):
