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

m-labs · Apr 5, 2015 · fbedb7c · fbedb7c
1 parent ef375b5
commit fbedb7c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/examples/master/repository/photon_histogram.py b/examples/master/repository/photon_histogram.py
@@ -13,9 +13,9 @@ class DBKeys:
         nbins = Argument(100)
         repeats = Argument(100)
 
-        cool_f = Parameter(230)
-        detect_f = Parameter(220)
-        detect_t = Parameter(100)
+        cool_f = Parameter(230*MHz)
+        detect_f = Parameter(220*MHz)
+        detect_t = Parameter(100*us)
 
         ion_present = Parameter(True)
 
@@ -27,10 +27,10 @@ def cool_detect(self):
         with parallel:
             self.bd.pulse(200*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:
-            self.bd.pulse(self.detect_f*MHz, self.detect_t*us)
-            self.pmt.gate_rising(self.detect_t*us)
+            self.bd.pulse(self.detect_f, self.detect_t)
+            self.pmt.gate_rising(self.detect_t)
         self.bd.on(200*MHz)
         self.bdd.on(300*MHz)
         return self.pmt.count()