Merge branch 'fix-transforms'

merge in fixes for memory link from Oscar at Continuum

Author: Joel Bernier

hexrd/transforms/transforms_CAPI.c

@@ -58,7 +58,7 @@ static PyObject * anglesToGVec(PyObject * self, PyObject * args)
 
   double *angs_ptr, *bHat_l_ptr, *eHat_l_ptr, *rMat_c_ptr;
   double *gVec_c_ptr;
-  
+
   /* Parse arguments */
   if ( !PyArg_ParseTuple(args,"OOOdO",
 			 &angs,
@@ -71,7 +71,7 @@ static PyObject * anglesToGVec(PyObject * self, PyObject * args)
   nbhat = PyArray_NDIM(bHat_l);
   nehat = PyArray_NDIM(eHat_l);
   nrmat = PyArray_NDIM(rMat_c);
-  
+
   assert( nangs==2 && nbhat==1 && nehat==1 && nrmat==2 );
 
   /* Verify dimensions of input arrays */
@@ -86,7 +86,7 @@ static PyObject * anglesToGVec(PyObject * self, PyObject * args)
   assert( da1 == 3 );
   assert( db1 == 3 && de1 == 3);
   assert( dr1 == 3 && dr2 == 3);
-    
+
   /* Allocate C-style array for return data */
   rdims[0] = nvecs; rdims[1] = 3;
   gVec_c = (PyArrayObject*)PyArray_EMPTY(2,rdims,NPY_DOUBLE,0);
@@ -103,7 +103,7 @@ static PyObject * anglesToGVec(PyObject * self, PyObject * args)
 		     bHat_l_ptr, eHat_l_ptr,
 		     chi, rMat_c_ptr,
 		     gVec_c_ptr);
-    
+
   /* Build and return the nested data structure */
   return((PyObject*)gVec_c);
 }
