Changeset 27496

Timestamp:

Mar 28, 2010, 1:17:56 PM (16 years ago)

Author:

eugene

Message:

better handling for certain aborts; clarify verbosity

Location:

branches/eam_branches/relastro.20100326

Files:

• include/relastro.h (modified) (1 diff)
• src/ImageOps.c (modified) (6 diffs)
• src/args.c (modified) (1 diff)

branches/eam_branches/relastro.20100326/include/relastro.h

@@ -91 +91 @@
 
 int    VERBOSE;
+int    VERBOSE2;
 
 int    RESET;

branches/eam_branches/relastro.20100326/src/ImageOps.c

@@ -163 +163 @@
   }
 
-  for (i = 0; VERBOSE && (i < Nimage); i++) {
+  for (i = 0; VERBOSE2 && (i < Nimage); i++) {
     name = GetPhotcodeNamebyCode (image[i].photcode);
     fprintf (stderr, "image %lld has %lld measures (%s, %s)\n", (long long) i, (long long) Nlist[i],
@@ -183 +183 @@
   idx = getImageByID (ID);
   if (idx == -1) {
-    fprintf (stderr, "can't match detection to image?\n");
-    abort();
+    if (VERBOSE2) fprintf (stderr, "can't match detection to image?\n");
+    return;
   }
 
@@ -257 +257 @@
     return;
   }
-  fprintf (stderr, "can't match detection to image?\n");
-  abort();
+  if (VERBOSE2) fprintf (stderr, "can't match detection to image?\n");
+  return;
 }
 # endif
@@ -429 +429 @@
   if (!badCoords(im)) {
     fprintf (stderr, "ERROR: inconsistent result?");
-    exit (1);
+    abort();
   }
 
@@ -500 +500 @@
     if (mosaic == NULL) {
       fprintf (stderr, "mosaic not found for image %s\n", image[im].name);
-      exit (1);
+      abort();
     }
     moscoords = &mosaic[0].coords;
@@ -575 +575 @@
     if (mosaic == NULL) {
       fprintf (stderr, "mosaic not found for image %s\n", image[im].name);
-      exit (1);
+      abort ();
     }
     moscoords = &mosaic[0].coords;

branches/eam_branches/relastro.20100326/src/args.c

@@ -111 +111 @@
   }
 
-  VERBOSE = FALSE;
+  VERBOSE = VERBOSE2 = FALSE;
   if ((N = get_argument (argc, argv, "-v"))) {
     VERBOSE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-vv"))) {
+    VERBOSE = VERBOSE2 = TRUE;
     remove_argument (N, &argc, argv);
   }