fix alloc arrays def

spacetelescope · Jul 20, 2021 · 64d4bfa · 64d4bfa
1 parent 5e8958e
commit 64d4bfa
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 3 deletions.
diff --git a/jwst/cube_build/src/cube_match_internal.c b/jwst/cube_build/src/cube_match_internal.c
@@ -90,11 +90,10 @@ extern double sh_find_overlap(const double xcenter, const double ycenter,
 			      double xPixelCorner[],double yPixelCorner[]);
 
 
-
 extern double find_area_quad(double MinX, double MinY, double Xcorner[], double Ycorner[]);
 
 
-extern alloc_flux_arrays(int nelem, double **fluxv, double **weightv, double **varv,  double **ifluxv);
+extern int alloc_flux_arrays(int nelem, double **fluxv, double **weightv, double **varv,  double **ifluxv);
 
 
 //_______________________________________________________________________

diff --git a/jwst/cube_build/src/cube_match_sky.c b/jwst/cube_build/src/cube_match_sky.c
@@ -103,7 +103,7 @@ extern double sh_find_overlap(const double xcenter, const double ycenter,
 		      const double xlength, const double ylength,
 			      double xPixelCorner[],double yPixelCorner[]);
 
-extern alloc_flux_arrays(int nelem, double **fluxv, double **weightv, double **varv,  double **ifluxv);
+extern int alloc_flux_arrays(int nelem, double **fluxv, double **weightv, double **varv,  double **ifluxv);
 
 
 //________________________________________________________________________________

diff --git a/jwst/cube_build/src/cube_utils.c b/jwst/cube_build/src/cube_utils.c
@@ -11,6 +11,51 @@
 #define CP_BOTTOM 2
 #define CP_TOP 3
 
+
+//_______________________________________________________________________
+// Allocate the memory to for the spaxel arrays in the cube
+//_______________________________________________________________________
+
+int alloc_flux_arrays(int nelem, double **fluxv, double **weightv, double **varv,  double **ifluxv) {
+
+    const char *msg = "Couldn't allocate memory for output arrays.";
+
+    printf(" going to allocate memory \n"); 
+    // flux:
+    if (!(*fluxv  = (double*)calloc(nelem, sizeof(double)))) {
+        PyErr_SetString(PyExc_MemoryError, msg);
+        goto failed_mem_alloc;
+    }
+
+    //weight
+    if (!(*weightv  = (double*)calloc(nelem, sizeof(double)))) {
+      PyErr_SetString(PyExc_MemoryError, msg);
+      goto failed_mem_alloc;
+    }
+
+    //variance
+    if (!(*varv  = (double*)calloc(nelem, sizeof(double)))) {
+      PyErr_SetString(PyExc_MemoryError, msg);
+      goto failed_mem_alloc;
+    }
+
+    //iflux
+    if (!(*ifluxv  = (double*)calloc(nelem, sizeof(double)))) {
+      PyErr_SetString(PyExc_MemoryError, msg);
+      goto failed_mem_alloc;
+    }
+
+    return 0;
+
+ failed_mem_alloc:
+    printf("Problem allocating \n");
+    free(*fluxv);
+    free(*weightv);
+    free(*varv);
+    free(*ifluxv);
+
+}
+
 // support function for sh_find_overlap 
 void addpoint (double x, double y, double xnew[], double ynew[], int *nVertices2){
   xnew[*nVertices2] = x;