Changeset 35619

Timestamp:

Jun 3, 2013, 8:44:41 AM (13 years ago)

Author:

eugene

Message:

add -verify-catalogs option to dvomerge (skips loading the images and IDmap)

Location:

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge

Files:

• include/dvomerge.h (modified) (1 diff)
• src/args.c (modified) (3 diffs)
• src/dvomergeImageIDs.c (modified) (1 diff)
• src/dvomergeUpdate_catalogs.c (modified) (2 diffs)
• src/dvomerge_client.c (modified) (1 diff)

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/include/dvomerge.h

@@ -26 +26 @@
 int    VERBOSE;
 int    VERIFY;
+int    VERIFY_CATALOG_ONLY;
 int    IMAGES_ONLY;
 char   CATDIR[256];

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/args.c

@@ -15 +15 @@
   /* verify merge status of output tables, but do not modify */
   VERIFY = FALSE;
+  VERIFY_CATALOG_ONLY = FALSE;
   if ((N = get_argument (*argc, argv, "-verify"))) {
     VERIFY = TRUE;
@@ -21 +22 @@
   if ((N = get_argument (*argc, argv, "-check-only"))) {
     VERIFY = TRUE;
+    remove_argument (N, argc, argv);
+  }
+  if ((N = get_argument (*argc, argv, "-verify-catalogs"))) {
+    VERIFY = TRUE;
+    VERIFY_CATALOG_ONLY = TRUE;
     remove_argument (N, argc, argv);
   }
@@ -144 +150 @@
     remove_argument (N, argc, argv);
   }
+  if ((N = get_argument (*argc, argv, "-verify-catalogs"))) {
+    VERIFY = TRUE;
+    VERIFY_CATALOG_ONLY = TRUE;
+    remove_argument (N, argc, argv);
+  }
 
   /* replace measurement, don't duplicate */

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/dvomergeImageIDs.c

@@ -87 +87 @@
   int    status;
 
+  if (VERIFY && VERIFY_CATALOG_ONLY) return TRUE;
+
   /*** load input1/Images.dat ***/
   sprintf (ImageCat, "%s/Images.dat", input);

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

@@ -167 +167 @@
   snprintf (IDmapFilename, DVO_MAX_PATH, "%s/IDmap.fits", absoutput);
 
-  // save IDmap information
-  if (!IDmapSave (IDmapFilename, IDmap)) {
-    fprintf (stderr, "ERROR: failure to save the image ID map\n");
-    exit (1);
+  if (!VERIFY_CATALOG_ONLY) {
+    // save IDmap information
+    if (!IDmapSave (IDmapFilename, IDmap)) {
+      fprintf (stderr, "ERROR: failure to save the image ID map\n");
+      exit (1);
+    }
   }
 
@@ -198 +200 @@
     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); }
 

branches/eam_branches/ipp-20130509/Ohana/src/dvomerge/src/dvomerge_client.c

@@ -55 +55 @@
   snprintf (IDmapFilename, DVO_MAX_PATH, "%s/IDmap.fits", absoutput);
 
-  // save IDmap information
-  IDmap = IDmapLoad (IDmapFilename);
-  if (!IDmap) {
-    fprintf (stderr, "ERROR: failure to save the image ID map\n");
-    exit (1);
+  if (!VERIFY_CATALOG_ONLY) {
+    // save IDmap information
+    IDmap = IDmapLoad (IDmapFilename);
+    if (!IDmap) {
+      fprintf (stderr, "ERROR: failure to save the image ID map\n");
+      exit (1);
+    }
   }