projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
94834de
)
Remove post-fit L/N conversions from polymer_fit.py (handled in .fit() now).
author
W. Trevor King
<wking@drexel.edu>
Wed, 11 Aug 2010 13:57:19 +0000
(09:57 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Wed, 11 Aug 2010 13:57:19 +0000
(09:57 -0400)
hooke/plugin/polymer_fit.py
patch
|
blob
|
history
diff --git
a/hooke/plugin/polymer_fit.py
b/hooke/plugin/polymer_fit.py
index f4afb2a486210dc68c549a56ab8e24e322f29a88..2ea503c58af398687463711674397e23b4008537 100644
(file)
--- a/
hooke/plugin/polymer_fit.py
+++ b/
hooke/plugin/polymer_fit.py
@@
-1011,8
+1011,7
@@
Name (without units) for storing the fit parameters in the `.info` dictionary.
a = info['Kuhn length (m)']
else:
a = params[1]
a = info['Kuhn length (m)']
else:
a = params[1]
- Lp = params[0]
- L = model.L(Lp)
+ L = params[0]
T = info['temperature (K)']
fit_info = queue.get(block=False)
f_data = numpy.ones(z_data.shape, dtype=z_data.dtype) * numpy.nan
T = info['temperature (K)']
fit_info = queue.get(block=False)
f_data = numpy.ones(z_data.shape, dtype=z_data.dtype) * numpy.nan
@@
-1039,8
+1038,7
@@
Name (without units) for storing the fit parameters in the `.info` dictionary.
a = info['Kuhn length (m)']
else:
a = params[1]
a = info['Kuhn length (m)']
else:
a = params[1]
- Nr = params[0]
- N = model.L(Nr)
+ N = params[0]
T = info['temperature (K)']
fit_info = queue.get(block=False)
f_data = numpy.ones(z_data.shape, dtype=z_data.dtype) * numpy.nan
T = info['temperature (K)']
fit_info = queue.get(block=False)
f_data = numpy.ones(z_data.shape, dtype=z_data.dtype) * numpy.nan
@@
-1066,8
+1064,7
@@
Name (without units) for storing the fit parameters in the `.info` dictionary.
p = info['persistence length (m)']
else:
p = params[1]
p = info['persistence length (m)']
else:
p = params[1]
- Lp = params[0]
- L = model.L(Lp)
+ L = params[0]
T = info['temperature (K)']
fit_info = queue.get(block=False)
f_data = numpy.ones(z_data.shape, dtype=z_data.dtype) * numpy.nan
T = info['temperature (K)']
fit_info = queue.get(block=False)
f_data = numpy.ones(z_data.shape, dtype=z_data.dtype) * numpy.nan