Index: trunk/Ohana/src/libdvo/src/dvo_catalog.c
===================================================================
--- trunk/Ohana/src/libdvo/src/dvo_catalog.c	(revision 15746)
+++ trunk/Ohana/src/libdvo/src/dvo_catalog.c	(revision 15747)
@@ -251,7 +251,4 @@
   if (Naxis == 2) catalog[0].catmode = DVO_MODE_RAW;
   /* don't use Naxis == 2 and split mode! */
-
-  // catformat determined in dvo_catalog_load_XXX function
-  catalog[0].catformat = DVO_FORMAT_UNDEF;
 
   switch (catalog[0].catmode) {
@@ -363,4 +360,9 @@
 
 void dvo_catalog_free (Catalog *catalog) {
+  dvo_catalog_free_data (catalog);
+  gfits_free_header (&catalog[0].header);
+}
+
+void dvo_catalog_free_data (Catalog *catalog) {
 
   /* free, initialize data structures */
@@ -382,9 +384,7 @@
   if (catalog[0].secfilt != NULL) {
     free (catalog[0].secfilt); 
-    catalog[0].Nsecfilt = 0;
+    catalog[0].Nsecf_mem = 0;
     catalog[0].secfilt = NULL;
   }
-  gfits_free_header (&catalog[0].header);
-  // free (catalog[0].filename);
 }
 
@@ -400,7 +400,4 @@
   char measure[80];
 
-  // catformat determined in dvo_catalog_load_XXX function
-  catalog[0].catformat = DVO_FORMAT_UNDEF;
-
   switch (catalog[0].catmode) {
     case DVO_MODE_RAW: