Changeset f168d02 in sasview for pr_inversion/c_extensions/Cinvertor.c

Timestamp:

Jul 1, 2008 2:56:32 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:

2a92852

Parents:

a17ffdf

Message:

Added slit smearing (still slow)

File:

• pr_inversion/c_extensions/Cinvertor.c (modified) (3 diffs)

pr_inversion/c_extensions/Cinvertor.c

@@ -624 +624 @@
 
         iq_value = iq(pars, self->params.d_max, npars, q);
+        return Py_BuildValue("f", iq_value);
+}
+
+const char get_iq_smeared_doc[] =
+        "Function to call to evaluate the scattering intensity.\n"
+        "The scattering intensity is slit-smeared."
+        " @param args: c-parameters, and q\n"
+        " @return: I(q)";
+
+/**
+ * Function to call to evaluate the scattering intensity
+ * The scattering intensity is slit-smeared.
+ * @param args: c-parameters, and q
+ * @return: I(q)
+ */
+static PyObject * get_iq_smeared(Cinvertor *self, PyObject *args) {
+        double *pars;
+        double q, iq_value;
+        PyObject *data_obj;
+        Py_ssize_t npars;
+
+        if (!PyArg_ParseTuple(args, "Od", &data_obj, &q)) return NULL;
+        OUTVECTOR(data_obj,pars,npars);
+
+        iq_value = iq_smeared(pars, self->params.d_max, npars,
+                                                        self->params.slit_height, self->params.slit_width,
+                                                        q, 21);
         return Py_BuildValue("f", iq_value);
 }
@@ -875 +902 @@
                     a[i*nfunc+j] = 1.0/self->params.err[i];
                 } else {
-                        a[i*nfunc+j] = ortho_transformed(self->params.d_max, j+offset, self->params.x[i])/self->params.err[i];
+                        if (self->params.slit_width>0 || self->params.slit_height>0) {
+                                a[i*nfunc+j] = ortho_transformed_smeared(self->params.d_max,
+                                                j+offset, self->params.slit_height, self->params.slit_width,
+                                                self->params.x[i], 21)/self->params.err[i];
+                        } else {
+                                a[i*nfunc+j] = ortho_transformed(self->params.d_max, j+offset, self->params.x[i])/self->params.err[i];
+                        }
                 }
             }
@@ -1009 +1042 @@
                    {"get_nerr", (PyCFunction)get_nerr, METH_VARARGS, get_nerr_doc},
                    {"iq", (PyCFunction)get_iq, METH_VARARGS, get_iq_doc},
+                   {"iq_smeared", (PyCFunction)get_iq_smeared, METH_VARARGS, get_iq_smeared_doc},
                    {"pr", (PyCFunction)get_pr, METH_VARARGS, get_pr_doc},
                    {"get_pr_err", (PyCFunction)get_pr_err, METH_VARARGS, get_pr_err_doc},