Set default maxFreq to 25 kHz. Unset pylab.hold for the bump_plot residual.

It's probably a better idea to set the maxFreq to the Nyquist freq by
default, but only time for a quick hack at the moment.  You'll have to
neck down maxFreq to 7-10 kHz for softer cantilevers (~< 40 pN/nm),
since otherwise you'll start picking up higher order modes.

The bump_plot fix was just because plotting a bunch of data is _slow_.
Pylab in general is no speed demon, so the less extra work I give it,
the better.

diff --git a/calibcant/bump_analyze.py b/calibcant/bump_analyze.py
index 0ae4045e93cc281f9c40e421841be13e382ae9f5..748287967cf8d38d29801e353dd217f162bef608 100755 (executable)
--- a/calibcant/bump_analyze.py
+++ b/calibcant/bump_analyze.py
@@ -205,6 +205,7 @@ def bump_plot(data, yguess=None, yfit=None, plotVerbose=False) :
         if yfit != None:
             common._pylab.plot(data["Z piezo output"], yfit,
                                'r-', label='fit')
+        common._pylab.hold(False)
         common._pylab.title("bump surface")
         common._pylab.legend(loc='upper left')
         common._pylab.xlabel("Z piezo output voltage (bits)")

diff --git a/calibcant/vib_analyze.py b/calibcant/vib_analyze.py
index ff37f1242bed7b381463a3e690d822780f9ede1c..74e1ed4e2e00425812eabf8947e1e67ef705269d 100755 (executable)
--- a/calibcant/vib_analyze.py
+++ b/calibcant/vib_analyze.py
@@ -123,7 +123,7 @@ def vib_analyze(deflection_bits, freq,
     return min(fitted_variance, naive_variance)
 
 @splittableKwargsFunction()
-def fit_psd(freq_axis, psd_data, minFreq=500, maxFreq=7000) :
+def fit_psd(freq_axis, psd_data, minFreq=500, maxFreq=25000) :
     """
     freq_axis : array of frequencies in Hz
     psd_data  : array of PSD amplitudes for the frequencies in freq_axis