projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
92abff2
)
Fix nm -> m conversion bug in WTKDriver's deflection scaling.
author
W. Trevor King
<wking@drexel.edu>
Sat, 7 Aug 2010 15:31:18 +0000
(11:31 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Sat, 7 Aug 2010 15:31:18 +0000
(11:31 -0400)
hooke/driver/wtk.py
patch
|
blob
|
history
diff --git
a/hooke/driver/wtk.py
b/hooke/driver/wtk.py
index 363096b35a3d9959e8cc1a27eed9a4c2ea46c326..2b536fa66dd3511d36e23f7e5757225cf80b0f08 100644
(file)
--- 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