Changeset 9624cda in sasview for sansmodels/src/c_gen/sld2i_module.cpp

Timestamp:

Mar 13, 2013 9:10:51 AM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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:

49a8843

Parents:

5f248f6

Message:

fixed debye averging in gensans

File:

• sansmodels/src/c_gen/sld2i_module.cpp (modified) (3 diffs)

sansmodels/src/c_gen/sld2i_module.cpp

@@ -75 +75 @@
 
 /**
- * GenI the given input according to a given object
+ * GenI the given input (2D) according to a given object
  */
-PyObject * genicom_input(PyObject *, PyObject *args) {
+PyObject * genicom_inputXY(PyObject *, PyObject *args) {
         int npoints;
         PyObject *qx_obj;
@@ -100 +100 @@
         GenI* s = static_cast<GenI *>(temp);
 
-        s->genicom(npoints, qx, qy, I_out);
+        s->genicomXY(npoints, qx, qy, I_out);
         //return PyCObject_FromVoidPtr(s, del_genicom);
         return Py_BuildValue("i",1);
 }
 
+/**
+ * GenI the given 1D input according to a given object
+ */
+PyObject * genicom_input(PyObject *, PyObject *args) {
+        int npoints;
+        PyObject *q_obj;
+        double *q;
+        PyObject *I_out_obj;
+        Py_ssize_t n_out;
+        double *I_out;
+        PyObject *gen_obj;
+
+        if (!PyArg_ParseTuple(args, "OiOO",  &gen_obj, &npoints, &q_obj, &I_out_obj)) return NULL;
+        OUTVECTOR(q_obj, q, n_out);
+        OUTVECTOR(I_out_obj, I_out, n_out);
+
+        // Sanity check
+        //if(n_in!=n_out) return Py_BuildValue("i",-1);
+
+        // Set the array pointers
+        void *temp = PyCObject_AsVoidPtr(gen_obj);
+        GenI* s = static_cast<GenI *>(temp);
+
+        s->genicom(npoints, q, I_out);
+        //return PyCObject_FromVoidPtr(s, del_genicom);
+        return Py_BuildValue("i",1);
+}
 
 /**
@@ -113 +140 @@
                   "Create a new GenI object"},
         {"genicom",(PyCFunction)genicom_input, METH_VARARGS,
-                  "genicom the given input arrays"},
+                  "genicom the given 1d input arrays"},
+        {"genicomXY",(PyCFunction)genicom_inputXY, METH_VARARGS,
+                  "genicomXY the given 2d input arrays"},
     {NULL}
 };