Changeset 15f68ce in sasview for park_integration/src/sans/fit

Timestamp:

Oct 18, 2011 10:43:19 AM (13 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:

74dc0a4

Parents:

ba7dceb

Message:

trying to fix scipy result handling

File:

• park_integration/src/sans/fit/ScipyFitting.py (modified) (1 diff)

park_integration/src/sans/fit/ScipyFitting.py

@@ -128 +128 @@
             raise
         chisqr = functor.chisq()
+
         if cov_x is not None and numpy.isfinite(cov_x).all():
             stderr = numpy.sqrt(numpy.diag(cov_x))
         else:
-            stderr = None
+            stderr = []
             
         result.index = data.idx
-        if not (numpy.isnan(out).any()) and (cov_x != None):
-            result.fitness = chisqr
-            result.stderr  = stderr
-            result.pvec = out
-            result.success = success
-            result.theory = functor.theory
-            #print "scipy", result.inputs
-            if q is not None:
-                q.put(result)
-                return q
-            if success < 1 or success > 5:
-                result = None
+        result.fitness = chisqr
+        result.stderr  = stderr
+        result.pvec = out
+        result.success = success
+        result.theory = functor.theory
+        if q is not None:
+            q.put(result)
+            return q
+        if success < 1 or success > 5:
+            result.fitness = None
         return [result]
-        """
-        else:
-            return None
-        """
-        # Error will be present to the client, not here 
-        #else:  
-        #    raise ValueError, "SVD did not converge" + str(mesg)
+
         
     def _check_param_range(self, model):