Changeset 058b2d7 in sasview

Timestamp:

Jul 15, 2009 11:31:11 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:

730c9eb

Parents:

342d9197

Message:

modify fitdata1d and fitdata2d residuals function

File:

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

park_integration/AbstractFitEngine.py

@@ -205 +205 @@
         # Initialize from Data1D object
         self.data=sans_data1d
-        self.x= sans_data1d.x
-        self.y= sans_data1d.y
-        self.dx= sans_data1d.dx
-        self.dy= sans_data1d.dy
-        
+        self.x= numpy.array(sans_data1d.x)
+        self.y= numpy.array(sans_data1d.y)
+        self.dx= numpy.array(sans_data1d.dx)
+        self.dy= numpy.array(sans_data1d.dy)
+          
+        
+        if self.dy ==None or len(self.dy)==0:
+            self.res_dy= numpy.zeros(len(self.y))
+        else:
+            self.res_dy= copy.deepcopy(self.dy)
+        self.res_dy= numpy.asarray(self.res_dy)
+        
+        self.res_dy[self.res_dy==0]=1
         ## Min Q-value
         #Skip the Q=0 point, especially when y(q=0)=None at x[0].
@@ -218 +226 @@
         ## Max Q-value
         self.qmax= max (self.data.x)
-       
-       
+        
+        
     def setFitRange(self,qmin=None,qmax=None):
         """ to set the fit range"""
-        
         # Skip Q=0 point, (especially for y(q=0)=None at x[0]).
         #ToDo: Fix this.
@@ -232 +239 @@
         if qmax !=None:
             self.qmax = qmax
-        
+       
         
     def getFitRange(self):
@@ -242 +249 @@
      
     def residuals(self, fn):
-        """ 
-            Compute residuals.
-            
-            If self.smearer has been set, use if to smear
-            the data before computing chi squared.
-            
-            @param fn: function that return model value
-            @return residuals
-        """
-        x,y = [numpy.asarray(v) for v in (self.x,self.y)]
-        if self.dy ==None or self.dy==[]:
-            dy= numpy.zeros(len(y))  
-        else:
-            dy= copy.deepcopy(self.dy)
-            dy= numpy.asarray(dy)
-     
-        dy[dy==0]=1
-       
+        """
+        Compute residuals.
+        
+        If self.smearer has been set, use if to smear the data before computing chi squared.
+        
+        @param fn: function that return model value @return residuals """
+        # Get the indices of the selected range
+        idx = (self.x>=self.qmin) & (self.x <= self.qmax)
+        
         # Compute theory data f(x)
-        tempy=[]
-        fx=numpy.zeros(len(y))
-        tempdy=[]
-        index=[]
-        tempfx=[]
-        for i_x in  range(len(x)):
+        newy = numpy.zeros(len(self.x))
+        newfx= numpy.zeros(len(self.x))
+        newdy= numpy.zeros(len(self.x))
+       
+        for i_x in range(len(self.x)):
             try:
-                if self.qmin <=x[i_x] and x[i_x]<=self.qmax:
-                    value= fn(x[i_x])
-                    fx[i_x] =value
-                    tempy.append(y[i_x])
-                    tempdy.append(dy[i_x])
-                    index.append(i_x)
+                # Skip the selection here since we want all the contribution from the theory bins #if self.qmin <=x[i_x] and x[i_x]<=self.qmax:
+                value       = fn(self.x[i_x])
+                newfx[i_x]  = value
+                newy[i_x]   = self.y[i_x]
+                newdy[i_x]  = self.res_dy[i_x]
+                
             except:
                 ## skip error for model.run(x)
                 pass
-                 
+       
         ## Smear theory data
         if self.smearer is not None:
-            fx = self.smearer(fx)
-            
-        for i in index:
-            tempfx.append(fx[i])
+            
+            newfx = self.smearer(newfx)
       
-        newy= numpy.asarray(tempy)
-        newfx= numpy.asarray(tempfx)
-        newdy= numpy.asarray(tempdy)
-       
         ## Sanity check
         if numpy.size(newdy)!= numpy.size(newfx):
             raise RuntimeError, "FitData1D: invalid error array"
-       
-        return (newy- newfx)/newdy
-     
-  
-        
+        
+        # Sum over the selected range
+        return (newy[idx]- newfx[idx])/newdy[idx]
+        
+
     def residuals_deriv(self, model, pars=[]):
         """ 
@@ -637 +628 @@
         """
         return self.selected
-    
-
-
-