Changeset 773806e in sasview for park_integration

Timestamp:

Apr 20, 2009 4:50:35 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:

f04dc30

Parents:

513115c

Message:

skip Q=0 for fitting if y is not finite

File:

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

park_integration/AbstractFitEngine.py

@@ -144 +144 @@
     def setFitRange(self,mini=None,maxi=None):
         """ to set the fit range"""
-        self.qmin=mini
+        
+        self.qmin=mini           
         self.qmax=maxi
         
@@ -210 +211 @@
         
         ## Min Q-value
-        self.qmin= min (self.data.x)
+        #Skip the Q=0 point, especially when y(q=0)=None at x[0].
+        if min (self.data.x) ==0.0 and self.data.x[0]==0 and not numpy.isfinite(self.data.y[0]):
+            self.qmin = min(self.data.x[self.data.x!=0])
+        else:                              
+            self.qmin= min (self.data.x)
         ## Max Q-value
         self.qmax= max (self.data.x)
@@ -217 +222 @@
     def setFitRange(self,qmin=None,qmax=None):
         """ to set the fit range"""
-        if qmin!=None:
-            self.qmin = qmin
+        
+        # Remove or do not allow fitting on the Q=0 point, especially when y(q=0)=None at x[0].
+        #ToDo: Fix this.
+        if qmin==0.0 and self.data.x[0]==0 and not numpy.isfinite(self.data.y[0]):
+            self.qmin = min(self.data.x[self.data.x!=0])
+        elif qmin!=None:                       
+            self.qmin = qmin            
+
         if qmax !=None:
             self.qmax = qmax
@@ -261 +272 @@
         if numpy.size(dy) < numpy.size(x):
             raise RuntimeError, "FitData1D: invalid error array"
-                            
         return (y[idx] - fx[idx])/dy[idx]
      
@@ -291 +301 @@
         
         ## fitting range
-        self.qmin = 0
+        self.qmin = 1e-16
         self.qmax = math.sqrt(x*x +y*y)
        
@@ -298 +308 @@
     def setFitRange(self,qmin=None,qmax=None):
         """ to set the fit range"""
-        if qmin!=None:
-            self.qmin= qmin
+        if qmin==0.0:
+            self.qmin = 1e-16
+        elif qmin!=None:                       
+            self.qmin = qmin            
         if qmax!=None:
             self.qmax= qmax