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

Timestamp:

May 29, 2018 6:45:04 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_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

eca7c6f

Parents:

9a7c81c

Message:

Cherrypicked (from master) commits for C++ → C conversion in the SLD calculator.

File:

• src/sas/sascalc/calculator/c_extensions/sld2i_module.c (moved) (moved from src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp) (8 diffs, 1 prop)

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

@@ -4 +4 @@
 #include <Python.h>
 #include <stdio.h>
-#include <sld2i.hh>
+#include <sld2i.h>
 
 #if PY_MAJOR_VERSION < 3
@@ -35 +35 @@
 void
 del_sld2i(PyObject *obj){
-        GenI* sld2i = static_cast<GenI *>(PyCapsule_GetPointer(obj, "GenI"));
-        delete sld2i;
-        return;
+        GenI* sld2i = (GenI *)(PyCapsule_GetPointer(obj, "GenI"));
+        PyMem_Free((void *)sld2i);
 }
 
@@ -43 +42 @@
  * Create a GenI as a python object by supplying arrays
  */
-PyObject * new_GenI(PyObject *, PyObject *args) {
+PyObject * new_GenI(PyObject *self, PyObject *args) {
         PyObject *x_val_obj;
         PyObject *y_val_obj;
@@ -79 +78 @@
         OUTVECTOR(mz_val_obj, mz_val, n_x);
         OUTVECTOR(vol_pix_obj, vol_pix, n_x);
-        GenI* sld2i = new GenI(n_pix,x_val,y_val,z_val,sldn_val,mx_val,my_val,mz_val,vol_pix,inspin,outspin,stheta);
+        GenI* sld2i =  PyMem_Malloc(sizeof(GenI));
+        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);
+        }
         return PyCapsule_New(sld2i, "GenI", del_sld2i);
 }
@@ -86 +88 @@
  * GenI the given input (2D) according to a given object
  */
-PyObject * genicom_inputXY(PyObject *, PyObject *args) {
+PyObject * genicom_inputXY(PyObject *self, PyObject *args) {
         int npoints;
         PyObject *qx_obj;
@@ -106 +108 @@
 
         // Set the array pointers
-        void *temp = PyCapsule_GetPointer(gen_obj, "GenI");
-        GenI* s = static_cast<GenI *>(temp);
-
-        s->genicomXY(npoints, qx, qy, I_out);
+        GenI* sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
+
+        genicomXY(sld2i, npoints, qx, qy, I_out);
         //return PyCObject_FromVoidPtr(s, del_genicom);
         return Py_BuildValue("i",1);
@@ -117 +118 @@
  * GenI the given 1D input according to a given object
  */
-PyObject * genicom_input(PyObject *, PyObject *args) {
+PyObject * genicom_input(PyObject *self, PyObject *args) {
         int npoints;
         PyObject *q_obj;
@@ -134 +135 @@
 
         // Set the array pointers
-        void *temp = PyCapsule_GetPointer(gen_obj, "GenI");
-        GenI* s = static_cast<GenI *>(temp);
-
-        s->genicom(npoints, q, I_out);
+        GenI *sld2i = (GenI *)PyCapsule_GetPointer(gen_obj, "GenI");
+
+        genicom(sld2i, npoints, q, I_out);
         //return PyCObject_FromVoidPtr(s, del_genicom);
         return Py_BuildValue("i",1);