Changeset 31450 for trunk/Ohana/src/dvomerge

Timestamp:

May 5, 2011, 10:43:45 AM (15 years ago)

Author:

eugene

Message:

various improvements to relphot, related support

Location:

trunk/Ohana/src/dvomerge/src

Files:

• dvo_image_merge_dbs.c (modified) (1 diff)
• dvoverify.c (modified) (4 diffs)

trunk/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -202 +202 @@
     if (newID == 0) {
       fprintf (stderr, "cannot find image ID "OFF_T_FMT"\n",  oldID);
-      exit (2);
+      // exit (2);
     }
     catalog[0].measure[i].imageID = newID;

trunk/Ohana/src/dvomerge/src/dvoverify.c

@@ -148 +148 @@
 int VerifyTableFile (char *filename) {
 
-  int status;
+  int status, Next;
   off_t Nbytes;
   Header header;
@@ -205 +205 @@
   // scan all extentions
   Nbytes = 0;
+  Next = -1;
   if (DEBUG) fprintf (stderr, "sizes: ("OFF_T_FMT" vs "OFF_T_FMT")\n", Nbytes, fileStats.st_size);
   while (Nbytes < fileStats.st_size) {
@@ -210 +211 @@
     // Check on the PHU
     if (!gfits_fread_header (file, &header)) {
-      fprintf (stderr, "unable to read PHU header for %s\n", filename);
+      if (Next == -1) {
+        fprintf (stderr, "unable to read PHU header for %s\n", filename);
+      } else {
+        fprintf (stderr, "unable to read header for %s, extension %d (or file has excess bytes)\n", filename, Next);
+      }
       fclose(file);
       return (FALSE);
@@ -243 +248 @@
       }
     }
+    Next ++;
   }
   if (DEBUG) fprintf (stderr, "file is good: %s\n", filename);