From: W. Trevor King Date: Thu, 28 Apr 2011 16:30:10 +0000 (-0400) Subject: Adjust fit-parameter handling for the polymer_fit plugin. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e895934d76c87076ce5a6cd6d7617e71c89f78a;p=hooke.git Adjust fit-parameter handling for the polymer_fit plugin. This should have happened during changeset: 820:b0d23a0bdaf7 branch: wtk user: W. Trevor King date: Thu Apr 28 07:49:26 2011 -0400 summary: Adapt to handle scipy.optimize.leastsq for scipy >= 0.8.0. --- diff --git a/hooke/plugin/polymer_fit.py b/hooke/plugin/polymer_fit.py index 4447ca7..a4b6507 100644 --- a/hooke/plugin/polymer_fit.py +++ b/hooke/plugin/polymer_fit.py @@ -989,7 +989,6 @@ Indicies of points bounding the selected data. queue = Queue() params = model.fit(outqueue=queue) if True: # TODO: if Kuhn length fixed - params = [params] a = info['Kuhn length (m)'] else: a = params[1] @@ -1016,7 +1015,6 @@ Indicies of points bounding the selected data. queue = Queue() params = model.fit(outqueue=queue) if True: # TODO: if Kuhn length fixed - params = [params] a = info['Kuhn length (m)'] else: a = params[1] @@ -1042,7 +1040,6 @@ Indicies of points bounding the selected data. queue = Queue() params = model.fit(outqueue=queue) if True: # TODO: if persistence length fixed - params = [params] p = info['persistence length (m)'] else: p = params[1]