Changeset 7b78bb6 in sasview for sansview/perspectives

Timestamp:

Apr 14, 2009 3:50:45 PM (16 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:

25a608f5

Parents:

196deac

Message:

compuite chiqsr for 2 d

File:

• sansview/perspectives/fitting/fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -495 +495 @@
         from sans.guiframe.utils import check_value
         flag = check_value( self.qmin, self.qmax)
-       
+        err_image = self.data.err_image
+        if err_image==[] or err_image==None:
+            err_image= numpy.zeros(len(self.data.x_bins),len(self.data.y_bins))
+                       
+        err_image[err_image==0]=1
         res=[]
         if flag== True:
@@ -504 +508 @@
                     for j in range(len(self.data.y_bins)):
                         #Check the range containing data between self.qmin_x and self.qmax_x
-                        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):
-                                chisqrji=(self.data.data[j][i]- self.model.runXY(\
-                                                                                    [self.data.x_bins[i],self.data.y_bins[j]]))\
-                                                                                    /self.data.err_data[j][i]
-                                #Vector containing residuals
-                                res.append( math.pow(chisqrji,2) )
+                        value =  math.pow(self.data.x_bins[i],2)+ math.pow(self.data.y_bins[j],2)
+                        if value >= math.pow(self.qmin_x,2) and value <= math.pow(self.qmax_x,2):
+                            temp = [self.data.x_bins[i],self.data.y_bins[j]]
+                            error= self.data.err_data[j][i]
+                            chisqrji = (self.data.data[j][i]- self.model.runXY(temp ))/error
+                            #Vector containing residuals
+                            res.append( math.pow(chisqrji,2) )
                 # compute sum of residual
                 sum=0