Changeset bad9ae2 in sasview for Invariant

Timestamp:

Dec 1, 2009 9:21:24 PM (14 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:

f521f61

Parents:

7a108dd

Message:

working on testing invariant

File:

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

Invariant/invariant.py

@@ -215 +215 @@
             fx= Functor(data , function)
             y = data.y
-            out, cov_x = linalg.lstsq(y,fx)
+            slope, constant = linalg.lstsq(y,fx)
             @param qmin: data first q value to consider during the fit
             @param qmax: data last q value to consider during the fit
@@ -320 +320 @@
             where n >= len(data.x)-1
             dxi = 1/2*(xi+1 - xi) + (xi - xi-1)
-            dx0 = (x1 - x0)/2
+            dx0 = x0 + (x1 - x0)/2
             dxn = xn - xn-1
             @param data: the data to use to compute invariant.
@@ -332 +332 @@
             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]
@@ -687 +687 @@
         # Data boundaries for fiiting
         x_len = len(self._data.x) - 1
-        qmin = self._data.x[x_len - (self._high_extrapolation_npts - 1) ]
+        qmin = self._data.x[x_len - (self._high_extrapolation_npts - 1)]
         qmax = self._data.x[x_len]
         
@@ -759 +759 @@
         #check value inside the sqrt function
         value = 1 - k * self._qstar
-        if (1 - k * self._qstar) <= 0:
+        if (value) <= 0:
             raise ValueError, "Cannot compute incertainty on volume"
         # Compute uncertainty