From 969f282de941122531a916d1febc91a50c36874a Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Tue, 23 Feb 2016 18:39:02 +0100
Subject: [PATCH] examples: with sequential -> with parallel

---
 .../master/repository/coredevice_examples/photon_histogram.py | 4 ++--
 .../master/repository/coredevice_examples/simple/dds_test.py  | 2 +-
 examples/master/repository/coredevice_examples/tdr.py         | 2 +-
 examples/sim/al_spectroscopy.py                               | 4 ++--
 examples/sim/simple_simulation.py                             | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/master/repository/coredevice_examples/photon_histogram.py b/examples/master/repository/coredevice_examples/photon_histogram.py
index 1c3604301..307b3a52e 100644
--- a/examples/master/repository/coredevice_examples/photon_histogram.py
+++ b/examples/master/repository/coredevice_examples/photon_histogram.py
@@ -28,7 +28,7 @@ class PhotonHistogram(EnvExperiment):
 
     @kernel
     def cool_detect(self):
-        with interleave:
+        with parallel:
             self.bd_sw.pulse(1*ms)
             self.bdd_sw.pulse(1*ms)
 
@@ -36,7 +36,7 @@ class PhotonHistogram(EnvExperiment):
         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
index 2b474e8a9..a0b60bf73 100644
--- a/examples/master/repository/coredevice_examples/simple/dds_test.py
+++ b/examples/master/repository/coredevice_examples/simple/dds_test.py
@@ -27,7 +27,7 @@ class DDSTest(EnvExperiment):
                 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
index abdc32fd8..a71628645 100644
--- a/examples/master/repository/coredevice_examples/tdr.py
+++ b/examples/master/repository/coredevice_examples/tdr.py
@@ -62,7 +62,7 @@ class TDR(EnvExperiment):
     @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
index dc4d0d992..bfbf1c5c4 100644
--- a/examples/sim/al_spectroscopy.py
+++ b/examples/sim/al_spectroscopy.py
@@ -24,7 +24,7 @@ class AluminumSpectroscopy(EnvExperiment):
             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)
@@ -32,7 +32,7 @@ class AluminumSpectroscopy(EnvExperiment):
             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
index 91fdd5643..1b9205825 100644
--- a/examples/sim/simple_simulation.py
+++ b/examples/sim/simple_simulation.py
@@ -11,7 +11,7 @@ class SimpleSimulation(EnvExperiment):
 
     @kernel
     def run(self):
-        with interleave:
+        with parallel:
             with sequential:
                 self.a.pulse(100*MHz, 20*us)
                 self.b.pulse(200*MHz, 20*us)