Changeset 39314

Timestamp:

Jan 13, 2016, 4:36:59 PM (11 years ago)

Author:

eugene

Message:

option to restrict dvomerge to specific cptfiles

Location:

trunk/Ohana/src/dvomerge

Files:

• include/dvomerge.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/cptlist.c (modified) (1 diff)
• src/dvomergeUpdate_catalogs.c (modified) (2 diffs)
• src/dvomerge_client.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/include/dvomerge.h

@@ -128 +128 @@
 void       dvomerge_client_help   PROTO((int argc, char **argv));
 int        dvomerge_client_args   PROTO((int *argc, char **argv));
+void       dvomerge_client_args_free PROTO((void));
 
 void       dvoconvert_usage       PROTO((void));

trunk/Ohana/src/dvomerge/src/args.c

@@ -190 +190 @@
   FREE (UPDATE_CATCOMPRESS);
   FREE (SINGLE_CPT);
+  FREE (CPTLIST_FILENAME);
+
+  int i;
+  for (i = 0; i < NCPTLIST; i++) {
+    FREE (CPTLIST[i]);
+  }
+  FREE (CPTLIST);
 }
 
@@ -339 +346 @@
   if ((*argc < 4) || (*argc > 6)) dvomerge_client_usage();
   return TRUE;
+}
+
+void dvomerge_client_args_free (void) {
+  FREE (HOSTDIR);
+  FREE (UPDATE_CATFORMAT);
+  FREE (UPDATE_CATCOMPRESS);
+  FREE (CPTLIST_FILENAME);
+
+  int i;
+  for (i = 0; i < NCPTLIST; i++) {
+    FREE (CPTLIST[i]);
+  }
+  FREE (CPTLIST);
 }
 

trunk/Ohana/src/dvomerge/src/cptlist.c

@@ -29 +29 @@
   }      
   *nlist = i;
+
+  for (i = *nlist; i < NLIST; i ++) {
+    FREE(list[i]);
+  }
+
   fclose(listfile);
 

trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -65 +65 @@
     // compare to a slightly reduced footprint
     float dPos = 2.0/3600.0;
-    outlist = SkyListByBounds (outsky, -1, inlist[0].regions[i][0].Rmin + dPos, inlist[0].regions[i][0].Rmax - dPos, inlist[0].regions[i][0].Dmin + dPos, inlist[0].regions[i][0].Dmax - dPos);
+    outlist = SkyListByBounds (outlist, -1, inlist[0].regions[i][0].Rmin + dPos, inlist[0].regions[i][0].Rmax - dPos, inlist[0].regions[i][0].Dmin + dPos, inlist[0].regions[i][0].Dmax - dPos);
 # endif
 
@@ -81 +81 @@
     }
     
-    // XXX validate MATCHED_TABLES
-    myAssert (outlist->Nregions == inlist->Nregions, "oops");
-
     OutputStatus *outstat = OutputStatusInit (outlist->Nregions);
 

trunk/Ohana/src/dvomerge/src/dvomerge_client.c

@@ -93 +93 @@
   dvomergeUpdate_catalogs (input, output, inlist, outsky, NsecfiltInput, NsecfiltOutput, IDmap, secfiltMap);
 
+  dvomerge_client_args_free ();
+  ohana_memcheck (TRUE);
+  ohana_memdump (TRUE);
+
   exit (0);
 }