created & fixed bug 3faa92db-cb93-4e14-a8ec-32ab4eedf83b

diff --git a/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/comments/2ec4d73e-30ab-486a-a43b-3ca45bda03bd/body b/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/comments/2ec4d73e-30ab-486a-a43b-3ca45bda03bd/body
new file mode 100644 (file)
index 0000000..5021f43
--- /dev/null
+++ b/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/comments/2ec4d73e-30ab-486a-a43b-3ca45bda03bd/body
@@ -0,0 +1,8 @@
+The output of analyze.py was mislabeled as pN/nm, when it should be N/m.
+
+Variable (units)              : mean +/- std. dev. (relative error)
+Cantilever k (pN/nm)          : 2.98914 +/- 0.333093 (0.111434)
+photoSensitivity**2 (V/nm)**2 : 0.000859293 +/- 2.5841e-05 (0.0300723)
+T (K)                         : 295.15 +/- 2.27374e-13 (7.70367e-16)
+1/Vphoto**2 (1/V)**2          : 853648 +/- 91596.3 (0.1073)
+

diff --git a/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/comments/2ec4d73e-30ab-486a-a43b-3ca45bda03bd/values b/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/comments/2ec4d73e-30ab-486a-a43b-3ca45bda03bd/values
new file mode 100644 (file)
index 0000000..58f1f39
--- /dev/null
+++ b/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/comments/2ec4d73e-30ab-486a-a43b-3ca45bda03bd/values
@@ -0,0 +1,21 @@
+
+
+
+Content-type=text/plain
+
+
+
+
+
+
+Date=Mon, 17 Nov 2008 14:59:48 +0000
+
+
+
+
+
+
+From=wking
+
+
+

diff --git a/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/values b/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/values
new file mode 100644 (file)
index 0000000..9e25098
--- /dev/null
+++ b/.be/bugs/3faa92db-cb93-4e14-a8ec-32ab4eedf83b/values
@@ -0,0 +1,35 @@
+
+
+
+creator=wking
+
+
+
+
+
+
+severity=serious
+
+
+
+
+
+
+status=fixed
+
+
+
+
+
+
+summary=analyze.py unit error for spring constant.
+
+
+
+
+
+
+time=Mon, 17 Nov 2008 14:56:57 +0000
+
+
+

diff --git a/.be/settings b/.be/settings
new file mode 100644 (file)
index 0000000..3fe7e72
--- /dev/null
+++ b/.be/settings
@@ -0,0 +1,7 @@
+
+
+
+rcs_name=git
+
+
+

diff --git a/.be/version b/.be/version
new file mode 100644 (file)
index 0000000..990837e
--- /dev/null
+++ b/.be/version
@@ -0,0 +1 @@
+Bugs Everywhere Tree 1 0

diff --git a/calibcant/analyze.py b/calibcant/analyze.py
index 19a4d96e7e221000fd5cee91a21dfe4b1f1a48e8..f61f9305ed8d36248e3f9314536cf94fdcf6f126 100755 (executable)
--- a/calibcant/analyze.py
+++ b/calibcant/analyze.py
@@ -60,7 +60,7 @@ def calib_analyze(bumps, Ts, vibs) :
     Inputs (all are arrays of recorded data) :
      bumps measured (V_photodiode / nm_tip) proportionality constant
      Ts    measured temperature (K)
-     vibs  measured V_photodiode variance in free solution
+     vibs  measured V_photodiode variance in free solution (V**2)
     Outputs :
      k    cantilever spring constant (in N/m, or equivalently nN/nm)
      k_s  standard deviation in our estimate of k
@@ -118,7 +118,7 @@ def string_errors(k_m, k_s,
     T_r = T_s / T_m
     one_o_Vphoto2_r = one_o_Vphoto2_s / one_o_Vphoto2_m
     string  = "Variable (units)              : mean +/- std. dev. (relative error)\n"
-    string += "Cantilever k (pN/nm)          : %g +/- %g (%g)\n" \
+    string += "Cantilever k (N/m)          : %g +/- %g (%g)\n" \
               % (k_m, k_s, k_r)
     string += "photoSensitivity**2 (V/nm)**2 : %g +/- %g (%g)\n" \
               % (photoSensitivity2_m, photoSensitivity2_s, photoSensitivity2_r)

diff --git a/calibcant/vib_analyze.py b/calibcant/vib_analyze.py
index 837045ca3c3150285fa3ce12a9e591a738996838..a100edeed26d884ec78960d0feb97db750ddbccf 100755 (executable)
--- a/calibcant/vib_analyze.py
+++ b/calibcant/vib_analyze.py
@@ -97,7 +97,7 @@ def vib_analyze(deflection_bits, freq, minFreq=500, maxFreq=7000,
 
     vib_plot(deflection_bits, freq_axis, power, A, B, C, plotVerbose=plotVerbose)
 
-    # Our A is in uV**2, so convert back to Volts
+    # Our A is in uV**2, so convert back to Volts**2
     return lorentzian_area(A,B,C) * 1e-12
 
 def fit_psd(freq_axis, psd_data, minFreq=500, maxFreq=7000) :