From 1c5c7fd550b7559f934ac459406caf5a13f08a22 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 19 Nov 2010 13:08:07 -0500 Subject: [PATCH] Veeco -> Bruker since sale of metrology wing this August. --- hooke/driver/picoforce.py | 6 +++--- test/data/vclamp_wtk/README | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hooke/driver/picoforce.py b/hooke/driver/picoforce.py index 625c455..4912b77 100644 --- a/hooke/driver/picoforce.py +++ b/hooke/driver/picoforce.py @@ -18,7 +18,7 @@ # License along with Hooke. If not, see # . -"""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 171ecfd..9f8d961 100644 --- 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. -- 2.26.2