examples: with sequential -> with parallel

m-labs · Feb 23, 2016 · 969f282 · 969f282
1 parent 53ca3a8
commit 969f282
Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/examples/master/repository/coredevice_examples/photon_histogram.py b/examples/master/repository/coredevice_examples/photon_histogram.py
@@ -28,15 +28,15 @@ def program_cooling(self):
 
     @kernel
     def cool_detect(self):
-        with interleave:
+        with parallel:
             self.bd_sw.pulse(1*ms)
             self.bdd_sw.pulse(1*ms)
 
         self.bd_dds.set(self.cool_f)
         self.bd_sw.pulse(100*us)
 
         self.bd_dds.set(self.detect_f)
-        with interleave:
+        with parallel:
             self.bd_sw.pulse(self.detect_t)
             self.pmt.gate_rising(self.detect_t)
 

diff --git a/examples/master/repository/coredevice_examples/simple/dds_test.py b/examples/master/repository/coredevice_examples/simple/dds_test.py
@@ -27,7 +27,7 @@ def run(self):
                 self.led.on()
             else:
                 self.led.off()
-            with interleave:
+            with parallel:
                 with sequential:
                     self.dds0.set(100*MHz + 4*i*kHz)
                     self.ttl0.pulse(500*us)

diff --git a/examples/master/repository/coredevice_examples/tdr.py b/examples/master/repository/coredevice_examples/tdr.py
@@ -62,7 +62,7 @@ def many(self, n, p):
     @kernel
     def one(self, t, p):
         t0 = now_mu()
-        with interleave:
+        with parallel:
             self.pmt0.gate_both_mu(2*p)
             self.ttl2.pulse_mu(p)
         for i in range(len(t)):

diff --git a/examples/sim/al_spectroscopy.py b/examples/sim/al_spectroscopy.py
@@ -24,15 +24,15 @@ def run(self):
             delay(10*us)
             self.laser_cooling.pulse(100*MHz, 100*us)
             delay(5*us)
-            with interleave:
+            with parallel:
                 self.spectroscopy.pulse(self.spectroscopy_freq, 100*us)
                 with sequential:
                     delay(50*us)
                     self.spectroscopy_b.set(200)
             delay(5*us)
             while True:
                 delay(5*us)
-                with interleave:
+                with parallel:
                     self.state_detection.pulse(100*MHz, 10*us)
                     photon_count = self.pmt.count_gate(10*us)
                 if (photon_count < self.photon_limit_low

diff --git a/examples/sim/simple_simulation.py b/examples/sim/simple_simulation.py
@@ -11,7 +11,7 @@ def build(self):
 
     @kernel
     def run(self):
-        with interleave:
+        with parallel:
             with sequential:
                 self.a.pulse(100*MHz, 20*us)
                 self.b.pulse(200*MHz, 20*us)