Changeset d8a2e31 in sasview for park_integration/AbstractFitEngine.py

Timestamp:

Aug 5, 2009 5:41:58 PM (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:

60c1943

Parents:

f88624d

Message:

use eval distribution as well as run

File:

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

park_integration/AbstractFitEngine.py

@@ -112 +112 @@
             @param x: the x value used to compute a function
         """
-        return self.model.runXY(x)
+        try:
+            return self.model.evalDistribution(x)
+        except:
+            return self.model.runXY(x)
    
    
@@ -340 +343 @@
         self.image = sans_data2d.data
         self.err_image = sans_data2d.err_data
-        self.x_bins= sans_data2d.x_bins
-        self.y_bins= sans_data2d.y_bins
+        self.x_bins_array= numpy.reshape(sans_data2d.x_bins,
+                                         [1,len(sans_data2d.x_bins)])
+        self.y_bins_array = numpy.reshape(sans_data2d.y_bins,
+                                          [len(sans_data2d.y_bins),1])
+        
+        
+        self.x_bins = sans_data2d.x_bins
+        self.y_bins = sans_data2d.y_bins
        
         x = max(self.data.xmin, self.data.xmax)
@@ -355 +364 @@
             self.res_err_image = copy.deepcopy(self.err_image)
         self.res_err_image[self.err_image==0]=1
+        
+        self.radius= numpy.sqrt(self.x_bins_array**2 + self.y_bins_array**2)
+        self.index_model = (self.qmin <= self.radius)&(self.radius<= self.qmax)
        
        
@@ -373 +385 @@
         return self.qmin, self.qmax
      
-     
-    def residuals(self, fn):
+    def residuals(self, fn): 
+        try:
+            res=self.index_model*(self.image - fn([self.y_bins_array,
+                             self.x_bins_array]))/self.res_err_image
+            return res.ravel() 
+        except:
+            print "Using old residual method"
+            return self.old_residuals( fn)
+    
+    
+    def old_residuals(self, fn):
         """ @param fn: function that return model value
             @return residuals