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

test/coredevice: convert to 'with parallel'

This commit is contained in:
Sebastien Bourdeauducq 2016-02-23 15:48:12 +08:00
parent 0395119961
commit 82f4fd1290
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/test/coredevice/test_analyzer.py
View File

@ -12,7 +12,7 @@ class CreateTTLPulse(EnvExperiment):
def run(self): def run(self):
self.ttl_inout.output() self.ttl_inout.output()
delay_mu(100) delay_mu(100)
with interleave: with parallel:
self.ttl_inout.gate_both_mu(1200) self.ttl_inout.gate_both_mu(1200)
with sequential: with sequential:
delay_mu(100) delay_mu(100)

2
artiq/test/coredevice/test_portability.py
View File

@ -100,7 +100,7 @@ class _Pulses(EnvExperiment):
@kernel @kernel
def run(self): def run(self):
for i in range(3): for i in range(3):
with interleave: with parallel:
with sequential: with sequential:
self.a.pulse(100+i, 20*us) self.a.pulse(100+i, 20*us)
self.b.pulse(200+i, 20*us) self.b.pulse(200+i, 20*us)

8
artiq/test/coredevice/test_rtio.py
View File

@ -16,7 +16,7 @@ class RTT(EnvExperiment):
def run(self): def run(self):
self.ttl_inout.output() self.ttl_inout.output()
delay(1*us) delay(1*us)
with interleave: with parallel:
# make sure not to send two commands into the same RTIO # make sure not to send two commands into the same RTIO
# channel with the same timestamp # channel with the same timestamp
self.ttl_inout.gate_rising(5*us) self.ttl_inout.gate_rising(5*us)
@ -37,7 +37,7 @@ class Loopback(EnvExperiment):
def run(self): def run(self):
self.loop_in.input() self.loop_in.input()
delay(1*us) delay(1*us)
with interleave: with parallel:
self.loop_in.gate_rising(2*us) self.loop_in.gate_rising(2*us)
with sequential: with sequential:
delay(1*us) delay(1*us)
@ -57,7 +57,7 @@ class ClockGeneratorLoopback(EnvExperiment):
self.loop_clock_in.input() self.loop_clock_in.input()
self.loop_clock_out.stop() self.loop_clock_out.stop()
delay(1*us) delay(1*us)
with interleave: with parallel:
self.loop_clock_in.gate_rising(10*us) self.loop_clock_in.gate_rising(10*us)
with sequential: with sequential:
delay(200*ns) delay(200*ns)
@ -110,7 +110,7 @@ class LoopbackCount(EnvExperiment):
def run(self): def run(self):
self.ttl_inout.output() self.ttl_inout.output()
delay(5*us) delay(5*us)
with interleave: with parallel:
self.ttl_inout.gate_rising(10*us) self.ttl_inout.gate_rising(10*us)
with sequential: with sequential:
for i in range(self.npulses): for i in range(self.npulses):