Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/dvomerge (modified) (1 prop)
• Ohana/src/dvomerge/src/dvo_image_merge_dbs.c (modified) (1 diff)
• Ohana/src/dvomerge/src/dvomergeUpdate.c (modified) (2 diffs)
• Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c (modified) (4 diffs)
• Ohana/src/dvomerge/src/dvoverify_args.c (modified) (1 diff)
• Ohana/src/dvomerge/src/dvoverify_catalogs.c (modified) (1 diff)
• Ohana/src/dvomerge/src/dvoverify_utils.c (modified) (1 diff)
• Ohana/src/dvomerge/src/merge_catalogs_old.c (modified) (1 diff)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -167 +167 @@
   off_t i, oldID, newID;
 
+  if (!IDmap->old) {
+    fprintf (stderr, "input database has image IDs, but no Image table\n");
+    return FALSE;
+  }
+
+  off_t lastID = IDmap->old[IDmap->Nmap-1];
+
   for (i = 0; i < catalog[0].Nmeasure; i++) {
     oldID = catalog[0].measure[i].imageID;
     if (oldID == 0) continue;
 
-    if (!IDmap->old) {
-      fprintf (stderr, "input database has image IDs, but no Image table\n");
-    }
-
     newID = dvo_map_image_ID (IDmap, oldID);
     if (newID == 0) {
+      if (oldID > lastID) {
+        fprintf (stderr, "problem with image IDs : input out of range\n");
+        fprintf (stderr, "old ID: "OFF_T_FMT", last ID: "OFF_T_FMT"\n", oldID, lastID);
+        exit (2);
+      }
       if (!IDmap->notFound[oldID]) {
         fprintf (stderr, "cannot find image ID "OFF_T_FMT"\n",  oldID);

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -111 +111 @@
   SetPhotcodeTable(NULL);
 
-  dvomergeUpdate_catalogs (input, output, outsky, inlist, NsecfiltInput, NsecfiltOutput, &IDmap, secfiltMap);
+  int status = dvomergeUpdate_catalogs (input, output, outsky, inlist, NsecfiltInput, NsecfiltOutput, &IDmap, secfiltMap);
 
   // save the output sky table copy
@@ -123 +123 @@
   gettimeofday (&stop, NULL);
   dtime = DTIME (stop, start);
+
+  if (!status) {
+    fprintf (stderr, "ERROR: elapsed time %9.4f sec\n", dtime);
+    exit (3);
+  }
+
   fprintf (stderr, "SUCCESS: elapsed time %9.4f sec\n", dtime);
-
   exit (0);
 }

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -140 +140 @@
     }
 
+    dvo_update_image_IDs (IDmap, &incatalog);
+
     // merge input into the appropriate output tables
     for (j = 0; j < outlist[0].Nregions; j++) {
@@ -156 +158 @@
       LoadCatalog (&outcatalog, outlist[0].regions[j], outcatalog.filename, "w", NsecfiltOutput);
 
-      dvo_update_image_IDs (IDmap, &incatalog);
       merge_catalogs_old (outlist[0].regions[j], &outcatalog, &incatalog, RADIUS, secfiltMap);
 
       outcatalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
 
-      if (outstat[i].missed) {
+      if (outstat[j].missed) {
         dmhObjectAdd (outstat[j].history, &outcatalog.header, inStats);
       }
@@ -248 +249 @@
     if (FORCE_MERGE)         { snprintf (tmpline, DVO_MAX_PATH, "%s -force-merge",     command); strcpy (command, tmpline); }
 
+    // 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);
+
     fprintf (stderr, "command: %s\n", command);
 
@@ -275 +281 @@
   }
   if (!PARALLEL_MANUAL && !PARALLEL_SERIAL) {
-    HostTableWaitJobsGetIO (table, __FILE__, __LINE__, VERBOSE);
+    int status = HostTableWaitJobsGetIO (table, __FILE__, __LINE__, VERBOSE);
+    if (!status) {
+      fprintf (stderr, "error running one of the remote clients\n");
+      return status;
+    }
   }
 

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/dvoverify_args.c

@@ -56 +56 @@
   }
 
+  /*** dvoverify -parallel (dvoverify_client, actually) ignores this argument
+       dvoverify should save a subset table of just the IDs, and dvoverify_client should load it
+       dvoverify -cpt should have CHECK_IMAGE_ID = F as default ***/
+       
   CHECK_IMAGE_ID = TRUE;
   if ((N = get_argument (*argc, argv, "-skip-image-ids"))) {

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/dvoverify_catalogs.c

@@ -143 +143 @@
       continue;
     }
-    fscanf (results, "%*s %d %*s %d", &NbadHost, &NNotSortedHost);
+    int Nresults = fscanf (results, "%*s %d %*s %d", &NbadHost, &NNotSortedHost);
+    if (Nresults != 2) {
+      fprintf (stderr, "warning: failure scanning results\n");
+      fclose (results);
+      continue;
+    }
     *Nbad += NbadHost;
     NNotSorted += NNotSortedHost;

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -302 +302 @@
     for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
       id = catalog[0].measure[m+j].imageID;
+      if (id == 0) continue; // detections from ref photcodes can (should) have unset image IDs
       if (id > maxID) {
         Nfail ++;

branches/eam_branches/ps2-tc3-20130727/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -76 +76 @@
   tcoords.pc1_2 = tcoords.pc2_1 = 0.0;
   tcoords.Npolyterms = 1;
-  strcpy (tcoords.ctype, "RA---ARC");
+  strcpy (tcoords.ctype, "DEC--ARC");
 
   if (VERBOSE) fprintf (stderr, "merging %s into %s\n", input[0].filename, output[0].filename);