Changeset 39347

Timestamp:

Feb 12, 2016, 9:24:47 AM (10 years ago)

Author:

eugene

Message:

remove some dangerous test prints, add image seq to gimages

Location:

trunk/Ohana/src

Files:

• libdvo/src/ImageOps.c (modified) (3 diffs)
• opihi/dvo/gimages.c (modified) (1 diff)

trunk/Ohana/src/libdvo/src/ImageOps.c

@@ -53 +53 @@
   n = 0;
   for (i = 0; i < Nimage; i++) {
-    if (i != n) {
-      fprintf (stderr, "skipped %s\n", image[subset[n]].name);
-    }
     if (TimeSelect && ((image[i].tzero < tzero) || (image[i].tzero+image[i].trate*image[i].NY > tzero + trange))) {
-      fprintf (stderr, "skipping %s\n", image[i].name);
+      // fprintf (stderr, "skipping %s\n", image[i].name);
       continue;
     }
@@ -91 +88 @@
             corners touching the region **/
       }
-      fprintf (stderr, "skipping %s\n", image[i].name);
+      // fprintf (stderr, "skipping %s\n", image[i].name);
       continue;
     }
@@ -118 +115 @@
             corners touching the region **/
       }
-      fprintf (stderr, "skipping %s\n", image[i].name);
+      // fprintf (stderr, "skipping %s\n", image[i].name);
       continue;
     }

trunk/Ohana/src/opihi/dvo/gimages.c

@@ -213 +213 @@
 
     if (PixelCoords) {
-      gprint (GP_LOG, "%3d %s %6.1f %6.1f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x %7d\n", 
-              Nfound, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
+      gprint (GP_LOG, "%3d %5d %s %6.1f %6.1f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x %7d\n", 
+              Nfound, (int) i, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
     } else {
       XY_to_RD (&ra, &dec, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
-      gprint (GP_LOG, "%3d %s %8.4f %8.4f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x %7d\n", 
-               Nfound, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
+      gprint (GP_LOG, "%3d %5d %s %8.4f %8.4f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x %7d\n", 
+              Nfound, (int) i, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags, image[i].imageID);
     }
     sprintf (name, "IMAGEx:%d", Nfound);