Changeset 26cb768 in sasview

Timestamp:

Feb 10, 2009 3:29:41 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

1309e919

Parents:

39c3263

Message:

fixed 2d fitting bug by correcting bin number input order.

File:

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

park_integration/AbstractFitEngine.py

@@ -324 +324 @@
                      if math.pow(self.data.x_bins[i],2)+math.pow(self.data.y_bins[j],2)<=math.pow(self.xmax,2):
                          #if self.x_bins[j]>= self.xmin and self.x_bins[j]<= self.xmax:                
-                        res.append( (self.image[j][i]- fn([self.x_bins[j],self.y_bins[i]]))\
+                        res.append( (self.image[j][i]- fn([self.x_bins[i],self.y_bins[j]]))\
                             /self.err_image[j][i] )
         
@@ -359 +359 @@
         for item in self.res:
             sum += item*item
-        return sum
+        #print "length of data =",len(self.res)
+        return sum/ len(self.res)
     def __call__(self,params):
         """