Changeset 39480 for trunk

Timestamp:

Mar 24, 2016, 9:58:44 AM (10 years ago)

Author:

eugene

Message:

add free functions to boundary & tessellation trees

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (2 diffs)
• src/BoundaryTree.c (modified) (1 diff)
• src/TessellationTable.c (modified) (2 diffs)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -1144 +1144 @@
 BoundaryTree *BoundaryTreeLoad(char *filename);
 BoundaryTree *BoundaryTreeRead(Header *headerPHU, Header *headerZone, FILE *f);
+void BoundaryTreeFree(BoundaryTree *tree);
 
 int BoundaryTreeSave(char *filename, BoundaryTree *tree);
@@ -1155 +1156 @@
 int TessellationPrimaryCellIDs (TessellationTable *tess, int Ntess, int *tessID, int *projID, int *skycellID, double ra, double dec);
 void TessellationTableInit (TessellationTable *tess, int Ntess);
+void TessellationTableFree (TessellationTable *tess, int Ntess);
 
 float dvoOffsetR (Measure *measure, Average *average);

trunk/Ohana/src/libdvo/src/BoundaryTree.c

@@ -10 +10 @@
 
 # define DEBUG 0
+
+void BoundaryTreeFree(BoundaryTree *tree) {
+
+  if (!tree) return;
+
+  for (int i = 0; i < tree->Nzone; i++) {
+    for (int j = 0; j < tree->Nband[i]; j++) {
+      FREE (tree->name[i][j]);
+    }
+    FREE (tree->ra[i]);
+    FREE (tree->dec[i]);
+    FREE (tree->Xo[i]);
+    FREE (tree->Yo[i]);
+    FREE (tree->dX[i]);
+    FREE (tree->dY[i]);
+    FREE (tree->cell[i]);
+    FREE (tree->projID[i]);
+    FREE (tree->name[i]);
+  }
+
+  FREE (tree->ra);
+  FREE (tree->dec);
+  FREE (tree->Xo);
+  FREE (tree->Yo);
+  FREE (tree->dX);
+  FREE (tree->dY);
+  FREE (tree->cell);
+  FREE (tree->projID);
+  FREE (tree->name);
+
+  FREE (tree->Nband);
+  FREE (tree->RA_origin);
+  FREE (tree->RA_offset);
+  FREE (tree->DEC_min);
+  FREE (tree->DEC_max);
+  FREE (tree->DEC_min_raw);
+  FREE (tree->DEC_max_raw);
+
+  return;
+}
 
 BoundaryTree *BoundaryTreeLoad(char *filename) {

trunk/Ohana/src/libdvo/src/TessellationTable.c

@@ -44 +44 @@
   }
   return;
+}
+
+void TessellationTableFree (TessellationTable *tess, int Ntess) {
+  if (!tess) return;
+
+  for (int i = 0; i < Ntess; i++) {
+    FREE (tess[i].basename);
+    BoundaryTreeFree(tess[i].tree);
+    FREE (tess[i].tree);
+  }
 }
 
@@ -184 +194 @@
   free(PROJECT_ID_OFF);
   free(SKYCELL_ID_OFF);
+
+  free(BASENAME);
 
   gfits_free_header (&theader);