Changeset 38471 for trunk/Ohana/src/relphot

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/relphot/src

Files:

• load_catalogs.c (modified) (1 diff)
• reload_catalogs.c (modified) (2 diffs)
• relphot_objects.c (modified) (1 diff)
• relphot_synthphot.c (modified) (1 diff)
• setMrelCatalog.c (modified) (1 diff)

trunk/Ohana/src/relphot/src/load_catalogs.c

@@ -42 +42 @@
     char hostfile[1024];
     snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
+    dvo_catalog_init (&tcatalog, TRUE);
     tcatalog.filename    = hostID ? hostfile : skylist[0].filename[i];
     tcatalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;    // don't need to load all data at this point
     tcatalog.Nsecfilt    = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
-
-    // tcatalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
-    // tcatalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    // tcatalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
 
     if (!dvo_catalog_open (&tcatalog, skylist[0].regions[i], VERBOSE2, "r")) {

trunk/Ohana/src/relphot/src/reload_catalogs.c

@@ -49 +49 @@
     char hostfile[1024];
     snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
+
+    dvo_catalog_init (&catalog, TRUE);
     catalog.filename = hostID ? hostfile : skylist[0].filename[i];
 
@@ -59 +61 @@
     TIMESTAMP(time1);
 
-    // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
-    // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
     catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     catalog.Nsecfilt    = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog

trunk/Ohana/src/relphot/src/relphot_objects.c

@@ -42 +42 @@
     char hostfile[1024];
     snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
+
+    dvo_catalog_init (&catalog, TRUE);
     catalog.filename    = hostID ? hostfile : skylist[0].filename[i];
-    // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
-    // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
     catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     catalog.Nsecfilt    = GetPhotcodeNsecfilt ();

trunk/Ohana/src/relphot/src/relphot_synthphot.c

@@ -41 +41 @@
     char hostfile[1024];
     snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
+
+    dvo_catalog_init (&catalog, TRUE);
     catalog.filename    = hostID ? hostfile : skylist[0].filename[i];
-    // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
-    // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
-    // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
     catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     catalog.Nsecfilt    = GetPhotcodeNsecfilt ();

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -128 +128 @@
 
     // these bits should not be set unless we use them in this pass
-    measure[k].dbFlags &= ~(ID_MEAS_PHOTOM_PSF | ID_MEAS_PHOTOM_APER | ID_MEAS_PHOTOM_KRON);
+    // (note that we can only un-set them in the final pass when we actually have measure, not just measureT
+    if (measure) measure[k].dbFlags &= ~(ID_MEAS_PHOTOM_PSF | ID_MEAS_PHOTOM_APER | ID_MEAS_PHOTOM_KRON);
 
     // skip measurements that do not have a valid photcode (raise exception?)