Changeset 15f68ce in sasview

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

Files:

• fittingview/src/sans/perspectives/fitting/console.py (modified) (1 diff)
• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (2 diffs)
• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (3 diffs)
• park_integration/src/sans/fit/ScipyFitting.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/console.py

@@ -116 +116 @@
         """
         self.elapsed_time = time.time() - self.elapsed_time
-        msg = " Updating fit ...\n result:\n %s \n"%self.result.__str__()
+        msg = " Updating fit ...\n result:\n %s \n"%self.result.fitness
         wx.PostEvent(self.parent, StatusEvent(status=msg, info="info",
                                               type="progress"))

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -2116 +2116 @@
                     item[2].SetValue(val_out)
 
-                if(cov !=None):
+                if(cov !=None and len(cov) == len(out)):
                     try:
                         if dispersity !=None:
@@ -2127 +2127 @@
                     except:
                         pass    
-               
+                    
                     if cov[ind]!=None :
                         if numpy.isfinite(float(cov[ind])):

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -1121 +1121 @@
                     #check consistency of arrays
                     if not is_data2d:
-                        if len(res.theory) == len(res.index) and \
+                        if len(res.theory) == len(res.index[res.index]) and \
                             len(res.index) == len(data.y):
                             correct_result = True
                     else:
-                        if len(res.theory)== len(res.index) and \
+                        if len(res.theory)== len(res.index[res.index]) and \
                             len(res.index) == len(data.data):
                             correct_result = True
@@ -1176 +1176 @@
                             #save only fitted values
                             batch_outputs[res.param_list[index]].append(res.pvec[index])
-                            item = res.stderr[index]
-                            batch_inputs["error on %s" % res.param_list[index]].append(item)
+                            if res.stderr is not None and len(res.stderr) == len(res.param_list):
+                                item = res.stderr[index]
+                                batch_inputs["error on %s" % res.param_list[index]].append(item)
                             if res.param_list[index] in model.getParamList():
                                 model.setParam(res.param_list[index], res.pvec[index])
@@ -1305 +1306 @@
                     index += 1
                     cpage._on_fit_complete()
-                    if res.stderr == None:
+                    if res.fitness == None:
                         msg = "Fit Abort: "
                     else:

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):