Changeset 3bb37ef in sasview for Invariant

Timestamp:

Dec 2, 2009 5:58:56 PM (14 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:

027e8f2

Parents:

f31ab59

Message:

minor corrections of dx on edges of the Q* integration.

File:

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

Invariant/invariant.py

@@ -323 +323 @@
             where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
-            dx0 = x0 + (x1 - x0)/2
-            dxn = xn - xn-1
+            dx0 = (x1 - x0)/2
+            dxn = (xn - xn-1)/2
             @param data: the data to use to compute invariant.
             @return q_star: invariant value for pinhole data. q_star > 0
@@ -335 +335 @@
             n = len(data.x)- 1
             #compute the first delta q
-            dx0 = (data.x[1] + data.x[0])/2
+            dx0 = (data.x[1] - data.x[0])/2
             #compute the last delta q
-            dxn = data.x[n] - data.x[n-1]
+            dxn = (data.x[n] - data.x[n-1])/2
             sum = 0
             sum += data.x[0] * data.x[0] * data.y[0] * dx0
@@ -359 +359 @@
             where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
-            dx0 = x0+ (x1 - x0)/2
-            dxn = xn - xn-1
+            dx0 = (x1 - x0)/2
+            dxn = (xn - xn-1)/2
             dxl: slit smear value
             
@@ -377 +377 @@
             n = len(data.x)-1
             #compute the first delta
-            dx0 = (data.x[1] + data.x[0])/2
+            dx0 = (data.x[1] - data.x[0])/2
             #compute the last delta
-            dxn = data.x[n] - data.x[n-1]
+            dxn = (data.x[n] - data.x[n-1])/2
             sum = 0
             sum += data.x[0] * data.dxl[0] * data.y[0] * dx0
@@ -425 +425 @@
             where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
-            dx0 = x0+ (x1 - x0)/2
-            dxn = xn - xn-1
+            dx0 = (x1 - x0)/2
+            dxn = (xn - xn-1)/2
             dyn: error on dy
            
@@ -450 +450 @@
             n = len(data.x) - 1
             #compute the first delta
-            dx0 = (data.x[1] + data.x[0])/2
+            dx0 = (data.x[1] - data.x[0])/2
             #compute the last delta
-            dxn= data.x[n] - data.x[n-1]
+            dxn= (data.x[n] - data.x[n-1])/2
             sum = 0
             sum += (data.x[0] * data.x[0] * dy[0] * dx0)**2
@@ -473 +473 @@
             where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
-            dx0 = x0+ (x1 - x0)/2
-            dxn = xn - xn-1
+            dx0 = (x1 - x0)/2
+            dxn = (xn - xn-1)/2
             dxl: slit smearing value
             dyn : error on dy
@@ -503 +503 @@
             n = len(data.x) - 1
             #compute the first delta
-            dx0 = (data.x[1] + data.x[0])/2
+            dx0 = (data.x[1] - data.x[0])/2
             #compute the last delta
-            dxn = data.x[n] - data.x[n-1]
+            dxn = (data.x[n] - data.x[n-1])/2
             sum = 0
             sum += (data.x[0] * data.dxl[0] * dy[0] * dx0)**2
@@ -652 +652 @@
             return None
        
+        #q_start point
+        q_start = Q_MINIMUM
+        if Q_MINIMUM >= qmin:
+            q_start = qmin/10
+            
         #create new Data1D to compute the invariant
-        new_x = numpy.linspace(start=Q_MINIMUM,
+        new_x = numpy.linspace(start=q_start,
                                stop=qmin,
                                num=INTEGRATION_NSTEPS,