srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

examples: fix after introduction of RangeScan

This commit is contained in:
Sebastien Bourdeauducq 2017-03-31 16:54:07 +08:00
parent 58da76a169
commit 7ec14f26c2
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASE_NOTES.rst
View File

@ -29,7 +29,8 @@ Release notes
* The "collision" and "busy" RTIO errors are reported through the log instead of * The "collision" and "busy" RTIO errors are reported through the log instead of
raising exceptions. raising exceptions.
* Results are still saved when ``analyze`` raises an exception. * 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 2.2
--- ---

4
artiq/examples/master/repository/arguments_demo.py
View File

@ -6,7 +6,7 @@ from artiq.experiment import *
class SubComponent1(HasEnvironment): class SubComponent1(HasEnvironment):
def build(self): def build(self):
self.setattr_argument("sc1_scan", 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"), unit="kHz"),
"Flux capacitor") "Flux capacitor")
self.setattr_argument("sc1_enum", EnumerationValue(["1", "2", "3"]), self.setattr_argument("sc1_enum", EnumerationValue(["1", "2", "3"]),
@ -24,7 +24,7 @@ class SubComponent2(HasEnvironment):
self.setattr_argument("sc2_boolean", BooleanValue(False), self.setattr_argument("sc2_boolean", BooleanValue(False),
"Transporter") "Transporter")
self.setattr_argument("sc2_scan", Scannable( self.setattr_argument("sc2_scan", Scannable(
default=LinearScan(200, 300, 49)), default=RangeScan(200, 300, 49)),
"Transporter") "Transporter")
self.setattr_argument("sc2_enum", EnumerationValue(["3", "4", "5"]), self.setattr_argument("sc2_enum", EnumerationValue(["3", "4", "5"]),
"Transporter") "Transporter")

2
artiq/examples/master/repository/flopping_f_simulation.py
View File

@ -22,7 +22,7 @@ class FloppingF(EnvExperiment):
def build(self): def build(self):
self.setattr_argument("frequency_scan", Scannable( 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("F0", NumberValue(1500, min=1000, max=2000))
self.setattr_argument("noise_amplitude", NumberValue( self.setattr_argument("noise_amplitude", NumberValue(

6
artiq/examples/master/repository/multi_scan.py
View File

@ -3,9 +3,9 @@ from artiq.experiment import *
class MultiScan(EnvExperiment): class MultiScan(EnvExperiment):
def build(self): def build(self):
self.setattr_argument("a", Scannable(default=LinearScan(0, 10, 4))) self.setattr_argument("a", Scannable(default=RangeScan(0, 10, 4)))
self.setattr_argument("b", Scannable(default=LinearScan(0, 10, 4))) self.setattr_argument("b", Scannable(default=RangeScan(0, 10, 4)))
self.setattr_argument("c", Scannable(default=LinearScan(0, 10, 4))) self.setattr_argument("c", Scannable(default=RangeScan(0, 10, 4)))
def run(self): def run(self):
msm = MultiScanManager( msm = MultiScanManager(