Use 'read' instead of 'append' as the file mode in Calibrator.load_raw().

[calibcant.git] / README

diff --git a/README b/README
index f477ebc2ea28cb48da5d87072a86908f4b802b22..73dd49c10fd8ef817c4cbb196b551190dfb80fe2 100644 (file)
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ calibcant: tools for thermally calibrating AFM cantilevers
 Calculates the spring constant `k` of a cantilever using the
 equipartition theorem:
 
-.. math::  \frac{1}{2} k_B T = \frac{1}{2} K x^2
+  1/2 k_B T = 1/2 K x^2
 
 The analysis uses the expected power spectral density (PSD) of a
 damped simple harmonic oscillator to filter out noise from the
@@ -26,27 +26,26 @@ overlay`_.  Install with::
     # layman --add wtk
     # emerge -av sci-physics/calibcant
 
-.. _layman: http://layman.sourceforge.net/
-.. _wtk overlay: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/Gentoo_overlay/
-
-
 Dependencies
 ------------
 
 If you're installing by hand or packaging calibcant for another
 distribution, you'll need the following dependencies:
 
-===========  =================  =====================
+===========  =================  ============================
 Package      Debian_            Gentoo_
-===========  =================  =====================
+===========  =================  ============================
 Numpy_       python-numpy       dev-python/numpy
 Scipy_       python-scipy       sci-libs/scipy
+H5config_                       dev-python/h5config [#wtk]_
 H5Py_        python-h5py        dev-python/h5py
 Matplotlib_  python-matplotlib  dev-python/matplotlib
 Nose_        python-nose        dev-python/nose
-FFT_tools_                      dev-python/FFT-tools
-Pypiezo_                        sci-libs/pypiezo
-===========  =================  =====================
+FFT_tools_                      dev-python/FFT-tools [#wtk]_
+Pypiezo_                        sci-libs/pypiezo [#wtk]_
+===========  =================  ============================
+
+.. [#wtk] In the `wtk overlay`_.
 
 You'll also need my pyafm_ and stepper_ packages, or suitable
 replacements.
@@ -56,7 +55,7 @@ Installing by hand
 
 Calibcant is available as a Git_ repository::
 
-    $ git clone http://www.physics.drexel.edu/~wking/code/git/calibcant.git
+    $ git clone git://tremily.us/calibcant.git
 
 See the homepage_ for details.  To install the checkout, run the
 standard::
@@ -89,25 +88,24 @@ Author
 ======
 
 W. Trevor King
-wking@drexel.edu
-Copyright 2007-2011
+wking@tremily.us
+Copyright 2007-2012
 
 
 .. _layman: http://layman.sourceforge.net/
-.. _wtk overlay:
-     http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/Gentoo_overlay
+.. _wtk overlay: http://blog.tremily.us/posts/Gentoo_overlay/
 .. _Debian: http://www.debian.org/
 .. _Gentoo: http://www.gentoo.org/
 .. _NumPy: http://numpy.scipy.org/
 .. _SciPy: http://www.scipy.org/
+.. _H5config: http://blog.tremily.us/posts/h5config/
 .. _H5Py: http://code.google.com/p/h5py/
 .. _Matplotlib: http://matplotlib.sourceforge.net/
 .. _Nose: http://somethingaboutorange.com/mrl/projects/nose/
-.. _FFT_tools: 
-     http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/FFT-tools/
-.. _Pypiezo:
-     http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/pypiezo/
+.. _FFT_tools: http://blog.tremily.us/posts/FFT-tools/
+.. _Pypiezo: http://blog.tremily.us/posts/pypiezo/
+.. _pyafm: http://blog.tremily.us/posts/pyafm/
+.. _stepper: http://blog.tremily.us/posts/stepper/
 .. _Git: http://git-scm.com/
-.. _homepage:
-     http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/calibcant/
+.. _homepage: http://blog.tremily.us/posts/calibcant/
 .. _GNU General Public License Version 3: http://www.gnu.org/licenses/gpl.txt