Merge Veeco -> Bruker and NumPy/SciPy doc guide patches.

diff --git a/hooke/driver/picoforce.py b/hooke/driver/picoforce.py
index 625c4555236e97b8632e2cc2fcf38504dcbb0ebd..4912b7757275ec7a4f7f3a7334a3d447d9e224fe 100644 (file)
--- a/hooke/driver/picoforce.py
+++ b/hooke/driver/picoforce.py
@@ -18,7 +18,7 @@
 # License along with Hooke.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-"""Driver for Veeco PicoForce force spectroscopy files.
+"""Driver for Bruker PicoForce force spectroscopy files.
 """
 
 import os.path
@@ -35,7 +35,7 @@ from . import Driver as Driver # this is the Driver base class
 __version__='0.0.0.20100516'
 
 class PicoForceDriver (Driver):
-    """Handle Veeco Picoforce force spectroscopy files.
+    """Handle Bruker Picoforce force spectroscopy files.
     """
     def __init__(self):
         super(PicoForceDriver, self).__init__(name='picoforce')
@@ -430,7 +430,7 @@ class PicoForceDriver (Driver):
         z_col = info['columns'].index('z piezo (m)')
         d_col = info['columns'].index('deflection (m)')
 
-        # Leading '-' because Veeco's z increases towards the surface
+        # Leading '-' because Bruker's z increases towards the surface
         # (positive indentation), but it makes more sense to me to
         # have it increase away from the surface (positive
         # separation).

diff --git a/test/data/vclamp_wtk/README b/test/data/vclamp_wtk/README
index 171ecfd7b0efd9249aef6e72a9cc5da2137002e3..9f8d96155ac6fa0679a6bdd67c474cc3e694cd97 100644 (file)
--- a/test/data/vclamp_wtk/README
+++ b/test/data/vclamp_wtk/README
@@ -1,4 +1,4 @@
-30 curves of octomeric-I27 using a modified Veeco Multimode.
+30 curves of octomeric-I27 using a modified MultiMode [1].
 
 Contributed by W. Trevor King.
 
@@ -9,3 +9,8 @@ the summary output file 20100504134510_calib_analysis_text.
 In a production environment, other days' experiments and calibration
 data goes into other YYYYMMDD-stamped subdirectories of unfold/ and
 calibrate_cantilever/, so we retain that directory structure here.
+
+
+[1]: MultiModes were orignally by Digitial Instruments, which was
+bought by Veeco in 1998.  Veeco sold its metrology wing (including the
+MultiMode line) to Bruker in 2010.