Changeset 38588

Timestamp:

Jul 15, 2015, 10:44:35 AM (11 years ago)

Author:

eugene

Message:

fix typo in EXPNAME_AS_INT; fix segfault in TaskOps.c; set cvec correctly; fix typos in dvo table fits fields; watch out for compression in delete images; skip galphot in dvomerge (why is this needed?); inherit compression and format from output file if it exists; use strextend; add -update-catcompress to dvomerge_client command

Location:

branches/eam_branches/ipp-20150625/Ohana/src

Files:

• dvomerge/src/LoadCatalog.c (modified) (1 diff)
• dvomerge/src/dvomergeUpdate_catalogs.c (modified) (2 diffs)
• dvomerge/src/dvorepairDeleteImagesByExternID.c (modified) (2 diffs)
• libautocode/def/average-ps1-v5.d (modified) (4 diffs)
• libautocode/def/measure-ps1-v5.d (modified) (1 diff)
• libautocode/def/secfilt-ps1-v5.d (modified) (1 diff)
• libdvo/src/dbExtractImages.c (modified) (1 diff)
• opihi (modified) (1 prop)
• opihi/cmd.data/uniq.c (modified) (1 diff)
• opihi/pantasks/TaskOps.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/LoadCatalog.c

@@ -9 +9 @@
 
   // 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;
+  // XXXX TEMP HACK : skip GALPHOT
+  // XXXX 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].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING | DVO_LOAD_LENSOBJ | DVO_LOAD_STARPAR;
   
   catalog[0].catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -177 +177 @@
       LoadCatalog (&outcatalog, outlist[0].regions[j], outcatalog.filename, "w", NsecfiltOutput);
 
-      // if no catalog already exists, use the input catalog to define the format or the specified format
       if (UPDATE_CATFORMAT) {
         outcatalog.catformat = dvo_catalog_catformat (UPDATE_CATFORMAT);
       } else {
-        outcatalog.catformat = incatalog.catformat;
-      }
+        // IF no catalog already exists, use the input catalog to define the format
+        if (outcatalog.Naverage_disk == 0) {
+          outcatalog.catformat = incatalog.catformat;
+        }
+      }
+
       if (UPDATE_CATCOMPRESS) {
         outcatalog.catcompress = dvo_catalog_catcompress (UPDATE_CATCOMPRESS);
       } else {
-        outcatalog.catcompress = incatalog.catcompress;
+        // IF no catalog already exists, use the input catalog to define the compression
+        if (outcatalog.Naverage_disk == 0) {
+          outcatalog.catcompress = incatalog.catcompress;
+        }
       }
 
@@ -282 +288 @@
 
     // options / arguments that can affect relastro_client -update-objects:
