Changeset 39c3263 in sasview

Timestamp:

Feb 10, 2009 4:40:14 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:

26cb768

Parents:

0bd125d

Message:

q fit-range enabled

File:

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

park_integration/AbstractFitEngine.py

@@ -1 +1 @@
 
-import park,numpy
+import park,numpy,math
 
 class SansParameter(park.Parameter):
@@ -310 +310 @@
         """
         res=[]
-        if self.xmin==None:
-            self.xmin= self.data.xmin
+        if self.xmin==None:        #Here we define that xmin = qmin >=0 and xmax=qmax>=qmain
+            self.xmin= 0 #self.data.xmin
         if self.xmax==None:
             self.xmax= self.data.xmax
@@ -321 +321 @@
             #if self.y_bins[i]>= self.ymin and self.y_bins[i]<= self.ymax:
             for j in range(len(self.x_bins)):
-                #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]]))\
+                 if math.pow(self.data.x_bins[i],2)+math.pow(self.data.y_bins[j],2)>=math.pow(self.xmin,2):
+                     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]]))\
                             /self.err_image[j][i] )