projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1ce321b
)
Use cantilever adjusted extension in polymer fitting.
author
W. Trevor King
<wking@drexel.edu>
Fri, 6 Aug 2010 12:43:16 +0000
(08:43 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Fri, 6 Aug 2010 12:43:16 +0000
(08:43 -0400)
hooke/plugin/polymer_fit.py
patch
|
blob
|
history
diff --git
a/hooke/plugin/polymer_fit.py
b/hooke/plugin/polymer_fit.py
index d5b43db27a2edf7585b1554520330d9eb10fba00..9ed2faae827fbd1444a66dafb1845e61c65615f3 100644
(file)
--- a/
hooke/plugin/polymer_fit.py
+++ b/
hooke/plugin/polymer_fit.py
@@
-973,7
+973,8
@@
Indicies of points bounding the selected data.
new.info = copy.deepcopy(data.info)
new[:,:-1] = data
new.info['columns'].append('%s tension (N)' % model) # TODO: WLC fit for each peak, etc.
- z_data = data[:,data.info['columns'].index('surface distance (m)')]
+ z_data = data[:,data.info['columns'].index(
+ 'cantilever adjusted extension (m)')]
d_data = data[:,data.info['columns'].index('deflection (N)')]
start,stop = params['bounds']
tension_data,ps = self.fit_polymer_model(