Changeset 33827 for branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/avextract.c

Timestamp:

Apr 26, 2012, 12:30:42 PM (14 years ago)

Author:

eugene

Message:

nFitPhotom was signed, changed to unsigned short; change the iterations to have at least 8 loops before any cleaning; add some verbosity; pull the old (pre-threaded) version of setMmos; setMmos_mosaic should take a pointer to the current mosaic; skip entries with skipCal set

File:

• branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/avextract.c (modified) (3 diffs)

branches/eam_branches/ipp-20120405/Ohana/src/opihi/dvo/avextract.c

@@ -35 +35 @@
     remove_argument (N, &argc, argv);
     VERBOSE = TRUE;
+  }
+
+  int VERBOSE2 = FALSE;
+  if ((N = get_argument (argc, argv, "-vv"))) {
+    remove_argument (N, &argc, argv);
+    VERBOSE = TRUE;
+    VERBOSE2 = TRUE;
   }
 
@@ -173 +180 @@
     catalog.filename = (HOST_ID || PARALLEL_LOCAL) ? hostfile : skylist[0].filename[i];
     catalog.catflags = LOAD_AVES | LOAD_SECF;
-    if (needMeasures) {
-      catalog.catflags |= LOAD_MEAS;
-    }
+    catalog.catflags |= needMeasures ? LOAD_MEAS : SKIP_MEAS;
     catalog.Nsecfilt = 0;
 
@@ -181 +186 @@
       
     // an error exit status here is a significant error
-    if (!dvo_catalog_open (&catalog, NULL, FALSE, "r")) {
+    if (!dvo_catalog_open (&catalog, NULL, VERBOSE2, "r")) {
       gprint (GP_ERR, "ERROR: failure to open catalog file %s\n", catalog.filename);
       exit (2);