-    char command[DVO_MAX_PATH];
-    snprintf (command, DVO_MAX_PATH, "dvomerge_client %s into %s -hostID %d -hostdir %s -region %f %f %f %f -D ADDSTAR_RADIUS %f", 
-              absinput, absoutput, group->hosts[i][0].hostID, group->hosts[i][0].pathname, 
-              UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, RADIUS
-      );
-
-    char tmpline[DVO_MAX_PATH];
-    if (VERBOSE)             { snprintf (tmpline, DVO_MAX_PATH, "%s -v",                command); strcpy (command, tmpline); }
-    if (VERIFY)              { snprintf (tmpline, DVO_MAX_PATH, "%s -verify",           command); strcpy (command, tmpline); }
-    if (VERIFY_CATALOG_ONLY) { snprintf (tmpline, DVO_MAX_PATH, "%s -verify-catalogs",  command); strcpy (command, tmpline); }
-    if (REPLACE_BY_PHOTCODE) { snprintf (tmpline, DVO_MAX_PATH, "%s -replace",          command); strcpy (command, tmpline); }
-    if (REPLACE_TYCHO)       { snprintf (tmpline, DVO_MAX_PATH, "%s -replace-tycho",    command); strcpy (command, tmpline); }
-    if (PARALLEL_INPUT)      { snprintf (tmpline, DVO_MAX_PATH, "%s -parallel-input",   command); strcpy (command, tmpline); }
-    if (FORCE_MERGE)         { snprintf (tmpline, DVO_MAX_PATH, "%s -force-merge",      command); strcpy (command, tmpline); }
-    if (MATCHED_TABLES)      { snprintf (tmpline, DVO_MAX_PATH, "%s -matched-tables",   command); strcpy (command, tmpline); }
-    if (UPDATE_CATFORMAT)    { snprintf (tmpline, DVO_MAX_PATH, "%s -update-catformat %s", command, UPDATE_CATFORMAT); strcpy (command, tmpline); }
+    char *command = NULL;
+    strextend (&command, "dvomerge_client %s into %s -hostID %d -hostdir %s -region %f %f %f %f -D ADDSTAR_RADIUS %f", 
+               absinput, absoutput, group->hosts[i][0].hostID, group->hosts[i][0].pathname, 
+               UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, RADIUS);
+
+    if (VERBOSE)             { strextend (&command, "-v"); }
+    if (VERIFY)              { strextend (&command, "-verify"); }
+    if (VERIFY_CATALOG_ONLY) { strextend (&command, "-verify-catalogs"); }
+    if (REPLACE_BY_PHOTCODE) { strextend (&command, "-replace"); }
+    if (REPLACE_TYCHO)       { strextend (&command, "-replace-tycho"); }
+    if (PARALLEL_INPUT)      { strextend (&command, "-parallel-input"); }
+    if (FORCE_MERGE)         { strextend (&command, "-force-merge"); }
+    if (MATCHED_TABLES)      { strextend (&command, "-matched-tables"); }
+    if (UPDATE_CATFORMAT)    { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
+    if (UPDATE_CATCOMPRESS)  { strextend (&command, "-update-catcompress %s", UPDATE_CATCOMPRESS); }
 
     // add some config variables:
-    snprintf (tmpline, DVO_MAX_PATH, "%s -D CATMODE %s",    command, CATMODE);   strcpy (command, tmpline);
-    snprintf (tmpline, DVO_MAX_PATH, "%s -D CATFORMAT %s",  command, CATFORMAT); strcpy (command, tmpline);
-    snprintf (tmpline, DVO_MAX_PATH, "%s -D SKY_DEPTH %d",  command, SKY_DEPTH); strcpy (command, tmpline);
+    strextend (&command, "-D CATMODE %s", CATMODE);
+    strextend (&command, "-D CATFORMAT %s", CATFORMAT); 
+    strextend (&command, "-D SKY_DEPTH %d", SKY_DEPTH);
 
     fprintf (stderr, "command: %s\n", command);

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvorepairDeleteImagesByExternID.c

@@ -279 +279 @@
         gfits_scan(&cpmHeaderTBL, "NAXIS1", "%d", 1, &NbytesPerRow);
 
-        myAbort ("fix compression");
+        char compressMode[256];
+        if (gfits_scan (&cpmHeaderTBL, "DVO_CMP", "%s", 1, compressMode)) {
+          if (strcmp (compressMode, "NONE")) {
+            myAbort ("fix compression");
+          }
+        }
 
         // this function can only handle PS1_V5 and later formats
@@ -661 +666 @@
   gfits_scan (&cptHeaderPHU, "NSECFILT",     "%d",      1,  &Nsecfilt);
 
-  myAbort ("test for compression");
+  if (0) {
+    char compressMode[256];
+    if (gfits_scan (&cptHeaderTBL, "DVO_CMP", "%s", 1, compressMode)) {
+      if (strcmp (compressMode, "NONE")) {
+        myAbort ("fix compression");
+      }
+    }
+  }
 
   /* convert internal to external format */

branches/eam_branches/ipp-20150625/Ohana/src/libautocode/def/average-ps1-v5.d

@@ -26 +26 @@
 FIELD ChiSqAve,       CHISQ_POS,   float,           astrometry analysis chisq
 FIELD ChiSqPM,        CHISQ_PM,    float,           astrometry analysis chisq
-FIELD ChiSqPar,       CHISQ_PAP,   float,           astrometry analysis chisq
+FIELD ChiSqPar,       CHISQ_PLX,   float,           astrometry analysis chisq
 FIELD Tmean,          MEAN_EPOCH,  int,             mean epoch (PM,PAR ref),       unix time seconds
 FIELD Trange,         TIME_RANGE,  int,             mean epoch (PM,PAR ref),       unix time seconds
@@ -41 +41 @@
 FIELD Nlensing,       NLENSING,    unsigned short,  number of lensing measurements
 FIELD Nlensobj,       NLENSOBJ,    unsigned short,  number of lensing measurements
-FIELD Ngalphot,      NGALPHOT,   unsigned short,  number of galphot measurements
+FIELD Ngalphot,       NGALPHOT,    unsigned short,  number of galphot measurements
 
 FIELD measureOffset,  OFF_MEASURE,  int,            offset to first psf measurement
@@ -48 +48 @@
 FIELD lensobjOffset,  OFF_LENSOBJ,  int,            offset to mean lensing data
 FIELD starparOffset,  OFF_STARPAR,  int,            offset to stellar parameter data
-FIELD galphotOffset, OFF_GALPHOT, int,              offset to galphot object entry
+FIELD galphotOffset,  OFF_GALPHOT, int,             offset to galphot object entry
 
 FIELD refColorBlue,   REF_COLOR_BLUE, float,        color of astrometry ref stars
@@ -57 +57 @@
 FIELD projectionID,   PROJECTION_ID, short,         ID of projection for primary skycell
 
-FIELD Nstarpar,       DUMMY,         short,         number of stellar parameter entries
+FIELD Nstarpar,       N_STAR_PAR,    short,         number of stellar parameter entries
 FIELD dummy,          DUMMY,         short,         unassigned bytes
 

branches/eam_branches/ipp-20150625/Ohana/src/libautocode/def/measure-ps1-v5.d

@@ -70 +70 @@
 FIELD psfNdof,        PSF_NDOF,      int,            psf degrees of freedom
 FIELD psfNpix,        PSF_NPIX,      int,            psf number of pixels
-FIELD photFlags2,     PHOT_FLAGS,    int,            flags supplied by photometry program
+FIELD photFlags2,     PHOT_FLAGS2,   int,            flags supplied by photometry program
 FIELD extNsigma,      EXT_NSIGMA,    float,          Nsigma deviation towards EXT
 

branches/eam_branches/ipp-20150625/Ohana/src/libautocode/def/secfilt-ps1-v5.d

@@ -10 +10 @@
 FIELD  Map,           MAG_AP,            float,    ave aperture mag in this band,         mags
 FIELD  dMap,          MAG_AP_ERR,        float,    ave aperture mag in this band,         mags
-FIELD  sMap,          MAG_AP_STDEV,    float,      standard deviation of ap mags,         mags
+FIELD  sMap,          MAG_AP_STDEV,      float,      standard deviation of ap mags,         mags
 FIELD  Mkron,         MAG_KRON,          float,    ave kron mag in this band,             mags
 FIELD  dMkron,        MAG_KRON_ERR,      float,    formal error on average kron mag,      mags
-FIELD  sMkron,        MAG_KRON_STDEV,  float,      standard deviation of kron mags,       mags
+FIELD  sMkron,        MAG_KRON_STDEV,    float,      standard deviation of kron mags,       mags
                                          
 # XXX I could add these fields to secfilt or calculate in dvopsps?

branches/eam_branches/ipp-20150625/Ohana/src/libdvo/src/dbExtractImages.c

@@ -236 +236 @@
     case IMAGE_EXPNAME_AS_INT:
       // XXX NOTE this does not handle gpc2 images
-      if ((image[N].name[0] == 'o') && (image->name[5] == 'g') && (image->name[10] == 'o')) {
-        int mjd  = atoi(&image->name[1]);
-        int Nexp = atoi(&image->name[6]);
+      if ((image[N].name[0] == 'o') && (image[N].name[5] == 'g') && (image[N].name[10] == 'o')) {
+        int mjd  = atoi(&image[N].name[1]);
+        int Nexp = atoi(&image[N].name[6]);
         value.Int = mjd * 10000 + Nexp;
       }

branches/eam_branches/ipp-20150625/Ohana/src/opihi/cmd.data/uniq.c

@@ -93 +93 @@
   // free up extra memory
   ResetVector (ovec, ivec->type, Nnew);
-  if (cvec) ResetVector (ovec, OPIHI_INT, Nnew);
+  if (cvec) ResetVector (cvec, OPIHI_INT, Nnew);
 
   return (TRUE);

branches/eam_branches/ipp-20150625/Ohana/src/opihi/pantasks/TaskOps.c

@@ -22 +22 @@
 void FreeTasks () {
   int i;
-  for (i = 0; i < Ntasks; i++) {
+  int ntasks = Ntasks;
+  Ntasks = 0;
+  for (i = 0; i < ntasks; i++) {
     FreeTask (tasks[i]);
   }