From 905063c1b198ea225a027a6877c6d1694df365dd Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Mon, 25 Jan 2016 16:03:01 -0700 Subject: [PATCH] artiq.experiment: update examples --- examples/master/repository/arguments_demo.py | 2 +- .../master/repository/coredevice_examples/photon_histogram.py | 2 +- .../repository/coredevice_examples/simple/blink_forever.py | 2 +- .../master/repository/coredevice_examples/simple/dds_test.py | 2 +- .../master/repository/coredevice_examples/simple/handover.py | 2 +- .../master/repository/coredevice_examples/simple/mandelbrot.py | 2 +- examples/master/repository/coredevice_examples/tdr.py | 2 +- examples/master/repository/coredevice_examples/transport.py | 2 +- examples/master/repository/flopping_f_simulation.py | 2 +- examples/master/repository/run_forever.py | 2 +- examples/master/repository/speed_benchmark.py | 2 +- examples/master/repository/utilities/dds_setter.py | 2 +- examples/master/repository/utilities/terminate_all.py | 2 +- examples/sim/al_spectroscopy.py | 2 +- examples/sim/simple_simulation.py | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/master/repository/arguments_demo.py b/examples/master/repository/arguments_demo.py index 8559383f8..c26879c2c 100644 --- a/examples/master/repository/arguments_demo.py +++ b/examples/master/repository/arguments_demo.py @@ -1,6 +1,6 @@ import logging -from artiq.language import * +from artiq.experiment import * class SubComponent1(HasEnvironment): diff --git a/examples/master/repository/coredevice_examples/photon_histogram.py b/examples/master/repository/coredevice_examples/photon_histogram.py index 9cd574d9f..307b3a52e 100644 --- a/examples/master/repository/coredevice_examples/photon_histogram.py +++ b/examples/master/repository/coredevice_examples/photon_histogram.py @@ -1,4 +1,4 @@ -from artiq.language import * +from artiq.experiment import * class PhotonHistogram(EnvExperiment): diff --git a/examples/master/repository/coredevice_examples/simple/blink_forever.py b/examples/master/repository/coredevice_examples/simple/blink_forever.py index 37ed06c03..98959c239 100644 --- a/examples/master/repository/coredevice_examples/simple/blink_forever.py +++ b/examples/master/repository/coredevice_examples/simple/blink_forever.py @@ -1,4 +1,4 @@ -from artiq.language import * +from artiq.experiment import * class BlinkForever(EnvExperiment): diff --git a/examples/master/repository/coredevice_examples/simple/dds_test.py b/examples/master/repository/coredevice_examples/simple/dds_test.py index edcdf265c..a0b60bf73 100644 --- a/examples/master/repository/coredevice_examples/simple/dds_test.py +++ b/examples/master/repository/coredevice_examples/simple/dds_test.py @@ -1,4 +1,4 @@ -from artiq.language import * +from artiq.experiment import * class DDSTest(EnvExperiment): diff --git a/examples/master/repository/coredevice_examples/simple/handover.py b/examples/master/repository/coredevice_examples/simple/handover.py index 6b63e338d..9e3a89747 100644 --- a/examples/master/repository/coredevice_examples/simple/handover.py +++ b/examples/master/repository/coredevice_examples/simple/handover.py @@ -1,4 +1,4 @@ -from artiq.language import * +from artiq.experiment import * class Handover(EnvExperiment): diff --git a/examples/master/repository/coredevice_examples/simple/mandelbrot.py b/examples/master/repository/coredevice_examples/simple/mandelbrot.py index a599823e9..81e477548 100644 --- a/examples/master/repository/coredevice_examples/simple/mandelbrot.py +++ b/examples/master/repository/coredevice_examples/simple/mandelbrot.py @@ -1,6 +1,6 @@ import sys -from artiq.language import * +from artiq.experiment import * class Mandelbrot(EnvExperiment): diff --git a/examples/master/repository/coredevice_examples/tdr.py b/examples/master/repository/coredevice_examples/tdr.py index 41caa0624..a71628645 100644 --- a/examples/master/repository/coredevice_examples/tdr.py +++ b/examples/master/repository/coredevice_examples/tdr.py @@ -1,6 +1,6 @@ # Copyright (C) 2014, 2015 Robert Jordens -from artiq.language import * +from artiq.experiment import * class PulseNotReceivedError(Exception): diff --git a/examples/master/repository/coredevice_examples/transport.py b/examples/master/repository/coredevice_examples/transport.py index c0eca6e72..748d3b7f7 100644 --- a/examples/master/repository/coredevice_examples/transport.py +++ b/examples/master/repository/coredevice_examples/transport.py @@ -2,7 +2,7 @@ import numpy as np -from artiq.language import * +from artiq.experiment import * from artiq.wavesynth.coefficients import SplineSource diff --git a/examples/master/repository/flopping_f_simulation.py b/examples/master/repository/flopping_f_simulation.py index 14b30e203..6f60557ac 100644 --- a/examples/master/repository/flopping_f_simulation.py +++ b/examples/master/repository/flopping_f_simulation.py @@ -5,7 +5,7 @@ import random import numpy as np from scipy.optimize import curve_fit -from artiq.language import * +from artiq.experiment import * def model(x, F0): diff --git a/examples/master/repository/run_forever.py b/examples/master/repository/run_forever.py index adddfd21d..553950077 100644 --- a/examples/master/repository/run_forever.py +++ b/examples/master/repository/run_forever.py @@ -1,7 +1,7 @@ from itertools import count from time import sleep -from artiq.language import * +from artiq.experiment import * class RunForever(EnvExperiment): diff --git a/examples/master/repository/speed_benchmark.py b/examples/master/repository/speed_benchmark.py index 4b5559700..e8a40f1bb 100644 --- a/examples/master/repository/speed_benchmark.py +++ b/examples/master/repository/speed_benchmark.py @@ -1,6 +1,6 @@ import time -from artiq.language import * +from artiq.experiment import * class _PayloadNOP(EnvExperiment): diff --git a/examples/master/repository/utilities/dds_setter.py b/examples/master/repository/utilities/dds_setter.py index 8ba6f18cc..1e8f4066d 100644 --- a/examples/master/repository/utilities/dds_setter.py +++ b/examples/master/repository/utilities/dds_setter.py @@ -1,6 +1,6 @@ from operator import itemgetter -from artiq.language import * +from artiq.experiment import * class DDSSetter(EnvExperiment): diff --git a/examples/master/repository/utilities/terminate_all.py b/examples/master/repository/utilities/terminate_all.py index c61402fe9..b48d7a722 100644 --- a/examples/master/repository/utilities/terminate_all.py +++ b/examples/master/repository/utilities/terminate_all.py @@ -1,4 +1,4 @@ -from artiq.language import * +from artiq.experiment import * class TerminateAll(EnvExperiment): diff --git a/examples/sim/al_spectroscopy.py b/examples/sim/al_spectroscopy.py index 97a55fb0b..bfbf1c5c4 100644 --- a/examples/sim/al_spectroscopy.py +++ b/examples/sim/al_spectroscopy.py @@ -1,4 +1,4 @@ -from artiq.language import * +from artiq.experiment import * class AluminumSpectroscopy(EnvExperiment): diff --git a/examples/sim/simple_simulation.py b/examples/sim/simple_simulation.py index 5106e06b6..1b9205825 100644 --- a/examples/sim/simple_simulation.py +++ b/examples/sim/simple_simulation.py @@ -1,4 +1,4 @@ -from artiq.language import * +from artiq.experiment import * class SimpleSimulation(EnvExperiment):