Changeset 38471 for trunk/Ohana/src/dvomerge

Timestamp:

Jun 14, 2015, 10:12:31 AM (11 years ago)

Author:

eugene

Message:

make sure the full catalog structure is initialized before calling dvo_catalog_open

Location:

trunk/Ohana/src/dvomerge/src

Files:

• LoadCatalog.c (modified) (1 diff)
• dvosecfilt_catalogs.c (modified) (1 diff)
• dvoverify_utils.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/LoadCatalog.c

@@ -3 +3 @@
 int LoadCatalog (Catalog *catalog, SkyRegion *region, char *filename, char *mode, int Nsecfilt) {
 
-    // set the parameters which guide catalog open/load/create
-    catalog[0].filename  = filename;
-    catalog[0].Nsecfilt  = Nsecfilt;
+  // set the parameters which guide catalog open/load/create
+  dvo_catalog_init (catalog, TRUE);
+  catalog[0].filename  = filename;
+  catalog[0].Nsecfilt  = Nsecfilt;
 
-    // always load all of the data (if any exists)
-    catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR | DVO_LOAD_GALPHOT;
-
-    catalog[0].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
-    catalog[0].catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-
-    if (!dvo_catalog_open (catalog, region, VERBOSE, mode)) {
-        fprintf (stderr, "ERROR: failure to open catalog file %s\n", filename);
-        exit (2);
-    }
-    return (TRUE);
+  // always load all of the data (if any exists)
+  catalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR | DVO_LOAD_GALPHOT;
+  
+  catalog[0].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
+  catalog[0].catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
+  
+  if (!dvo_catalog_open (catalog, region, VERBOSE, mode)) {
+    fprintf (stderr, "ERROR: failure to open catalog file %s\n", filename);
+    exit (2);
+  }
+  return (TRUE);
 }

trunk/Ohana/src/dvomerge/src/dvosecfilt_catalogs.c

@@ -35 +35 @@
     char hostfile[1024];
     snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist->regions[i]->name);
+
+    dvo_catalog_init (&catalog, TRUE);
     catalog.filename  = HOST_ID ? hostfile : skylist->filename[i];
 

trunk/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -175 +175 @@
 
   // set the parameters which guide catalog open/load/create
+    dvo_catalog_init (&catalog, TRUE);
   catalog.filename  = filename;
-  catalog.catformat = DVO_FORMAT_UNDEF; // read-only,do not set the catformat
-  catalog.catmode   = DVO_MODE_UNDEF; // read-only, do not set the catmode
   catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ;
   catalog.Nsecfilt  = 0;