Skip to content

Commit 969f282

Browse files
committedFeb 23, 2016
examples: with sequential -> with parallel
1 parent 53ca3a8 commit 969f282

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed
 

‎examples/master/repository/coredevice_examples/photon_histogram.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ def program_cooling(self):
2828

2929
@kernel
3030
def cool_detect(self):
31-
with interleave:
31+
with parallel:
3232
self.bd_sw.pulse(1*ms)
3333
self.bdd_sw.pulse(1*ms)
3434

3535
self.bd_dds.set(self.cool_f)
3636
self.bd_sw.pulse(100*us)
3737

3838
self.bd_dds.set(self.detect_f)
39-
with interleave:
39+
with parallel:
4040
self.bd_sw.pulse(self.detect_t)
4141
self.pmt.gate_rising(self.detect_t)
4242

‎examples/master/repository/coredevice_examples/simple/dds_test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def run(self):
2727
self.led.on()
2828
else:
2929
self.led.off()
30-
with interleave:
30+
with parallel:
3131
with sequential:
3232
self.dds0.set(100*MHz + 4*i*kHz)
3333
self.ttl0.pulse(500*us)

‎examples/master/repository/coredevice_examples/tdr.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def many(self, n, p):
6262
@kernel
6363
def one(self, t, p):
6464
t0 = now_mu()
65-
with interleave:
65+
with parallel:
6666
self.pmt0.gate_both_mu(2*p)
6767
self.ttl2.pulse_mu(p)
6868
for i in range(len(t)):

‎examples/sim/al_spectroscopy.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ def run(self):
2424
delay(10*us)
2525
self.laser_cooling.pulse(100*MHz, 100*us)
2626
delay(5*us)
27-
with interleave:
27+
with parallel:
2828
self.spectroscopy.pulse(self.spectroscopy_freq, 100*us)
2929
with sequential:
3030
delay(50*us)
3131
self.spectroscopy_b.set(200)
3232
delay(5*us)
3333
while True:
3434
delay(5*us)
35-
with interleave:
35+
with parallel:
3636
self.state_detection.pulse(100*MHz, 10*us)
3737
photon_count = self.pmt.count_gate(10*us)
3838
if (photon_count < self.photon_limit_low

‎examples/sim/simple_simulation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def build(self):
1111

1212
@kernel
1313
def run(self):
14-
with interleave:
14+
with parallel:
1515
with sequential:
1616
self.a.pulse(100*MHz, 20*us)
1717
self.b.pulse(200*MHz, 20*us)

0 commit comments

Comments
 (0)
Please sign in to comment.