From 522a6afd7e150ea8c19770083b349cf008c7d60e Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 6 Aug 2010 09:57:14 -0400 Subject: [PATCH] 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. --- hooke/driver/picoforce.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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']) -- 2.26.2