summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
W. Trevor King [Wed, 28 Jan 2009 13:43:54 +0000 (08:43 -0500)]
Removed old references to freq in calibrate.py after freq->push_speed change.
Also turned plotting back on by default (the change doesn't affect
command line usage).
W. Trevor King [Tue, 27 Jan 2009 14:45:24 +0000 (09:45 -0500)]
Start bumps with the cantilever _off_ the surface.
Photodiode sensitivity (and thus, bump slope) decreases as the
zero-deflection photodiode input moves away from zero Volts. In order
to mitigate the effect of this on our calibration, we need to keep
track of the zero-deflection signal. By starting our bump off the
surface, our bumps should always start and end in the zero-deflection
regime.
This will make analysis a bit more complicated though. I'll get to
that next.
W. Trevor King [Tue, 27 Jan 2009 14:40:46 +0000 (09:40 -0500)]
Control bump_speed instead of bump sample frequency.
More physically useful number. The old default speed was huge.
W. Trevor King [Tue, 27 Jan 2009 14:30:41 +0000 (09:30 -0500)]
Various adjustments. I should commit more often ;).
Added # comments to tweakfile syntax.
Played around with adding a white-noise floor in the vibration fitting,
but the fits didn't look all that convincing. Some of the white-noise
code is still in place, but I think it's currently disabled ;).
Fixed some typos in TEXT_VERBOSE output in vib_analyze.py
W. Trevor King [Thu, 8 Jan 2009 19:06:57 +0000 (14:06 -0500)]
Prepared for distribution.
Fixed lines in the Makefile that I hadn't changed when I copied it into
this project in the beginning. Also added GPL blurbs to two py files.
W. Trevor King [Thu, 8 Jan 2009 19:05:11 +0000 (14:05 -0500)]
Fixed C->K conversion bug in T_analyze.py
Closes
327f4db8-3119-4ec1-a762-
a3115254608a
W. Trevor King [Thu, 8 Jan 2009 18:25:30 +0000 (13:25 -0500)]
New Marisa/me calibration difference bug
327f4db8-3119-4ec1-a762-
a3115254608a
W. Trevor King [Thu, 8 Jan 2009 18:23:53 +0000 (13:23 -0500)]
Add trailing endline to calibration analysis files.
W. Trevor King [Thu, 8 Jan 2009 16:46:39 +0000 (11:46 -0500)]
Fixed old FFT_tools portions of Makefile to calibcant
W. Trevor King [Thu, 8 Jan 2009 16:45:49 +0000 (11:45 -0500)]
Fixed one_o_Vphoto_2_m typo in calib_analyze()
W. Trevor King [Thu, 8 Jan 2009 15:49:59 +0000 (10:49 -0500)]
Updated to new data_logger log_dir $DEFAULT$ syntax for easier log_dir defs.
W. Trevor King [Sat, 3 Jan 2009 15:29:46 +0000 (10:29 -0500)]
calib_save_analysis() now uses string_errors() to format output.
W. Trevor King [Sun, 21 Dec 2008 08:42:12 +0000 (03:42 -0500)]
Add lines to analyze.calib_plot().
There aren't many points, and line connecting lines increase visibility.
W. Trevor King [Sun, 21 Dec 2008 05:12:00 +0000 (00:12 -0500)]
Apply some fixes to get calibrations working and bump version.
Mostly namespace problems due to `from numpy import *` and the
like. Things seem to work now. I think we're ready for prime-time.
W. Trevor King [Sun, 21 Dec 2008 05:01:11 +0000 (00:01 -0500)]
calibrate.py should now work.
A bunch of changes in one commit, sorry.
Moved to fledgling splittable_kwargs system to make default argument
maintenance easier. I expect the splittable_kwargs system still has
some growing to do, but it's already better than the old system.
Merged BE database from the calibcant subdir into the main BE database.
It was a mistake to create the database there in the first place.
W. Trevor King [Fri, 19 Dec 2008 05:03:38 +0000 (00:03 -0500)]
Added pylab flag to bump_analyze.py
W. Trevor King [Mon, 15 Dec 2008 14:20:40 +0000 (09:20 -0500)]
Added comparison to vib_analyze_naive() in vib_analyze().
This will protect against really hideous fits :p. It also lead to
fixes for outdated code in vib_analyze_naive() (it hadn't been used in
a while) and some outdated comments in vib_analyze().
Finally, added abs()ing for the always-positive fit parameters A and B
when using the scipy.optimize.leastsq() method.
W. Trevor King [Tue, 2 Dec 2008 20:27:44 +0000 (15:27 -0500)]
Moved fitting from GnuplotBiDir to scipy.optimize.leastsq in vib_analyze.
Much better fit quality. See bug
f3ba76cd-eddd-4520-bb2a-
17ca371ac6b6
W. Trevor King [Tue, 2 Dec 2008 17:05:37 +0000 (12:05 -0500)]
Fixed poor treatment of non-tweakfiles in vib_analyze.
See bug
3059911a-963c-472e-a9d3-
bf0a290de1a2.
W. Trevor King [Wed, 26 Nov 2008 22:02:30 +0000 (17:02 -0500)]
Initialized a Bugs-Everywhere bugtracking directory.
However, the 'bug' I initialized it for
1456fd10-2036-46de-b18e-
ddf8cab14ae2
was a broken workflow, not a bug :p. Sigh.
W. Trevor King [Wed, 26 Nov 2008 21:45:54 +0000 (16:45 -0500)]
Plot span of fitted frequencies in vib_anayze.py.
W. Trevor King [Wed, 26 Nov 2008 21:26:51 +0000 (16:26 -0500)]
Changed guessed Q from 5 to 1, which gives about the right breadth.
I'm dubious about the fit quality though. Looking at the fit.log
output after looking at the 20080919_cantA_tweak.vib data again reveals
After 4 iterations the fit converged.
final sum of squares of residuals : 9.6001e+08
rel. change during last iteration : -2.46003e-07
for the first curve, and similar residuals (and exactly 4 iterations)
for the other curves. Hmm. I should probably explicitly show the range
of frequency space I'm fitting in.
W. Trevor King [Wed, 26 Nov 2008 21:17:59 +0000 (16:17 -0500)]
Added guessed Lorentzian plot option to vib_analyze.
This explains why my Lorentzians are occasionally too sharp...
For example, consider the 2nd and 4th fit in
cd ~/rsrch/data/z_piezo_calib/
cc_vib_analyze.py -ct 20080919_cantA_tweak.vib -pG
(I know, I know, should be rsrch/data/calibcant...)
W. Trevor King [Wed, 26 Nov 2008 21:07:58 +0000 (16:07 -0500)]
Resistribute vib_analyze pylab.hold()s to avoid auto-generated axis.
With the previous setup, the first call to hold() created a subplot(111)
axis that the rest of the subplots wrote over. Ugly. Better now.
W. Trevor King [Wed, 26 Nov 2008 21:05:08 +0000 (16:05 -0500)]
Crop vib_analyze pylab Lorentzian fitline when it goes off-axis.
W. Trevor King [Wed, 26 Nov 2008 20:46:28 +0000 (15:46 -0500)]
Added fit-curve to vib_analyze's pylab output.
Gave up on the gnuplot output for now.
W. Trevor King [Thu, 20 Nov 2008 01:27:58 +0000 (20:27 -0500)]
Fixed non-interactive pylab plotting setup in common.py
Also fixed spacing in analyze.py from last change and removed some
.pyc files from versioning.
W. Trevor King [Mon, 17 Nov 2008 15:06:56 +0000 (10:06 -0500)]
created & fixed bug
3faa92db-cb93-4e14-a8ec-
32ab4eedf83b
W. Trevor King [Tue, 11 Nov 2008 16:02:15 +0000 (11:02 -0500)]
Added ez_setup.py installation wrapper and cleaned up License info.
W. Trevor King [Tue, 11 Nov 2008 15:51:25 +0000 (10:51 -0500)]
Began versioning.