Changeset 109e60ab in sasview

Timestamp:

Oct 21, 2008 3:47:16 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

5cab7d3

Parents:

5893cdb

Message:

Added first attempt at resolution smearing

File:

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

park_integration/AbstractFitEngine.py

@@ -173 +173 @@
             Data can be initital with a data (sans plottable)
             or with vectors.
-        """
+            
+            self.smearer is an object of class QSmearer or SlitSmearer
+            that will smear the theory data (slit smearing or resolution 
+            smearing) when set.
+            
+            The proper way to set the smearing object would be to
+            do the following:
+            
+            from DataLoader.qsmearing import smear_selection
+            fitdata1d = FitData1D(some_data)
+            fitdata1d.smearer = smear_selection(some_data)
+            
+            Note that some_data _HAS_ to be of class DataLoader.data_info.Data1D
+            
+            Setting it back to None will turn smearing off.
+            
+        """
+        ## Smearing object
+        self.smearer = None
+
+        # Initialize from Data1D object
         self.data=sans_data1d
         self.x= sans_data1d.x
@@ -179 +199 @@
         self.dx= sans_data1d.dx
         self.dy= sans_data1d.dy
+        
+        ## Min Q-value
         self.qmin=None
+        ## Max Q-value
         self.qmax=None
        
@@ -197 +220 @@
      
     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,dy = [numpy.asarray(v) for v in (self.x,self.y,self.dy)]
+           
+        # Find entries to consider
+        if self.qmin==None and self.qmax==None:
+            idx = Ellipsis
+        else:
+            idx = (x>=self.qmin) & (x <= self.qmax)
+                        
+        # Compute theory data f(x)
+        fx = numpy.zeros(len(x))
+        fx[idx] = numpy.asarray([fn(v) for v in x[idx]])
+        
+        # Smear theory data
+        if self.smearer is not None:
+            fx = self.smearer(fx)
+            
+        # Sanity check
+        if numpy.size(dy) < numpy.size(x):
+            raise RuntimeError, "FitData1D: invalid error array"
+                            
+        return (y[idx] - fx[idx])/dy[idx]
+     
+    def residuals_old(self, fn):
         """ @param fn: function that return model value
             @return residuals
@@ -333 +388 @@
             during fitting
         """
+        #TODO: we have to refactor the way we handle data.
+        # We should move away from plottables and move towards the Data1D objects
+        # defined in DataLoader. Data1D allows data manipulations, which should be
+        # used to concatenate. 
+        # In the meantime we should switch off the concatenation.
+        #if len(listdata)>1:
+        #    raise RuntimeError, "FitEngine._concatenateData: Multiple data files is not currently supported"
+        #return listdata[0]
+        
         if listdata==[]:
             raise ValueError, " data list missing"