Changeset 39225 for trunk/Ohana/src/opihi/dvo/imlist.c

Timestamp:

Dec 3, 2015, 4:16:29 PM (11 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20151113

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/imlist.c (modified) (4 diffs)

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

@@ -21 +21 @@
   }
 
+  int VERBOSE = TRUE;
+  if ((N = get_argument (argc, argv, "-quiet"))) {
+    VERBOSE = FALSE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-q"))) {
+    VERBOSE = FALSE;
+    remove_argument (N, &argc, argv);
+  }
+
   TimeSelect = FALSE;
   if ((N = get_argument (argc, argv, "-time"))) {
@@ -35 +45 @@
     remove_argument (N, &argc, argv);
     TimeSelect = TRUE;
-    gprint (GP_ERR, "plotting in range %ds - %ds (%f seconds)\n", (int)tzero, (int)(tzero + trange), trange);
+    if (VERBOSE) gprint (GP_ERR, "plotting in range %ds - %ds (%f seconds)\n", (int)tzero, (int)(tzero + trange), trange);
   }
 
@@ -88 +98 @@
   GetTimeFormat (&TimeReference, &TimeFormat);
 
+  int Nfound = 0;
+
   for (j = 0; j < MAX_LIST; j++) {
     i = subset[j];
@@ -104 +116 @@
       XY_to_RD (&r, &d, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
     }
-    gprint (GP_LOG, "%3lld %s %8lld %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n", 
-            (long long) i, image[i].name, (long long) image[i].imageID, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
+    if (VERBOSE) gprint (GP_LOG, "%3lld %s %8lld %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n", 
+                         (long long) i, image[i].name, (long long) image[i].imageID, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
+
+    char name[80];
+    sprintf (name, "imlist:%d", Nfound);
+    set_str_variable (name, image[i].name);
+    Nfound ++;
   }
+  set_int_variable ("imlist:n", Nfound);
 
   FreeImagesDVO(image);