From: W. Trevor King Date: Sat, 7 Aug 2010 15:31:18 +0000 (-0400) Subject: Fix nm -> m conversion bug in WTKDriver's deflection scaling. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0df1cb78a935cb97506fb0a5bfb13ceb18015d4;p=hooke.git Fix nm -> m conversion bug in WTKDriver's deflection scaling. --- diff --git a/hooke/driver/wtk.py b/hooke/driver/wtk.py index 363096b..2b536fa 100644 --- a/hooke/driver/wtk.py +++ b/hooke/driver/wtk.py @@ -134,7 +134,7 @@ class WTKDriver (Driver): ret['raw spring constant'] = calibcant_info ret['spring constant (N/m)'] = calibcant_info['Cantilever k (N/m)'] ret['deflection sensitivity (m/V)'] = \ - 1.0/numpy.sqrt(calibcant_info['photoSensitivity**2 (V/nm)**2']) + 1.0/numpy.sqrt(calibcant_info['photoSensitivity**2 (V/nm)**2']) * 1e-9 # (32768 bits = 2**15 bits = 10 Volts) ret['deflection sensitivity (V/bit)'] = 1.0/3276.8