projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d5d02c2
)
JPK driver now consistent with hooke conventions, wlc and peaks now seem to work...
author
devicerandom
<devnull@localhost>
Sat, 14 Jun 2008 00:02:13 +0000
(
00:02
+0000)
committer
devicerandom
<devnull@localhost>
Sat, 14 Jun 2008 00:02:13 +0000
(
00:02
+0000)
jpk.py
patch
|
blob
|
history
diff --git
a/jpk.py
b/jpk.py
index 2249d85cb7b4c09abc55e872c39a85033d5213f7..f7ba343cb56ba56d9e760583900a25fb5a04a155 100644
(file)
--- a/
jpk.py
+++ b/
jpk.py
@@
-108,13
+108,15
@@
class jpkDriver(lhc.Driver):
force_ext=force.ext()
force_ret=force.ret()
#reverse the return data, to make it coherent with hooke standard
- height_ms_ret.reverse
- force_ret.reverse
+ height_ms_ret.reverse
()
+ force_ret.reverse
()
main_plot=lhc.PlotObject()
main_plot.add_set(height_ms_ext,force_ext)
main_plot.add_set(height_ms_ret,force_ret)
+
+
if self.springconstant != 0:
main_plot.units=['meters','force']
else: