Changeset cb62bd5 in sasview for src/sas/sascalc/pr/c_extensions

Timestamp:

Aug 4, 2017 4: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/c_extensions

Files:

• Cinvertor.c (modified) (7 diffs)
• invertor.c (modified) (2 diffs)
• invertor.h (modified) (1 diff)

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;