projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1629048
)
Oops, forgot to convert 'z piezo gain' to a float in the picoforce driver
author
W. Trevor King
<wking@drexel.edu>
Thu, 3 Jun 2010 14:01:02 +0000
(10:01 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Thu, 3 Jun 2010 14:01:02 +0000
(10:01 -0400)
hooke/driver/picoforce.py
patch
|
blob
|
history
diff --git
a/hooke/driver/picoforce.py
b/hooke/driver/picoforce.py
index 64d349f060bd21f99054c5e0f9f25cb1c233bf80..c1139d6f5353fb1c71de954b8a78be0092ccf13d 100644
(file)
--- a/
hooke/driver/picoforce.py
+++ b/
hooke/driver/picoforce.py
@@
-293,7
+293,7
@@
class PicoForceDriver (Driver):
const_re = re.compile('C \[([:\w\s]*)\] ([.0-9]*)')
match = const_re.match(z_piezo_info['@Z magnify'])
assert match.group(1) == '4:Z scale', match.group(1)
- ret['z piezo gain'] =
match.group(2
)
+ ret['z piezo gain'] =
float(match.group(2)
)
match = volt_re.match(z_piezo_info['@4:Z scale'])
assert match.group(1) == 'ZSensorSens', match.group(1)