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

examples/flopping_f: use Scannable and NumberValue

This commit is contained in:
Sebastien Bourdeauducq 2015-07-25 00:35:48 +08:00
parent 928775f6ac
commit f210e0dcd6
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/master/repository/flopping_f_simulation.py
View File

@ -27,12 +27,11 @@ class FloppingF(EnvExperiment):
"""Flopping F simulation""" """Flopping F simulation"""
def build(self): def build(self):
self.attr_argument("npoints", FreeValue(100)) self.attr_argument("frequency_scan", Scannable(
self.attr_argument("min_freq", FreeValue(1000)) default=LinearScan(1000, 2000, 100)))
self.attr_argument("max_freq", FreeValue(2000))
self.attr_argument("F0", FreeValue(1500)) self.attr_argument("F0", NumberValue(1500, min=1000, max=2000))
self.attr_argument("noise_amplitude", FreeValue(0.1)) self.attr_argument("noise_amplitude", NumberValue(0.1, min=0, max=100))
self.frequency = self.set_result("flopping_f_frequency", [], True) self.frequency = self.set_result("flopping_f_frequency", [], True)
self.brightness = self.set_result("flopping_f_brightness", [], True) self.brightness = self.set_result("flopping_f_brightness", [], True)
@ -40,8 +39,7 @@ class FloppingF(EnvExperiment):
self.attr_device("scheduler") self.attr_device("scheduler")
def run(self): def run(self):
for i in range(self.npoints): for frequency in self.frequency_scan:
frequency = (self.max_freq-self.min_freq)*i/(self.npoints - 1) + self.min_freq
brightness = model(frequency, self.F0) + self.noise_amplitude*random.random() brightness = model(frequency, self.F0) + self.noise_amplitude*random.random()
self.frequency.append(frequency) self.frequency.append(frequency)
self.brightness.append(brightness) self.brightness.append(brightness)