Changeset f71287f4 in sasview for pr_inversion/c_extensions

Timestamp:

May 9, 2008 6:09:10 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

634f1cf

Parents:

32dffae4

Message:

Allow user to set q_min/q_max

Location:

pr_inversion/c_extensions

Files:

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

pr_inversion/c_extensions/Cinvertor.c

@@ -266 +266 @@
         return Py_BuildValue("d", self->params.d_max);  
 }
+
+/**
+ * Sets the minimum q
+ */
+static PyObject * set_qmin(Cinvertor *self, PyObject *args) {
+        double q_min;
+  
+        if (!PyArg_ParseTuple(args, "d", &q_min)) return NULL;
+        self->params.q_min = q_min;
+        return Py_BuildValue("d", self->params.q_min);  
+}
+
+/**
+ * Gets the minimum q
+ */
+static PyObject * get_qmin(Cinvertor *self, PyObject *args) {
+        return Py_BuildValue("d", self->params.q_min);  
+}
+
+
+/**
+ * Sets the maximum q
+ */
+static PyObject * set_qmax(Cinvertor *self, PyObject *args) {
+        double q_max;
+  
+        if (!PyArg_ParseTuple(args, "d", &q_max)) return NULL;
+        self->params.q_max = q_max;
+        return Py_BuildValue("d", self->params.q_max);  
+}
+
+/**
+ * Gets the maximum q
+ */
+static PyObject * get_qmax(Cinvertor *self, PyObject *args) {
+        return Py_BuildValue("d", self->params.q_max);  
+}
+
 
 static PyObject * set_alpha(Cinvertor *self, PyObject *args) {
@@ -513 +551 @@
                    {"set_dmax", (PyCFunction)set_dmax, METH_VARARGS, ""},
                    {"get_dmax", (PyCFunction)get_dmax, METH_VARARGS, ""},
+                   {"set_qmin", (PyCFunction)set_qmin, METH_VARARGS, ""},
+                   {"get_qmin", (PyCFunction)get_qmin, METH_VARARGS, ""},
+                   {"set_qmax", (PyCFunction)set_qmax, METH_VARARGS, ""},
+                   {"get_qmax", (PyCFunction)get_qmax, METH_VARARGS, ""},
                    {"set_alpha", (PyCFunction)set_alpha, METH_VARARGS, ""},
                    {"get_alpha", (PyCFunction)get_alpha, METH_VARARGS, ""},

pr_inversion/c_extensions/invertor.c

@@ -18 +18 @@
 void invertor_init(Invertor_params *pars) {
         pars->d_max = 180;
+        pars->q_min = -1.0;
+        pars->q_max = -1.0;
 }
 

pr_inversion/c_extensions/invertor.h

@@ -12 +12 @@
     int nerr;  
     double alpha;
+    double q_min;
+    double q_max;
 } Invertor_params;