test/coredevice/portability/pulses: compute time differences in MU

m-labs · Mar 20, 2016 · 1c9b8a1 · 1c9b8a1
1 parent ffe4d81
commit 1c9b8a1
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/artiq/test/coredevice/test_portability.py b/artiq/test/coredevice/test_portability.py
@@ -67,17 +67,15 @@ def build(self):
     def _append(self, t, l, f):
         if not hasattr(self.parent_test, "first_timestamp"):
             self.parent_test.first_timestamp = t
-        self.parent_test.output_list.append(
-            (self.name, t-self.parent_test.first_timestamp, l, f))
-
-    def int_usec(self, mu):
-        return round(mu_to_seconds(mu, self.core)*1000000)
+        origin = self.parent_test.first_timestamp
+        t_usec = round(mu_to_seconds(t-origin, self.core)*1000000)
+        self.parent_test.output_list.append((self.name, t_usec, l, f))
 
     def on(self, t, f):
-        self._append(self.int_usec(t), True, f)
+        self._append(t, True, f)
 
     def off(self, t):
-        self._append(self.int_usec(t), False, 0)
+        self._append(t, False, 0)
 
     @kernel
     def pulse(self, f, duration):