Changeset e71440c in sasview for park_integration/ScipyFitting.py

Timestamp:

Sep 23, 2008 3:11:08 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:

442895f

Parents:

5f96484

Message:

changes on setparams to fix fit

File:

• park_integration/ScipyFitting.py (modified) (1 diff)

park_integration/ScipyFitting.py

@@ -76 +76 @@
         if qmax==None:
             qmax= max(data.x) 
-        functor= sansAssembly(model,data)
-       
+        functor= sansAssembly(self.paramList,model,data)
         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))
-        
+        else:
+            stderr=None
         if not (numpy.isnan(out).any()) or ( cov_x !=None) :
                 result = fitresult()