From 7ec14f26c2205f5f6bbb9a5afd25bce56552e3cf Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 31 Mar 2017 16:54:07 +0800
Subject: [PATCH] examples: fix after introduction of RangeScan

---
 RELEASE_NOTES.rst                                         | 3 ++-
 artiq/examples/master/repository/arguments_demo.py        | 4 ++--
 artiq/examples/master/repository/flopping_f_simulation.py | 2 +-
 artiq/examples/master/repository/multi_scan.py            | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 010fca70c..15d1166a2 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -29,7 +29,8 @@ Release notes
 * The "collision" and "busy" RTIO errors are reported through the log instead of
   raising exceptions.
 * Results are still saved when ``analyze`` raises an exception.
-* LinearScan and RandomScan have been consolidated into RangeScan
+* LinearScan and RandomScan have been consolidated into RangeScan.
+
 
 2.2
 ---
diff --git a/artiq/examples/master/repository/arguments_demo.py b/artiq/examples/master/repository/arguments_demo.py
index 7026a30a1..9539a2d4e 100644
--- a/artiq/examples/master/repository/arguments_demo.py
+++ b/artiq/examples/master/repository/arguments_demo.py
@@ -6,7 +6,7 @@ from artiq.experiment import *
 class SubComponent1(HasEnvironment):
     def build(self):
         self.setattr_argument("sc1_scan",
-            Scannable(default=[NoScan(3250), RandomScan(10, 20, 6)],
+            Scannable(default=[NoScan(3250), RangeScan(10, 20, 6, randomize=True)],
                       unit="kHz"),
             "Flux capacitor")
         self.setattr_argument("sc1_enum", EnumerationValue(["1", "2", "3"]),
@@ -24,7 +24,7 @@ class SubComponent2(HasEnvironment):
         self.setattr_argument("sc2_boolean", BooleanValue(False),
                               "Transporter")
         self.setattr_argument("sc2_scan", Scannable(
-                                          default=LinearScan(200, 300, 49)),
+                                          default=RangeScan(200, 300, 49)),
                               "Transporter")
         self.setattr_argument("sc2_enum", EnumerationValue(["3", "4", "5"]),
                               "Transporter")
diff --git a/artiq/examples/master/repository/flopping_f_simulation.py b/artiq/examples/master/repository/flopping_f_simulation.py
index 1693ab201..c8f9b94ea 100644
--- a/artiq/examples/master/repository/flopping_f_simulation.py
+++ b/artiq/examples/master/repository/flopping_f_simulation.py
@@ -22,7 +22,7 @@ class FloppingF(EnvExperiment):
 
     def build(self):
         self.setattr_argument("frequency_scan", Scannable(
-            default=LinearScan(1000, 2000, 100)))
+            default=RangeScan(1000, 2000, 100)))
 
         self.setattr_argument("F0", NumberValue(1500, min=1000, max=2000))
         self.setattr_argument("noise_amplitude", NumberValue(
diff --git a/artiq/examples/master/repository/multi_scan.py b/artiq/examples/master/repository/multi_scan.py
index de5bb5fa0..d4899b42c 100644
--- a/artiq/examples/master/repository/multi_scan.py
+++ b/artiq/examples/master/repository/multi_scan.py
@@ -3,9 +3,9 @@ from artiq.experiment import *
 
 class MultiScan(EnvExperiment):
     def build(self):
-        self.setattr_argument("a", Scannable(default=LinearScan(0, 10, 4)))
-        self.setattr_argument("b", Scannable(default=LinearScan(0, 10, 4)))
-        self.setattr_argument("c", Scannable(default=LinearScan(0, 10, 4)))
+        self.setattr_argument("a", Scannable(default=RangeScan(0, 10, 4)))
+        self.setattr_argument("b", Scannable(default=RangeScan(0, 10, 4)))
+        self.setattr_argument("c", Scannable(default=RangeScan(0, 10, 4)))
 
     def run(self):
         msm = MultiScanManager(