Changeset 669aaf9 in sasview

Timestamp:

Nov 24, 2009 2:40:50 PM (15 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:

2cce133

Parents:

b6666d4

Message:

apply feedback in invariant.py

File:

• Invariant/invariant.py (modified) (7 diffs)

Invariant/invariant.py

@@ -10 +10 @@
 from DataLoader.qsmearing import smear_selection
 
-
-# PLEASE NEVER USE SUCH A DIRTY TRICK. Change your logic instead.
-#INFINITY = 10
 
 # The minimum q-value to be used when extrapolating
@@ -38 +35 @@
         self.qmin =  self.data[0]    
         if self.qmin == 0:
-            self.qmin = MINIMUM 
+            self.qmin = Q_MINIMUM 
     
         self.qmax = self.data[x_len]
@@ -254 +251 @@
                             + ..+ xn**2 *yn *dxn 
                             
-            where n= SOME GOOD DEFAULT
+            where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
             dx0 = (x1 - x0)/2
@@ -268 +265 @@
                 q_star = x0*dxl *y0*dx0 + x1*dxl *y1 *dx1 
                             + ..+ xn*dxl *yn *dxn 
-            where n= SOME GOOD DEFAULT
+            where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
             dx0 = x0+ (x1 - x0)/2
@@ -283 +280 @@
                dq_star = math.sqrt[(x0**2*(dy0)*dx0)**2 +
                     (x1**2 *(dy1)*dx1)**2 + ..+ (xn**2 *(dyn)*dxn)**2 ]
-            where n = SOME GOOD DEFAULT
+            where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
             dx0 = x0+ (x1 - x0)/2
@@ -299 +296 @@
                 dq_star = x0*dxl *dy0 *dx0 + x1*dxl *dy1 *dx1 
                             + ..+ xn*dxl *dyn *dxn 
-            where n= infinity
+            where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
             dx0 = x0+ (x1 - x0)/2
@@ -338 +335 @@
             q_star: the invariant value included extrapolation is applied
                          unit  1/A^(3)*1/cm
-                    q_star = self._get_qstar_total()
+                    q_star = self._qstar
                     
             the result returned will be 0<= volume <= 1