From d76182a3eee1b55b90707a87eef03e58a8f78b42 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 10 Jul 2014 15:29:22 +0200
Subject: [PATCH] Experiment -> MPO (Managed Parameter Object)

---
 artiq/language/experiment.py  | 2 +-
 examples/al_spectroscopy.py   | 2 +-
 examples/compiler_test.py     | 2 +-
 examples/coredev_test.py      | 4 ++--
 examples/simple_simulation.py | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/artiq/language/experiment.py b/artiq/language/experiment.py
index a33773c01..ccb604515 100644
--- a/artiq/language/experiment.py
+++ b/artiq/language/experiment.py
@@ -1,7 +1,7 @@
 import itertools
 from collections import namedtuple
 
-class Experiment:
+class MPO:
 	channels = ""
 	parameters = ""
 
diff --git a/examples/al_spectroscopy.py b/examples/al_spectroscopy.py
index cffa14546..7018cfd0c 100644
--- a/examples/al_spectroscopy.py
+++ b/examples/al_spectroscopy.py
@@ -1,7 +1,7 @@
 from artiq.language.units import *
 from artiq.language.experiment import *
 
-class AluminumSpectroscopy(Experiment):
+class AluminumSpectroscopy(MPO):
 	channels = "core mains_sync laser_cooling spectroscopy spectroscopy_b state_detection pmt"
 	parameters = "spectroscopy_freq photon_limit_low photon_limit_high"
 
diff --git a/examples/compiler_test.py b/examples/compiler_test.py
index 6978d7f1b..62060dc09 100644
--- a/examples/compiler_test.py
+++ b/examples/compiler_test.py
@@ -3,7 +3,7 @@ from artiq.language.experiment import *
 
 my_range = range
 
-class CompilerTest(Experiment):
+class CompilerTest(MPO):
 	channels = "core a b A B"
 
 	def print_done(self):
diff --git a/examples/coredev_test.py b/examples/coredev_test.py
index d643b1148..5c4595c9e 100644
--- a/examples/coredev_test.py
+++ b/examples/coredev_test.py
@@ -1,7 +1,7 @@
-from artiq.language.experiment import Experiment, kernel
+from artiq.language.experiment import MPO, kernel
 from artiq.devices import corecom_serial, runtime, core, gpio_core
 
-class CompilerTest(Experiment):
+class CompilerTest(MPO):
 	channels = "core led"
 
 	def output(self, n):
diff --git a/examples/simple_simulation.py b/examples/simple_simulation.py
index 2b7b607b9..9ec66abc0 100644
--- a/examples/simple_simulation.py
+++ b/examples/simple_simulation.py
@@ -1,7 +1,7 @@
 from artiq.language.units import *
 from artiq.language.experiment import *
 
-class SimpleSimulation(Experiment):
+class SimpleSimulation(MPO):
 	channels = "core a b c d"
 
 	@kernel