Changeset ca6d914 in sasview for park_integration/ScipyFitting.py

Timestamp:

Sep 16, 2008 4:34:55 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

fadea71

Parents:

3b19ac9

Message:

some bugs fixed

File:

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

park_integration/ScipyFitting.py

@@ -35 +35 @@
         Use a sans model
         
-        Add data with a dictionnary of FitArrangeList where Uid is a key and data
+        Add data with a dictionnary of FitArrangeDict where Uid is a key and data
         is saved in FitArrange object.
         engine.set_data(data,Uid)
@@ -45 +45 @@
         engine.set_param( model,"M1", {'A':2,'B':4})
         
-        Add model with a dictionnary of FitArrangeList{} where Uid is a key and model
+        Add model with a dictionnary of FitArrangeDict{} where Uid is a key and model
         is save in FitArrange object.
         engine.set_model(model,Uid)
@@ -54 +54 @@
     def __init__(self):
         """
-            Creates a dictionary (self.fitArrangeList={})of FitArrange elements
+            Creates a dictionary (self.fitArrangeDict={})of FitArrange elements
             with Uid as keys
         """
-        self.fitArrangeList={}
+        self.fitArrangeDict={}
         self.paramList=[]
     def fit(self,qmin=None, qmax=None):
          # Protect against simultanous fitting attempts
-        if len(self.fitArrangeList)>1: 
+        if len(self.fitArrangeDict)>1: 
             raise RuntimeError, "Scipy can't fit more than a single fit problem at a time."
         
         # fitproblem contains first fitArrange object(one model and a list of data)
-        fitproblem=self.fitArrangeList.values()[0]
+        fitproblem=self.fitArrangeDict.values()[0]
         listdata=[]
         model = fitproblem.get_model()
@@ -77 +77 @@
             qmax= max(data.x) 
         functor= sansAssembly(model,data)
-        print "scipyfitting:param list",model.getParams(self.paramList)
-        print "scipyfitting:functor",functor(model.getParams(self.paramList))
-    
+       
         out, cov_x, info, mesg, success = optimize.leastsq(functor,model.getParams(self.paramList), full_output=1, warning=True)
         chisqr = functor.chisq(out)
+        if cov_x is not None and numpy.isfinite(cov_x).all():
+            stderr = numpy.sqrt(numpy.diag(cov_x))
         
-        print "scipyfitting: info",mesg
-        print"scipyfitting : success",success
-        print "scipyfitting: out", out
-        print "scipyfitting: cov_x", cov_x
-        print "scipyfitting: chisqr", chisqr
-        
-        if not (numpy.isnan(out).any()):
+        if not (numpy.isnan(out).any()) or ( cov_x !=None) :
                 result = fitresult()
                 result.fitness = chisqr
-                result.cov  = cov_x
-                
+                result.stderr  = stderr
                 result.pvec = out
                 result.success =success
@@ -99 +92 @@
                 return result
         else:  
-            raise ValueError, "SVD did not converge"
+            raise ValueError, "SVD did not converge"+str(success)