projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4ed7e96
)
Add 'polymer fit' error reporting to PolymerFitPeaksCommand
author
W. Trevor King
<wking@drexel.edu>
Tue, 10 Aug 2010 15:57:04 +0000
(11:57 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Tue, 10 Aug 2010 15:57:04 +0000
(11: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 66df3e64a125fd9f67753589ffc93bd7f56ccb93..a5e892e696096ee9b8568e4f44e96e7f767a40be 100644
(file)
--- a/
hooke/plugin/polymer_fit.py
+++ b/
hooke/plugin/polymer_fit.py
@@
-34,7
+34,7
@@
import sys
import numpy
from scipy.optimize import newton
import numpy
from scipy.optimize import newton
-from ..command import Command, Argument, Failure
+from ..command import Command, Argument,
Success,
Failure
from ..config import Setting
from ..curve import Data
from ..plugin import Plugin, argument_to_setting
from ..config import Setting
from ..curve import Data
from ..plugin import Plugin, argument_to_setting
@@
-970,7
+970,6
@@
Name (without units) for storing the fit parameters in the `.info` dictionary.
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
- print params['curve'], id(params['curve']), 'PFC'
for key,value in params.items():
if value == None: # Use configured default value.
params[key] = self.plugin.config[key]
for key,value in params.items():
if value == None: # Use configured default value.
params[key] = self.plugin.config[key]
@@
-987,7
+986,6
@@
Name (without units) for storing the fit parameters in the `.info` dictionary.
new[:,:-1] = data
new.info['columns'].append(
join_data_label(params['output tension column'], 'N'))
new[:,:-1] = data
new.info['columns'].append(
join_data_label(params['output tension column'], 'N'))
- print 'add column', id(params['curve']), new.info['columns'][-1], 'to', new.info['columns'][:-1]
z_data = data[:,data.info['columns'].index(
params['input distance column'])]
d_data = data[:,data.info['columns'].index(
z_data = data[:,data.info['columns'].index(
params['input distance column'])]
d_data = data[:,data.info['columns'].index(
@@
-997,7
+995,6
@@
Name (without units) for storing the fit parameters in the `.info` dictionary.
params, z_data, d_data, start, stop, outqueue)
new.info[params['fit parameters info name']] = ps
new.info[params['fit parameters info name']]['model'] = model
params, z_data, d_data, start, stop, outqueue)
new.info[params['fit parameters info name']] = ps
new.info[params['fit parameters info name']]['model'] = model
- print 'add info', params['fit parameters info name']
new[:,-1] = tension_data
params['curve'].data[params['block']] = new
new[:,-1] = tension_data
params['curve'].data[params['block']] = new
@@
-1129,7
+1126,6
@@
Index of the selected peak in the list of peaks. Use `None` to fit all peaks.
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
help=self.__doc__, plugin=plugin)
def _run(self, hooke, inqueue, outqueue, params):
- print params['curve'], id(params['curve']), 'PFPC'
data = params['curve'].data[params['block']]
fit_command = [c for c in hooke.commands
if c.name=='polymer fit'][0]
data = params['curve'].data[params['block']]
fit_command = [c for c in hooke.commands
if c.name=='polymer fit'][0]
@@
-1145,6
+1141,9
@@
Index of the selected peak in the list of peaks. Use `None` to fit all peaks.
p['output tension column'] = peak.name
p['fit parameters info name'] = peak.name
fit_command.run(hooke, inq, outq, **p)
p['output tension column'] = peak.name
p['fit parameters info name'] = peak.name
fit_command.run(hooke, inq, outq, **p)
+ ret = outq.get()
+ if not isinstance(ret, Success):
+ raise ret
# TODO:
# def dist2fit(self):
# TODO:
# def dist2fit(self):