Changeset 1309e919 in sasview

Timestamp:

Feb 10, 2009 5:36:29 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:

ca10d8e

Parents:

26cb768

Message:

The definition of chisqr was corrected and applied number of points within fitting range to the reduced chisqr.

File:

• sansview/perspectives/fitting/fitpage1D.py (modified) (5 diffs)

sansview/perspectives/fitting/fitpage1D.py

@@ -92 +92 @@
             i+=1
             
-        
         #Filing the sizer containing data related fields
         ix = 0
@@ -198 +197 @@
             self.qmax_x= math.sqrt(math.pow(max(math.fabs(self.data.xmax),math.fabs(self.data.xmin)),2)
                             +math.pow(max(math.fabs(self.data.ymax),math.fabs(self.data.ymin)),2))#self.data.xmax           
-            print "data2D range",self.qmax_x
+            #print "data2D range",self.qmax_x
         
         self.num_points= 100
@@ -310 +309 @@
                 self.qmin_x = float(self.qmin.GetValue())
                 self.qmax_x = float(self.qmax.GetValue())
-                
                 for i in range(len(self.data.x_bins)):
-                    if self.data.x_bins[i]>= self.qmin_x and self.data.x_bins[i]<= self.qmax_x:
+                    #if self.data.x_bins[i]>= self.qmin_x and self.data.x_bins[i]<= self.qmax_x:
                         for j in range(len(self.data.y_bins)):
-                            if self.data.y_bins[j]>= self.qmin_x and self.data.y_bins[j]<= self.qmax_x:
-                                res.append( (self.data.data[j][i]- self.model.runXY(\
-                                 [self.data.x_bins[i],self.data.y_bins[j]]))\
-                                    /self.data.err_data[j][i] )
+                            if math.pow(self.data.x_bins[i],2)+math.pow(self.data.y_bins[j],2)>=math.pow(self.qmin_x,2):
+                                if math.pow(self.data.x_bins[i],2)+math.pow(self.data.y_bins[j],2)<=math.pow(self.qmax_x,2):
+                            #if self.data.y_bins[j]>= self.qmin_x and self.data.y_bins[j]<= self.qmax_x:
+                                    chisqrji=(self.data.data[j][i]- self.model.runXY(\
+                                                                                        [self.data.y_bins[j],self.data.x_bins[i]]))\
+                                                                                        /self.data.err_data[j][i]
+                                    res.append( math.pow(chisqrji,2) )
                 sum=0
                
@@ -324 +325 @@
                         sum +=item
                 #print "chisqr : sum 2D", xmin, xmax, ymin, ymax,sum
-                #print res
-                self.tcChi.SetLabel(format_number(math.fabs(sum)))
+                #print len(res)
+                self.tcChi.SetLabel(format_number(math.fabs(sum/ len(res))))
             except:
                 raise
@@ -361 +362 @@
                         if numpy.isfinite(item):
                             sum +=item
-                    self.tcChi.SetLabel(format_number(math.fabs(sum)))
+                    self.tcChi.SetLabel(format_number(math.fabs(sum/ len(res))))
             except:
                 wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\