@@ -136,18 +136,18 @@ static PyObject * makeGVector(PyObject * self, PyObject * args)
 static PyObject * gvecToDetectorXY(PyObject * self, PyObject * args)
 {
   PyArrayObject *gVec_c,
-                *rMat_d, *rMat_s, *rMat_c,
-                *tVec_d, *tVec_s, *tVec_c,
-                *beamVec;
+		*rMat_d, *rMat_s, *rMat_c,
+		*tVec_d, *tVec_s, *tVec_c,
+		*beamVec;
   PyArrayObject *result;
 
   int dgc, drd, drs, drc, dtd, dts, dtc, dbv;
   npy_intp npts, dims[2];
 
   double *gVec_c_Ptr,
-         *rMat_d_Ptr, *rMat_s_Ptr, *rMat_c_Ptr,
-         *tVec_d_Ptr, *tVec_s_Ptr, *tVec_c_Ptr,
-         *beamVec_Ptr;
+	 *rMat_d_Ptr, *rMat_s_Ptr, *rMat_c_Ptr,
+	 *tVec_d_Ptr, *tVec_s_Ptr, *tVec_c_Ptr,
+	 *beamVec_Ptr;
   double *result_Ptr;
 
   /* Parse arguments */
@@ -256,18 +256,18 @@ static PyObject * gvecToDetectorXY(PyObject * self, PyObject * args)
 static PyObject * gvecToDetectorXYArray(PyObject * self, PyObject * args)
 {
   PyArrayObject *gVec_c,
-                *rMat_d, *rMat_s, *rMat_c,
-                *tVec_d, *tVec_s, *tVec_c, 
-                *beamVec;
+		*rMat_d, *rMat_s, *rMat_c,
+		*tVec_d, *tVec_s, *tVec_c,
+		*beamVec;
   PyArrayObject *result;
 
   int dgc, drd, drs, drc, dtd, dts, dtc, dbv;
   npy_intp npts, dims[2];
 
   double *gVec_c_Ptr,
-         *rMat_d_Ptr, *rMat_s_Ptr, *rMat_c_Ptr,
-         *tVec_d_Ptr, *tVec_s_Ptr, *tVec_c_Ptr,
-         *beamVec_Ptr;
+	 *rMat_d_Ptr, *rMat_s_Ptr, *rMat_c_Ptr,
+	 *tVec_d_Ptr, *tVec_s_Ptr, *tVec_c_Ptr,
+	 *beamVec_Ptr;
   double *result_Ptr;
 
   /* Parse arguments */
@@ -300,7 +300,7 @@ static PyObject * gvecToDetectorXYArray(PyObject * self, PyObject * args)
 
   if (npts != PyArray_DIM(rMat_s, 0)) {
     PyErr_Format(PyExc_ValueError, "gVec_c and rMat_s length mismatch %d vs %d",
-                 (int)PyArray_DIM(gVec_c, 0), (int)PyArray_DIM(rMat_s, 0));
+		 (int)PyArray_DIM(gVec_c, 0), (int)PyArray_DIM(rMat_s, 0));
     return NULL;
   }
   assert( PyArray_DIMS(gVec_c)[1]  == 3 );
@@ -386,15 +386,16 @@ static PyObject * detectorXYToGvec(PyObject * self, PyObject * args)
 {
   PyArrayObject *xy_det, *rMat_d, *rMat_s,
 		*tVec_d, *tVec_s, *tVec_c,
-                *beamVec, *etaVec;
+		*beamVec, *etaVec;
   PyArrayObject *tTh, *eta, *gVec_l;
+  PyObject *inner_tuple, *outer_tuple;
 
   int dxy, drd, drs, dtd, dts, dtc, dbv, dev;
   npy_intp npts, dims[2];
 
   double *xy_Ptr, *rMat_d_Ptr, *rMat_s_Ptr,
-         *tVec_d_Ptr, *tVec_s_Ptr, *tVec_c_Ptr,
-         *beamVec_Ptr, *etaVec_Ptr;
+	 *tVec_d_Ptr, *tVec_s_Ptr, *tVec_c_Ptr,
+	 *beamVec_Ptr, *etaVec_Ptr;
   double *tTh_Ptr, *eta_Ptr, *gVec_l_Ptr;
 
   /* Parse arguments */
@@ -464,22 +465,30 @@ static PyObject * detectorXYToGvec(PyObject * self, PyObject * args)
 			 tTh_Ptr, eta_Ptr, gVec_l_Ptr);
 
   /* Build and return the nested data structure */
-  return(Py_BuildValue("OO",Py_BuildValue("OO",tTh,eta),gVec_l));
+  /* Note that Py_BuildValue with 'O' increases reference count */
+  inner_tuple = Py_BuildValue("OO",tTh,eta);
+  outer_tuple = Py_BuildValue("OO", inner_tuple, gVec_l);
+  Py_DECREF(inner_tuple);
+  Py_DECREF(tTh);
+  Py_DECREF(eta);
+  Py_DECREF(gVec_l);
+  return outer_tuple;
 }
 
 static PyObject * oscillAnglesOfHKLs(PyObject * self, PyObject * args)
 {
   PyArrayObject *hkls, *rMat_c, *bMat,
-                *vInv_s, *beamVec, *etaVec;
+		*vInv_s, *beamVec, *etaVec;
   PyFloatObject *chi, *wavelength;
   PyArrayObject *oangs0, *oangs1;
+  PyObject *return_tuple;
 
   int dhkls, drc, dbm, dvi, dbv, dev;
   npy_intp npts, dims[2];
 
   double *hkls_Ptr, chi_d,
-         *rMat_c_Ptr, *bMat_Ptr, wavelen_d,
-         *vInv_s_Ptr, *beamVec_Ptr, *etaVec_Ptr;
+	 *rMat_c_Ptr, *bMat_Ptr, wavelen_d,
+	 *vInv_s_Ptr, *beamVec_Ptr, *etaVec_Ptr;
   double *oangs0_Ptr, *oangs1_Ptr;
 
   /* Parse arguments */
@@ -542,10 +551,14 @@ static PyObject * oscillAnglesOfHKLs(PyObject * self, PyObject * args)
   // printf("chi = %g, wavelength = %g\n",PyFloat_AsDouble((PyObject*)chi),PyFloat_AsDouble((PyObject*)wavelength));
   /*
 np.ascontiguousarray(hkls),chi,rMat_c,bMat,wavelength,
-                                               beamVec.flatten(),etaVec.flatten()
+					       beamVec.flatten(),etaVec.flatten()
   */
   /* Build and return the list data structure */
-  return(Py_BuildValue("OO",oangs0,oangs1));
+  return_tuple = Py_BuildValue("OO",oangs0,oangs1);
+  Py_DECREF(oangs1);
+  Py_DECREF(oangs0);
+
+  return return_tuple;
 }
 
 /******************************************************************************/