Changeset 70bf68c in sasview

Timestamp:

Jul 13, 2009 11:25:26 AM (15 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:

077809c

Parents:

770e4c9

Message:

working on residual function

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (4 diffs)
• ScipyFitting.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -324 +324 @@
         self.qmin = 1e-16
         self.qmax = math.sqrt(x*x +y*y)
-       
+        ## new error image for fitting purpose
+        if self.err_image== None or self.err_image ==[]:
+            self.res_err_image= numpy.zeros(len(self.y_bins),len(self.x_bins))
+        else:
+            self.res_err_image = copy.deepcopy(self.err_image)
+        self.res_err_image[self.err_image==0]=1
        
        
@@ -349 +354 @@
         """
         res=[]
-        if self.err_image== None or self.err_image ==[]:
-            err_image= numpy.zeros(len(self.y_bins),len(self.x_bins))
-        else:
-            err_image = copy.deepcopy(self.err_image)
-            
-        err_image[err_image==0]=1
+       
         for i in range(len(self.x_bins)):
             for j in range(len(self.y_bins)):
@@ -361 +361 @@
                 if self.qmin <= radius and radius <= self.qmax:
                     res.append( (self.image[j][i]- fn([self.x_bins[i],self.y_bins[j]]))\
-                            /err_image[j][i] )
+                            /self.res_err_image[j][i] )
         
         return numpy.array(res)
@@ -380 +380 @@
 
 
-class sansAssembly:
+class SansAssembly:
     """
          Sans Assembly class a class wrapper to be call in optimizer.leastsq method

park_integration/ScipyFitting.py

@@ -83 +83 @@
         
         try:
-            functor= sansAssembly(self.paramList,model,data, curr_thread= self.curr_thread)
+            functor= SansAssembly(self.paramList,model,data, curr_thread= self.curr_thread)
             out, cov_x, info, mesg, success = optimize.leastsq(functor,model.getParams(self.paramList), full_output=1, warning=True)