Changeset b8080e1 in sasview for src/sas/sascalc/calculator/c_extensions/sld2i_module.c

Timestamp:

Aug 29, 2018 10:01:23 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9463ca2

Parents:

ce30949

git-author:

Piotr Rozyczko <rozyczko@…> (08/29/18 09:59:56)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/29/18 10:01:23)

Message:

cherry picking sascalc changes from master SASVIEW-996
minor unit test fixes

File:

• src/sas/sascalc/calculator/c_extensions/sld2i_module.c (modified) (5 diffs)

src/sas/sascalc/calculator/c_extensions/sld2i_module.c

@@ -35 +35 @@
 void
 del_sld2i(PyObject *obj){
+#if PY_MAJOR_VERSION < 3
+        GenI* sld2i = (GenI *)obj;
+#else
         GenI* sld2i = (GenI *)(PyCapsule_GetPointer(obj, "GenI"));
+#endif
         PyMem_Free((void *)sld2i);
 }
@@ -51 +55 @@
         PyObject *mz_val_obj;
         PyObject *vol_pix_obj;
-        Py_ssize_t n_x;
-        //PyObject rlimit_obj;
-        //PyObject npoints_obj;
-        //PyObject nrbins_obj;
-        //PyObject nphibins_obj;
-        int n_pix;
+        Py_ssize_t n_x, n_y, n_z, n_sld, n_mx, n_my, n_mz, n_vol_pix;
+        int is_avg;
         double* x_val;
         double* y_val;
@@ -68 +68 @@
         double outspin;
         double stheta;
-        GenI *sld2i;
-
-        if (!PyArg_ParseTuple(args, "iOOOOOOOOddd", &n_pix, &x_val_obj, &y_val_obj, &z_val_obj, &sldn_val_obj, &mx_val_obj, &my_val_obj, &mz_val_obj, &vol_pix_obj, &inspin, &outspin, &stheta)) return NULL;
-        OUTVECTOR(x_val_obj, x_val, n_x);
-        OUTVECTOR(y_val_obj, y_val, n_x);
-        OUTVECTOR(z_val_obj, z_val, n_x);
-        OUTVECTOR(sldn_val_obj, sldn_val, n_x);
-        OUTVECTOR(mx_val_obj, mx_val, n_x);
-        OUTVECTOR(my_val_obj, my_val, n_x);
-        OUTVECTOR(mz_val_obj, mz_val, n_x);
-        OUTVECTOR(vol_pix_obj, vol_pix, n_x);
-        sld2i =  PyMem_Malloc(sizeof(GenI));
+        PyObject *obj;
+        GenI* sld2i;
+
+        //printf("new GenI\n");
+        if (!PyArg_ParseTuple(args, "iOOOOOOOOddd", &is_avg, &x_val_obj, &y_val_obj, &z_val_obj, &sldn_val_obj, &mx_val_obj, &my_val_obj, &mz_val_obj, &vol_pix_obj, &inspin, &outspin, &stheta)) return NULL;
+        INVECTOR(x_val_obj, x_val, n_x);
+        INVECTOR(y_val_obj, y_val, n_y);
+        INVECTOR(z_val_obj, z_val, n_z);
+        INVECTOR(sldn_val_obj, sldn_val, n_sld);
+        INVECTOR(mx_val_obj, mx_val, n_mx);
+        INVECTOR(my_val_obj, my_val, n_my);
+        INVECTOR(mz_val_obj, mz_val, n_mz);
+        INVECTOR(vol_pix_obj, vol_pix, n_vol_pix);
+        sld2i = PyMem_Malloc(sizeof(GenI));
+        //printf("sldi:%p\n", sld2i);
         if (sld2i != NULL) {
-                initGenI(sld2i, n_pix,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);
+                initGenI(sld2i,is_avg,(int)n_x,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);
         }
-        return PyCapsule_New(sld2i, "GenI", del_sld2i);
+        obj = PyCapsule_New(sld2i, "GenI", del_sld2i);
+        //printf("constructed %p\n", obj);
+        return obj;
 }
 
@@ -90 +95 @@
  */
 PyObject * genicom_inputXY(PyObject *self, PyObject *args) {
-        int npoints;
+        PyObject *gen_obj;
         PyObject *qx_obj;
+        PyObject *qy_obj;
+        PyObject *I_out_obj;
+        Py_ssize_t n_qx, n_qy, n_out;
         double *qx;
-        PyObject *qy_obj;
         double *qy;
-        PyObject *I_out_obj;
-        Py_ssize_t n_out;
         double *I_out;
-        PyObject *gen_obj;
-        GenI *sld2i;
-
-        if (!PyArg_ParseTuple(args, "OiOOO",  &gen_obj, &npoints, &qx_obj, &qy_obj, &I_out_obj)) return NULL;
-        OUTVECTOR(qx_obj, qx, n_out);
-        OUTVECTOR(qy_obj, qy, n_out);
+        GenI* sld2i;
+
+        //printf("in genicom_inputXY\n");
+        if (!PyArg_ParseTuple(args, "OOOO",  &gen_obj, &qx_obj, &qy_obj, &I_out_obj)) return NULL;
+        sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
+        INVECTOR(qx_obj, qx, n_qx);
+        INVECTOR(qy_obj, qy, n_qy);
         OUTVECTOR(I_out_obj, I_out, n_out);
+        //printf("qx, qy, I_out: %d %d %d, %d %d %d\n", qx, qy, I_out, n_qx, n_qy, n_out);
 
         // Sanity check
-        //if(n_in!=n_out) return Py_BuildValue("i",-1);
-
-        // Set the array pointers
-        sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
-
-        genicomXY(sld2i, npoints, qx, qy, I_out);
+        //if(n_q!=n_out) return Py_BuildValue("i",-1);
+
+        genicomXY(sld2i, (int)n_qx, qx, qy, I_out);
+        //printf("done calc\n");
         //return PyCObject_FromVoidPtr(s, del_genicom);
         return Py_BuildValue("i",1);
@@ -121 +126 @@
  */
 PyObject * genicom_input(PyObject *self, PyObject *args) {
-        int npoints;
+        PyObject *gen_obj;
         PyObject *q_obj;
+        PyObject *I_out_obj;
+        Py_ssize_t n_q, n_out;
         double *q;
-        PyObject *I_out_obj;
-        Py_ssize_t n_out;
         double *I_out;
-        PyObject *gen_obj;
         GenI *sld2i;
 
-        if (!PyArg_ParseTuple(args, "OiOO",  &gen_obj, &npoints, &q_obj, &I_out_obj)) return NULL;
-        OUTVECTOR(q_obj, q, n_out);
+        if (!PyArg_ParseTuple(args, "OOO",  &gen_obj, &q_obj, &I_out_obj)) return NULL;
+        sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
+        INVECTOR(q_obj, q, n_q);
         OUTVECTOR(I_out_obj, I_out, n_out);
 
         // Sanity check
-        //if(n_in!=n_out) return Py_BuildValue("i",-1);
-
-        // Set the array pointers
-        sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
-
-        genicom(sld2i, npoints, q, I_out);
-        //return PyCObject_FromVoidPtr(s, del_genicom);
+        //if (n_q!=n_out) return Py_BuildValue("i",-1);
+
+        genicom(sld2i, (int)n_q, q, I_out);
         return Py_BuildValue("i",1);
 }