From: W. Trevor King <wking@drexel.edu>
Date: Fri, 6 Aug 2010 13:57:14 +0000 (-0400)
Subject: Use 'Ciao scan list'/'@Sens. ZSensorSens' to scale picoforce z piezo data.
X-Git-Url: http://git.tremily.us/?p=hooke.git;a=commitdiff_plain;h=15a0a4db03a82babd2fe0ab3ba76e6e27dff6075

Use 'Ciao scan list'/'@Sens. ZSensorSens' to scale picoforce z piezo data.

vs. my old 'Scanner list'/'@Sens. Zsens'.  The new implementation
is equivalent to the pre-Trevor Volt -> meter conversion.

The values for test/data/picoforce.000 changed from
  5.465e-08 m/V  ('Ciao scan list'/'@Sens. ZSensorSens')
to
  1e-06 m/V      ('Scanner list'/'@Sens. Zsens')
1e-6 m/V is a suspiciously even number for a piezo sensitivity rating,
but the scaled graph of deflection as a function of cantilever
adjusted extension certainly appears more appropriately cantilever
corrected.
---

diff --git a/hooke/driver/picoforce.py b/hooke/driver/picoforce.py
index c084408..1f034da 100644
--- a/hooke/driver/picoforce.py
+++ b/hooke/driver/picoforce.py
@@ -344,9 +344,10 @@ class PicoForceDriver (Driver):
         # offset assumed if raw data is signed...
 
         nm_sens_re = re.compile('V ([.0-9]*) nm/V')
-        match = nm_sens_re.match(info['Scanner list']['@Sens. Zsens'])
+        match = nm_sens_re.match(info['Ciao scan list']['@Sens. ZSensorSens'])
         assert match != None, 'Bad regexp for %s/%s, %s' \
-            % ('Scanner list', '@Sens. Zsens', info['Scanner list']['@4:Z scale'])
+            % ('Ciao scan list', '@Sens. ZSensorSens',
+               info['Ciao scan list']['@Sens. ZSensorSens'])
         ret['z piezo sensitivity (m/V)'] = float(match.group(1))*1e-9
 
         match = nm_sens_re.match(info['Ciao scan list']['@Sens. DeflSens'])