Changeset 29786

Timestamp:

Nov 16, 2010, 12:59:27 PM (15 years ago)

Author:

eugene

Message:

fix dvoverify

Location:

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

Files:

• ReadDeleteList.c (modified) (1 diff)
• dvorepairDeleteImageList.c (modified) (1 diff)
• dvoverify.c (modified) (6 diffs)

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/ReadDeleteList.c

@@ -5 +5 @@
   int j, index, Nindex, NINDEX, *indexList, Nline;
   int Nstart, Nbytes, Nread, status;
-  char *c0, *c1, *space, *indexPoint, *buffer;
+  char *c0, *c1, *space, *buffer;
 
+  char *indexPoint = NULL;
   FILE *f = fopen (filename, "r");
   myAssert(f, "failed to open delete list");

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/dvorepairDeleteImageList.c

@@ -109 +109 @@
   Dmin = +90.0;
   Dmax = -90.0;
+  Qmin = 360.0;
+  Qmax =   0.0;
   for (i = 0; i < NdeleteIDs; i++) {
     index = deleteIDs[i];

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/dvoverify.c

@@ -9 +9 @@
 
 int VerifyTableFile (char *filename);
+
+# define DEBUG 0
 
 int main (int argc, char **argv) {
@@ -79 +81 @@
     if (!inlist[0].regions[i][0].table) continue;
 
-    sprintf (filename, "%s/%s.cpm", catdir, inlist[0].regions[i][0].name);
-    if (!VerifyTableFile (filename)) {
-      Nbad ++;
-    }
-
-    sprintf (filename, "%s/%s.cpm", catdir, inlist[0].regions[i][0].name);
+    // if (i % 1000 == 0) fprintf (stderr, ".");
+
+    sprintf (filename, "%s/%s.cpt", catdir, inlist[0].regions[i][0].name);
+    if (!VerifyTableFile (filename)) {
+      Nbad ++;
+    }
+
+    sprintf (filename, "%s/%s.cps", catdir, inlist[0].regions[i][0].name);
     if (!VerifyTableFile (filename)) {
       Nbad ++;
@@ -120 +124 @@
     switch (errno) {
       case ENOENT:
-        // fprintf (stderr, "file does not exist, skipping %s\n", filename);
+        if (DEBUG) fprintf (stderr, "file does not exist, skipping %s\n", filename);
         return TRUE;
       case ENOMEM:
@@ -164 +168 @@
   // scan all extentions
   Nbytes = 0;
-  while (Nbytes > fileStats.st_size) {
+  if (DEBUG) fprintf (stderr, "sizes: ("OFF_T_FMT" vs "OFF_T_FMT")\n", Nbytes, fileStats.st_size);
+  while (Nbytes < fileStats.st_size) {
 
     // Check on the PHU
@@ -175 +180 @@
     // move to TBL header
     Nbytes += header.datasize + gfits_data_size (&header);
+    if (DEBUG) fprintf (stderr, "sizes: ("OFF_T_FMT" vs "OFF_T_FMT")\n", Nbytes, fileStats.st_size);
     if (Nbytes > fileStats.st_size) {
-      fprintf (stderr, "file is short ("OFF_T_FMT" vs "OFF_T_FMT")\n", Nbytes, fileStats.st_size);
+      fprintf (stderr, "file is short ("OFF_T_FMT" vs "OFF_T_FMT"): %s\n", Nbytes, fileStats.st_size, filename);
       gfits_free_header(&header);
       fclose (file);
@@ -201 +207 @@
     }
   }
-  // fprintf (stderr, "file is good: %s\n", filename);
+  if (DEBUG) fprintf (stderr, "file is good: %s\n", filename);
   fclose (file);
   return TRUE;