Changeset 3ab116f in sasview for park_integration

Timestamp:

Feb 9, 2011 4:43:20 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cbb8bb6

Parents:

c83a5af

Message:

raises a error when scipy get a silent error( this is a very strange behavior)

File:

• park_integration/ScipyFitting.py (modified) (2 diffs)

park_integration/ScipyFitting.py

@@ -128 +128 @@
         functor = SansAssembly(self.param_list, model, data, handler=handler,
                          fitresult=result, curr_thread= self.curr_thread)
-        out, cov_x, _, _, success = optimize.leastsq(functor,
+        out, cov_x, _, mesg, success = optimize.leastsq(functor,
                                             model.get_params(self.param_list),
+                                                    ftol = 0.001,
                                                     full_output=1,
                                                     warning=True)
-        
-        #chisqr = functor.chisq(out)
+  
         chisqr = functor.chisq()
         if cov_x is not None and numpy.isfinite(cov_x).all():
@@ -139 +139 @@
         else:
             stderr = None
-        if not (numpy.isnan(out).any()) or (cov_x != None):
+
+        if not (numpy.isnan(out).any()) and (cov_x != None):
             result.fitness = chisqr
             result.stderr  = stderr
             result.pvec = out
             result.success = success
-            #print result
             if q is not None:
-                #print "went here"
                 q.put(result)
-                #print "get q scipy fit enfine",q.get()
                 return q
             return result
         else:  
-            raise ValueError, "SVD did not converge" + str(success)
+            raise ValueError, "SVD did not converge" + str(mesg)