M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

photon_histogram: remove +x permissions, add units to parameter defs

This commit is contained in:
Robert Jördens 2015-04-04 21:13:30 -06:00
parent ef375b5c9c
commit fbedb7c754
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/master/repository/photon_histogram.py Executable file → Normal file
View File

@ -13,9 +13,9 @@ class PhotonHistogram(Experiment, AutoDB):
nbins = Argument(100) nbins = Argument(100)
repeats = Argument(100) repeats = Argument(100)
cool_f = Parameter(230) cool_f = Parameter(230*MHz)
detect_f = Parameter(220) detect_f = Parameter(220*MHz)
detect_t = Parameter(100) detect_t = Parameter(100*us)
ion_present = Parameter(True) ion_present = Parameter(True)
@ -27,10 +27,10 @@ class PhotonHistogram(Experiment, AutoDB):
with parallel: with parallel:
self.bd.pulse(200*MHz, 1*ms) self.bd.pulse(200*MHz, 1*ms)
self.bdd.pulse(300*MHz, 1*ms) self.bdd.pulse(300*MHz, 1*ms)
self.bd.pulse(self.cool_f*MHz, 100*us) self.bd.pulse(self.cool_f, 100*us)
with parallel: with parallel:
self.bd.pulse(self.detect_f*MHz, self.detect_t*us) self.bd.pulse(self.detect_f, self.detect_t)
self.pmt.gate_rising(self.detect_t*us) self.pmt.gate_rising(self.detect_t)
self.bd.on(200*MHz) self.bd.on(200*MHz)
self.bdd.on(300*MHz) self.bdd.on(300*MHz)
return self.pmt.count() return self.pmt.count()