Changeset da58fcc in sasview

Timestamp:

Oct 29, 2009 1:22:25 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:

77f6a8b

Parents:

150144d

Message:

change on fitdata2D

File:

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

park_integration/AbstractFitEngine.py

@@ -270 +270 @@
             Determine the correct x_bin and y_bin to fit
         """
-        self.err_data = sans_data2d.err_data
         self.x_bins_array= numpy.reshape(sans_data2d.x_bins,
                                          [1,len(sans_data2d.x_bins)])
@@ -276 +275 @@
                                           [len(sans_data2d.y_bins),1])
         
-        x_max = max(self.data.xmin, self.data.xmax)
-        y_max = max(self.data.ymin, self.data.ymax)
+        x_max = max(sans_data2d.xmin, sans_data2d.xmax)
+        y_max = max(sans_data2d.ymin, sans_data2d.ymax)
         
         ## fitting range
@@ -283 +282 @@
         self.qmax = math.sqrt(x_max*x_max +y_max*y_max)
         ## 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
+        if self.err_data== None or self.err_data ==[]:
+            self.res_err_data= numpy.zeros(len(self.y_bins),len(self.x_bins))
+        else:
+            self.res_err_data = copy.deepcopy(self.err_data)
+        self.res_err_data[self.res_err_data==0]=1
         
         self.radius= numpy.sqrt(self.x_bins_array**2 + self.y_bins_array**2)
@@ -311 +310 @@
     def residuals(self, fn): 
         
-        res=self.index_model*(self.image - fn([self.x_bins_array,
-                             self.y_bins_array]))/self.res_err_image
+        res=self.index_model*(self.data - fn([self.x_bins_array,
+                             self.y_bins_array]))/self.res_err_data
         return res.ravel()