Changeset 30478

Timestamp:

Feb 3, 2011, 9:34:11 AM (15 years ago)

Author:

eugene

Message:

adjust verbosity levels

Location:

branches/eam_branches/ipp-20101205/Ohana/src/relastro/src

Files:

• FitChip.c (modified) (1 diff)
• StarMaps.c (modified) (3 diffs)
• bcatalog.c (modified) (1 diff)
• load_catalogs.c (modified) (1 diff)
• plotstuff.c (modified) (1 diff)

branches/eam_branches/ipp-20101205/Ohana/src/relastro/src/FitChip.c

@@ -88 +88 @@
     }
     if (skip) {
-      if (VERBOSE) fprintf (stderr, "insufficient measurements (%d) for requested order (%d)\n", fit[0].Npts, image[0].coords.Npolyterms);
+      if (VERBOSE2) fprintf (stderr, "insufficient measurements (%d) for requested order (%d)\n", fit[0].Npts, image[0].coords.Npolyterms);
       fit_free (fit);
       free (values);

branches/eam_branches/ipp-20101205/Ohana/src/relastro/src/StarMaps.c

@@ -79 +79 @@
     starmap[N].stars[ybin*NX_MAP + xbin] ++;
   }
-  MARKTIME("assign stars to starmap bins: %f sec\n", dtime);
+  if (VERBOSE2) { MARKTIME("assign stars to starmap bins: %f sec\n", dtime); }
 
   return (TRUE);
@@ -117 +117 @@
     }
 
-    if (VERBOSE) fprintf (stderr, "starmap: %d points for image %s\n", starmap[i].Npoints, images[i].name);
+    if (VERBOSE2) fprintf (stderr, "starmap: %d points for image %s\n", starmap[i].Npoints, images[i].name);
   }
 
@@ -145 +145 @@
   }
 
-  if (VERBOSE) fprintf (stderr, "max deviations for %s using %d pts : %f, %f\n", images[N].name, starmap[N].Npoints, dLmax, dMmax);
+  if (VERBOSE2) fprintf (stderr, "max deviations for %s using %d pts : %f, %f\n", images[N].name, starmap[N].Npoints, dLmax, dMmax);
 
-  if (dLmax > DPOS_MAX) return (FALSE);
-  if (dMmax > DPOS_MAX) return (FALSE);
+  if (dLmax > DPOS_MAX) {
+      if (VERBOSE) fprintf (stderr, "max deviations for %s using %d pts : %f, %f\n", images[N].name, starmap[N].Npoints, dLmax, dMmax);
+      return (FALSE);
+  }
+  if (dMmax > DPOS_MAX) {
+      if (VERBOSE) fprintf (stderr, "max deviations for %s using %d pts : %f, %f\n", images[N].name, starmap[N].Npoints, dLmax, dMmax);
+      return (FALSE);
+  }
   return (TRUE);
 }

branches/eam_branches/ipp-20101205/Ohana/src/relastro/src/bcatalog.c

@@ -78 +78 @@
         subcatalog[0].measure[Nmeasure].dbFlags &= ~ID_MEAS_AREA;
       }
-     
+
       Nmeasure ++;
       Nm ++;

branches/eam_branches/ipp-20101205/Ohana/src/relastro/src/load_catalogs.c

@@ -26 +26 @@
     pcatalog[0].Nsecfilt  = GetPhotcodeNsecfilt ();
 
-    if (!dvo_catalog_open (pcatalog, skylist[0].regions[i], VERBOSE, "w")) {
+    if (!dvo_catalog_open (pcatalog, skylist[0].regions[i], VERBOSE2, "w")) {
       fprintf (stderr, "ERROR: failure reading catalog %s\n", pcatalog[0].filename);
       exit (1);
     }
-    if (VERBOSE && !pcatalog[0].Naves_disk) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
+    if (VERBOSE2 && !pcatalog[0].Naves_disk) fprintf (stderr, "no data in %s, skipping\n", pcatalog[0].filename);
 
     //outlier rejection

branches/eam_branches/ipp-20101205/Ohana/src/relastro/src/plotstuff.c

@@ -146 +146 @@
   graphdata[0].ymax = dUNDEF;
    
+  graphdata[0].ticktextPad = NAN;
+  graphdata[0].labelPadXm = NAN;
+  graphdata[0].labelPadXp = NAN;
+  graphdata[0].labelPadYm = NAN;
+  graphdata[0].labelPadYp = NAN;
+  graphdata[0].padXm = NAN;
+  graphdata[0].padXp = NAN;
+  graphdata[0].padYm = NAN;
+  graphdata[0].padYp = NAN;
 }