Changeset 36618

Timestamp:

Mar 29, 2014, 12:55:09 PM (12 years ago)

Author:

eugene

Message:

free up fits tables

Location:

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src

Files:

• ImageMagIO.c (modified) (2 diffs)
• MeanMagIO.c (modified) (2 diffs)

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/ImageMagIO.c

@@ -53 +53 @@
   fclose (f);
 
-  // a bit annoying : we read the entire block of data, then extract the columns, then set the image structure values.
-  // this means I need 3 copies in memory at some point.  ugh.
+  // we read the entire block of data, then extract the columns, then set the image structure values.
+  // I free the FITS table data after extracting the colums to avoid having 3 copies in memory.
 
   char type[16];
@@ -66 +66 @@
   GET_COLUMN (ubercalDist,       "UDIST",            int);
   GET_COLUMN (imageID,           "ID",               int);
+
+  // free the memory associated with the FITS files
+  gfits_free_header (&header);
+  gfits_free_matrix (&matrix);
+  gfits_free_header (&theader);
+  gfits_free_table (&ftable);
 
   ALLOCATE (image_mags, ImageMag, Nrow);

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/MeanMagIO.c

@@ -64 +64 @@
   GET_COLUMN (objID,     "OBJ_ID",       int);
   GET_COLUMN (catID,     "CAT_ID",       int);
+
+  // free the memory associated with the FITS files
+  gfits_free_header (&header);
+  gfits_free_matrix (&matrix);
+  gfits_free_header (&theader);
+  gfits_free_table (&ftable);
 
   ALLOCATE (meanmags, MeanMag, Nrow);
@@ -83 +89 @@
   free (catID);
 
-  // free FITS table pieces...
-
   *nmeanmags = Nrow;
   return meanmags;