Changeset 425e49ca in sasview for park_integration/src/sans

Timestamp:

Oct 5, 2011 7:10:39 PM (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:

a3c8e8f

Parents:

dcc93e4

Message:

fixing batch plot problems

Location:

park_integration/src/sans/fit

Files:

• AbstractFitEngine.py (modified) (3 diffs)
• ParkFitting.py (modified) (4 diffs)
• ScipyFitting.py (modified) (3 diffs)

park_integration/src/sans/fit/AbstractFitEngine.py

@@ -283 +283 @@
             msg += "%d <> %d" % (numpy.shape(self.dy), numpy.size(fx))                                                      
             raise RuntimeError, msg  
-        return (self.y[self.idx] - fx[self.idx]) / self.dy[self.idx]
+        return (self.y[self.idx] - fx[self.idx]) / self.dy[self.idx], fx[self.idx]
      
     def residuals_deriv(self, model, pars=[]):
@@ -431 +431 @@
         self.true_res = []
         self.func_name = "Functor"
+        self.theory = None
         
     #def chisq(self, params):
@@ -458 +459 @@
         #import thread
         self.model.set_params(self.paramlist, params)
-        self.true_res = self.data.residuals(self.model.eval)
+        
+        self.true_res, self.theory = self.data.residuals(self.model.eval)
         # check parameters range
         if self.check_param_range():

park_integration/src/sans/fit/ParkFitting.py

@@ -27 +27 @@
     def __init__(self, *args, **kwrds):
         fitresult.FitResult.__init__(self, *args, **kwrds)
+        self.theory = None
         self.inputs = []
         
@@ -43 +44 @@
     #xtol = 1e-4
     """Stop when simplex vertices are within xtol of each other"""
-    ftol = 1e-4
+    ftol = 5e-5
     """Stop when vertex values are within ftol of each other"""
     maxiter = None
@@ -66 +67 @@
         # Compute the parameter uncertainties from the jacobian
         res.calc_cov(fitness)
+        res.theory = result.fx
         return res
       
@@ -272 +274 @@
             if self._cancel: return numpy.inf
             if m.isfitted and m.weight != 0:
-                m.residuals = m.fitness.residuals()
+                m.residuals, _ = m.fitness.residuals()
                 N = len(m.residuals)
                 m.degrees_of_freedom = N-k if N>k else 1

park_integration/src/sans/fit/ScipyFitting.py

@@ -39 +39 @@
         self.model = model
         self.data = data
+        self.theory = None
         self.param_list = param_list
         self.iterations = 0
@@ -160 +161 @@
                                                     full_output=1,
                                                     warning=True)
+
         except KeyboardInterrupt:
             msg = "Fitting: Terminated!!!"
@@ -188 +190 @@
             result.pvec = out
             result.success = success
+            result.theory = functor.theory
             #print "scipy", result.inputs
             if q is not None: