Changeset cb62bd5 in sasview for src/sas/sascalc

Timestamp:

Aug 4, 2017 2:22:51 AM (7 years ago)

Author:

lewis

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

1abd19c

Parents:

a0e6b1b

Message:

Use manually inputted background level in Pr calculation

Location:

src/sas/sascalc/pr

Files:

• c_extensions/Cinvertor.c (modified) (7 diffs)
• c_extensions/invertor.c (modified) (2 diffs)
• c_extensions/invertor.h (modified) (1 diff)
• invertor.py (modified) (10 diffs)

src/sas/sascalc/pr/c_extensions/Cinvertor.c

@@ -294 +294 @@
 }
 
-const char set_has_bck_doc[] =
+const char set_est_bck_doc[] =
         "Sets background flag\n";
 
@@ -300 +300 @@
  * Sets the maximum distance
  */
-static PyObject * set_has_bck(Cinvertor *self, PyObject *args) {
-        int has_bck;
-
-        if (!PyArg_ParseTuple(args, "i", &has_bck)) return NULL;
-        self->params.has_bck = has_bck;
-        return Py_BuildValue("i", self->params.has_bck);
-}
-
-const char get_has_bck_doc[] =
+static PyObject * set_est_bck(Cinvertor *self, PyObject *args) {
+        int est_bck;
+
+        if (!PyArg_ParseTuple(args, "i", &est_bck)) return NULL;
+        self->params.est_bck = est_bck;
+        return Py_BuildValue("i", self->params.est_bck);
+}
+
+const char get_est_bck_doc[] =
         "Gets background flag\n";
 
@@ -314 +314 @@
  * Gets the maximum distance
  */
-static PyObject * get_has_bck(Cinvertor *self, PyObject *args) {
-        return Py_BuildValue("i", self->params.has_bck);
+static PyObject * get_est_bck(Cinvertor *self, PyObject *args) {
+        return Py_BuildValue("i", self->params.est_bck);
 }
 
@@ -882 +882 @@
         sqrt_alpha = sqrt(self->params.alpha);
         pi = acos(-1.0);
-        offset = (self->params.has_bck==1) ? 0 : 1;
+        offset = (self->params.est_bck==1) ? 0 : 1;
 
     for (j=0; j<nfunc; j++) {
@@ -892 +892 @@
             }
             if (accept_q(self, self->params.x[i])){
-                if (self->params.has_bck==1 && j==0) {
+                if (self->params.est_bck==1 && j==0) {
                     a[i*nfunc+j] = 1.0/self->params.err[i];
                 } else {
@@ -906 +906 @@
         }
         for (i_r=0; i_r<nr; i_r++){
-            if (self->params.has_bck==1 && j==0) {
+            if (self->params.est_bck==1 && j==0) {
                 a[(i_r+self->params.npoints)*nfunc+j] = 0.0;
             } else {
@@ -1029 +1029 @@
                    {"set_slit_height", (PyCFunction)set_slit_height, METH_VARARGS, set_slit_height_doc},
                    {"get_slit_height", (PyCFunction)get_slit_height, METH_VARARGS, get_slit_height_doc},
-                   {"set_has_bck", (PyCFunction)set_has_bck, METH_VARARGS, set_has_bck_doc},
-                   {"get_has_bck", (PyCFunction)get_has_bck, METH_VARARGS, get_has_bck_doc},
+                   {"set_est_bck", (PyCFunction)set_est_bck, METH_VARARGS, set_est_bck_doc},
+                   {"get_est_bck", (PyCFunction)get_est_bck, METH_VARARGS, get_est_bck_doc},
                    {"get_nx", (PyCFunction)get_nx, METH_VARARGS, get_nx_doc},
                    {"get_ny", (PyCFunction)get_ny, METH_VARARGS, get_ny_doc},

src/sas/sascalc/pr/c_extensions/invertor.c

@@ -20 +20 @@
         pars->q_min = -1.0;
         pars->q_max = -1.0;
-        pars->has_bck = 0;
+        pars->est_bck = 0;
 }
 
@@ -313 +313 @@
     return sqrt(sum_r2/(2.0*sum));
 }
-

src/sas/sascalc/pr/c_extensions/invertor.h

@@ -27 +27 @@
     double q_max;
     /// Flag for whether or not to evalute a constant background while inverting
-    int has_bck;
+    int est_bck;
     /// Slit height in units of q [A-1]
     double slit_height;

src/sas/sascalc/pr/invertor.py

@@ -121 +121 @@
          self.q_min, self.q_max,
          self.x, self.y,
-         self.err, self.has_bck,
+         self.err, self.est_bck,
          self.slit_height, self.slit_width) = state
 
@@ -133 +133 @@
                  self.q_min, self.q_max,
                  self.x, self.y,
-                 self.err, self.has_bck,
+                 self.err, self.est_bck,
                  self.slit_height, self.slit_width,
                 )
@@ -175 +175 @@
         elif name == 'slit_width':
             return self.set_slit_width(value)
-        elif name == 'has_bck':
+        elif name == 'est_bck':
             if value == True:
-                return self.set_has_bck(1)
+                return self.set_est_bck(1)
             elif value == False:
-                return self.set_has_bck(0)
+                return self.set_est_bck(0)
             else:
-                raise ValueError, "Invertor: has_bck can only be True or False"
+                raise ValueError, "Invertor: est_bck can only be True or False"
 
         return Cinvertor.__setattr__(self, name, value)
@@ -220 +220 @@
         elif name == 'slit_width':
             return self.get_slit_width()
-        elif name == 'has_bck':
-            value = self.get_has_bck()
+        elif name == 'est_bck':
+            value = self.get_est_bck()
             if value == 1:
                 return True
@@ -248 +248 @@
         invertor.y = self.y
         invertor.err = self.err
-        invertor.has_bck = self.has_bck
+        invertor.est_bck = self.est_bck
+        invertor.background = self.background
         invertor.slit_height = self.slit_height
         invertor.slit_width = self.slit_width
@@ -290 +291 @@
         """
         # Reset the background value before proceeding
-        self.background = 0.0
-        return self.lstsq(nfunc, nr=nr)
+        # self.background = 0.0
+        if not self.est_bck:
+            self.y -= self.background
+        out, cov = self.lstsq(nfunc, nr=nr)
+        if not self.est_bck:
+            self.y += self.background
+        return out, cov
 
     def iq(self, out, q):
@@ -454 +460 @@
 
         # If we need to fit the background, add a term
-        if self.has_bck == True:
+        if self.est_bck == True:
             nfunc_0 = nfunc
             nfunc += 1
@@ -500 +506 @@
 
         # Keep a copy of the last output
-        if self.has_bck == False:
-            self.background = 0
+        if self.est_bck == False:
             self.out = c
             self.cov = err
@@ -653 +658 @@
         file.write("#slit_width=%g\n" % self.slit_width)
         file.write("#background=%g\n" % self.background)
-        if self.has_bck == True:
+        if self.est_bck == True:
             file.write("#has_bck=1\n")
         else:
@@ -734 +739 @@
                         toks = line.split('=')
                         if int(toks[1]) == 1:
-                            self.has_bck = True
+                            self.est_bck = True
                         else:
-                            self.has_bck = False
+                            self.est_bck = False
 
                     # Now read in the parameters