srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

test/coredevice/test_pulses: fix first_timestamp

This commit is contained in:
Sebastien Bourdeauducq 2015-12-29 12:43:53 +08:00
parent 9d7d614139
commit aa29defd02
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
artiq/test/coredevice/portability.py
View File

@ -58,13 +58,14 @@ class _Misc(EnvExperiment):
class _PulseLogger(EnvExperiment): class _PulseLogger(EnvExperiment):
def build(self): def build(self):
self.setattr_device("core") self.setattr_device("core")
self.setattr_argument("output_list") self.setattr_argument("parent_test")
self.setattr_argument("name") self.setattr_argument("name")
def _append(self, t, l, f): def _append(self, t, l, f):
if not hasattr(self, "first_timestamp"): if not hasattr(self.parent_test, "first_timestamp"):
self.first_timestamp = t self.parent_test.first_timestamp = t
self.output_list.append((self.name, t-self.first_timestamp, l, f)) self.parent_test.output_list.append(
(self.name, t-self.parent_test.first_timestamp, l, f))
def int_usec(self, mu): def int_usec(self, mu):
return round(mu_to_seconds(mu, self.core)*1000000) return round(mu_to_seconds(mu, self.core)*1000000)
@ -89,7 +90,7 @@ class _Pulses(EnvExperiment):
for name in "a", "b", "c", "d": for name in "a", "b", "c", "d":
pl = _PulseLogger(*self.managers(), pl = _PulseLogger(*self.managers(),
output_list=self.output_list, parent_test=self,
name=name) name=name)
setattr(self, name, pl) setattr(self, name, pl)