Changeset 7e82256 in sasview for src/sas/sascalc/calculator/c_extensions/sld2i_module.c
- Timestamp:
- Nov 13, 2017 11:51:56 AM (6 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 95d7c4f
- Parents:
- f926abb
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/calculator/c_extensions/sld2i_module.c
r54b0650 r7e82256 4 4 #include <Python.h> 5 5 #include <stdio.h> 6 #include <sld2i.h>6 #include "sld2i.h" 7 7 8 8 #if PY_MAJOR_VERSION < 3 … … 68 68 double outspin; 69 69 double stheta; 70 PyObject *obj; 71 GenI* sld2i; 70 72 71 73 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; … … 78 80 INVECTOR(mz_val_obj, mz_val, n_mz); 79 81 INVECTOR(vol_pix_obj, vol_pix, n_vol_pix); 80 GenI*sld2i = PyMem_Malloc(sizeof(GenI));82 sld2i = PyMem_Malloc(sizeof(GenI)); 81 83 //printf("sldi:%p\n", sld2i); 82 84 if (sld2i != NULL) { 83 initGenI(sld2i,is_avg, n_x,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);85 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); 84 86 } 85 PyObject *obj = PyCapsule_New(sld2i, "GenI", del_sld2i);87 obj = PyCapsule_New(sld2i, "GenI", del_sld2i); 86 88 //printf("constructed %p\n", obj); 87 89 return obj; … … 100 102 double *qy; 101 103 double *I_out; 104 GenI* sld2i; 102 105 103 106 if (!PyArg_ParseTuple(args, "OOOO", &gen_obj, &qx_obj, &qy_obj, &I_out_obj)) return NULL; 104 GenI*sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");107 sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI"); 105 108 INVECTOR(qx_obj, qx, n_qx); 106 109 INVECTOR(qy_obj, qy, n_qy); … … 110 113 //if(n_q!=n_out) return Py_BuildValue("i",-1); 111 114 112 genicomXY(sld2i, n_qx, qx, qy, I_out);115 genicomXY(sld2i, (int)n_qx, qx, qy, I_out); 113 116 //return PyCObject_FromVoidPtr(s, del_genicom); 114 117 return Py_BuildValue("i",1); … … 125 128 double *q; 126 129 double *I_out; 130 GenI *sld2i; 127 131 128 132 if (!PyArg_ParseTuple(args, "OOO", &gen_obj, &q_obj, &I_out_obj)) return NULL; 129 GenI *sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");133 sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI"); 130 134 INVECTOR(q_obj, q, n_q); 131 135 OUTVECTOR(I_out_obj, I_out, n_out); … … 134 138 //if (n_q!=n_out) return Py_BuildValue("i",-1); 135 139 136 genicom(sld2i, n_q, q, I_out);140 genicom(sld2i, (int)n_q, q, I_out); 137 141 return Py_BuildValue("i",1); 138 142 }
Note: See TracChangeset
for help on using the changeset viewer.