m-labs · Feb 22, 2015 · Feb 22, 2015
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,4 @@ doc/manual/_build
 /dist
 /*.egg-info
 /.coverage
-examples/results
+examples/master/results
diff --git a/artiq/frontend/artiq_master.py b/artiq/frontend/artiq_master.py
@@ -40,7 +40,6 @@ def main():
     pdb.hooks.append(simplephist)
     rtr = RTResults()
     repository = Repository()
-    explist = FlatFileDB("explist.pyon")
 
     if os.name == "nt":
         loop = asyncio.ProactorEventLoop()
@@ -71,7 +70,6 @@ def run_cb(rid, run_params):
         "master_pdb": pdb,
         "master_schedule": scheduler,
         "master_repository": repository,
-        "master_explist": explist
     })
     loop.run_until_complete(server_control.start(
         args.bind, args.port_control))
@@ -84,7 +82,7 @@ def run_cb(rid, run_params):
         "parameters": pdb.data,
         "parameters_simplehist": simplephist.history,
         "rt_results": rtr.groups,
-        "explist": explist.data
+        "explist": repository.explist
     })
     loop.run_until_complete(server_notify.start(
         args.bind, args.port_notify))

diff --git a/artiq/frontend/artiq_run.py b/artiq/frontend/artiq_run.py
@@ -112,9 +112,7 @@ def main():
             module = file_import(args.file)
             if args.unit is None:
                 units = [(k, v) for k, v in module.__dict__.items()
-                         if k[0] != "_"
-                            and isclass(v)
-                            and hasattr(v, "__artiq_unit__")]
+                         if isclass(v) and hasattr(v, "__artiq_unit__")]
                 l = len(units)
                 if l == 0:
                     print("No units found in module")

diff --git a/artiq/master/repository.py b/artiq/master/repository.py
@@ -1,4 +1,33 @@
+import os
+from inspect import isclass
+
+from artiq.protocols.sync_struct import Notifier
+from artiq.tools import file_import
+
+
+def scan_experiments():
+    r = dict()
+    for f in os.listdir("repository"):
+        if f.endswith(".py"):
+            try:
+                m = file_import(os.path.join("repository", f))
+            except:
+                continue
+            for k, v in m.__dict__.items():
+                if isclass(v) and hasattr(v, "__artiq_unit__"):
+                    entry = {
+                        "file": os.path.join("repository", f),
+                        "unit": k,
+                        "gui_file": getattr(v, "__artiq_gui_file__", None)
+                    }
+                    r[v.__artiq_unit__] = entry
+    return r
+
+
 class Repository:
+    def __init__(self):
+        self.explist = Notifier(scan_experiments())
+
     def get_data(self, filename):
-        with open(filename) as f:
+        with open(os.path.join("repository", filename)) as f:
             return f.read()
diff --git a/artiq/master/worker_impl.py b/artiq/master/worker_impl.py
@@ -69,9 +69,7 @@ def get_unit(file, unit):
     module = file_import(file)
     if unit is None:
         units = [v for k, v in module.__dict__.items()
-                 if k[0] != "_"
-                    and isclass(v)
-                    and hasattr(v, "__artiq_unit__")]
+                 if isclass(v) and hasattr(v, "__artiq_unit__")]
         if len(units) != 1:
             raise ValueError("Found {} units in module".format(len(units)))
         return units[0]

diff --git a/examples/explist.pyon b/examples/explist.pyon
diff --git a/examples/ddb.pyon → examples/master/ddb.pyon b/examples/ddb.pyon → examples/master/ddb.pyon
diff --git a/examples/pdb.pyon → examples/master/pdb.pyon b/examples/pdb.pyon → examples/master/pdb.pyon
diff --git a/examples/dds_test.py → examples/master/repository/dds_test.py b/examples/dds_test.py → examples/master/repository/dds_test.py
diff --git a/examples/flopping_f_simulation.py → ...aster/repository/flopping_f_simulation.py b/examples/flopping_f_simulation.py → ...aster/repository/flopping_f_simulation.py
@@ -25,6 +25,7 @@ def model_numpy(xdata, F0):
 
 class FloppingF(AutoDB):
     __artiq_unit__ = "Flopping F simulation"
+    __artiq_gui_file__ = "flopping_f_simulation_gui.py"
 
     class DBKeys:
         implicit_core = False

diff --git a/examples/flopping_f_simulation_gui.glade → ...epository/flopping_f_simulation_gui.glade b/examples/flopping_f_simulation_gui.glade → ...epository/flopping_f_simulation_gui.glade
diff --git a/examples/flopping_f_simulation_gui.py → ...r/repository/flopping_f_simulation_gui.py b/examples/flopping_f_simulation_gui.py → ...r/repository/flopping_f_simulation_gui.py
diff --git a/examples/mandelbrot.py → examples/master/repository/mandelbrot.py b/examples/mandelbrot.py → examples/master/repository/mandelbrot.py
diff --git a/examples/photon_histogram.py → ...les/master/repository/photon_histogram.py b/examples/photon_histogram.py → ...les/master/repository/photon_histogram.py
diff --git a/examples/transport.py → examples/master/repository/transport.py b/examples/transport.py → examples/master/repository/transport.py
diff --git a/examples/al_spectroscopy.py → examples/sim/al_spectroscopy.py b/examples/al_spectroscopy.py → examples/sim/al_spectroscopy.py
@@ -2,6 +2,8 @@
 
 
 class AluminumSpectroscopy(AutoDB):
+    __artiq_unit__ = "Aluminum spectroscopy (simulation)"
+
     class DBKeys:
         mains_sync = Device()
         laser_cooling = Device()

diff --git a/examples/ddb_sim.pyon → examples/sim/ddb.pyon b/examples/ddb_sim.pyon → examples/sim/ddb.pyon
@@ -1,35 +1,42 @@
 {
     "core": {
+        "type": "local",
         "module": "artiq.sim.devices",
         "class": "Core",
         "arguments": {}
     },
     "mains_sync": {
+        "type": "local",
         "module": "artiq.sim.devices",
         "class": "Input",
         "arguments": {"name": "mains_sync"}
     },
     "pmt": {
+        "type": "local",
         "module": "artiq.sim.devices",
         "class": "Input",
         "arguments": {"name": "pmt"}
     },
     "laser_cooling": {
+        "type": "local",
         "module": "artiq.sim.devices",
         "class": "WaveOutput",
         "arguments": {"name": "laser_cooling"}
     },
     "spectroscopy": {
+        "type": "local",
         "module": "artiq.sim.devices",
         "class": "WaveOutput",
         "arguments": {"name": "spectroscopy"}
     },
     "spectroscopy_b": {
+        "type": "local",
         "module": "artiq.sim.devices",
         "class": "VoltageOutput",
         "arguments": {"name": "spectroscopy_b"}
     },
     "state_detection": {
+        "type": "local",
         "module": "artiq.sim.devices",
         "class": "WaveOutput",
         "arguments": {"name": "state_detection"}

diff --git a/examples/sim/pdb.pyon b/examples/sim/pdb.pyon
@@ -0,0 +1 @@
+{}
diff --git a/examples/simple_simulation.py → examples/sim/simple_simulation.py b/examples/simple_simulation.py → examples/sim/simple_simulation.py