Changeset 32238

Timestamp:

Aug 31, 2011, 12:38:51 PM (15 years ago)

Author:

eugene

Message:

tweak log levels to make psphot steps and timing clearer

Location:

branches/eam_branches/ipp-20110710/psphot/src

Files:

• psphot.c (modified) (1 diff)
• psphotAddNoise.c (modified) (1 diff)
• psphotApResid.c (modified) (1 diff)
• psphotChoosePSF.c (modified) (1 diff)
• psphotEfficiency.c (modified) (1 diff)
• psphotExtendedSourceAnalysis.c (modified) (1 diff)
• psphotFindFootprints.c (modified) (1 diff)
• psphotFindPeaks.c (modified) (1 diff)
• psphotFitSourcesLinear.c (modified) (2 diffs)
• psphotGuessModels.c (modified) (1 diff)
• psphotImageQuality.c (modified) (1 diff)
• psphotKronIterate.c (modified) (2 diffs)
• psphotMagnitudes.c (modified) (1 diff)
• psphotModelBackground.c (modified) (1 diff)
• psphotRadialApertures.c (modified) (1 diff)
• psphotRoughClass.c (modified) (1 diff)
• psphotSourceStats.c (modified) (1 diff)
• psphotSubtractBackground.c (modified) (1 diff)

branches/eam_branches/ipp-20110710/psphot/src/psphot.c

@@ -27 +27 @@
     }
 
-    psLogMsg ("psphot", 3, "complete psphot run: %f sec\n", psTimerMark ("complete"));
+    psLogMsg ("psphot", PS_LOG_WARN, "complete psphot run: %f sec\n", psTimerMark ("complete"));
 
     psErrorCode exit_status = psphotGetExitStatus();

branches/eam_branches/ipp-20110710/psphot/src/psphotAddNoise.c

@@ -85 +85 @@
     }
     if (add) {
-        psLogMsg ("psphot.noise", PS_LOG_INFO, "add noise for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.noise"));
+        psLogMsg ("psphot.noise", PS_LOG_WARN, "add noise for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.noise"));
     } else {
-        psLogMsg ("psphot.noise", PS_LOG_INFO, "sub noise for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.noise"));
+        psLogMsg ("psphot.noise", PS_LOG_WARN, "sub noise for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.noise"));
     }
 

branches/eam_branches/ipp-20110710/psphot/src/psphotApResid.c

@@ -347 +347 @@
 
     psLogMsg ("psphot.apresid", PS_LOG_DETAIL, "aperture residual: %f +/- %f\n", psf->ApResid, psf->dApResid);
-    psLogMsg ("psphot.apresid", PS_LOG_INFO, "measure full-frame aperture residuals for %d sources: %f sec\n", Npsf, psTimerMark ("psphot.apresid"));
+    psLogMsg ("psphot.apresid", PS_LOG_WARN, "measure full-frame aperture residuals for %d sources: %f sec\n", Npsf, psTimerMark ("psphot.apresid"));
 
     psFree (xPos);

branches/eam_branches/ipp-20110710/psphot/src/psphotChoosePSF.c

@@ -376 +376 @@
 
     char *modelName = pmModelClassGetName (psf->type);
-    psLogMsg ("psphot.pspsf", PS_LOG_INFO, "select psf model: %f sec\n", psTimerMark ("psphot.choose.psf"));
+    psLogMsg ("psphot.pspsf", PS_LOG_WARN, "select psf model: %f sec\n", psTimerMark ("psphot.choose.psf"));
     psLogMsg ("psphot.pspsf", PS_LOG_INFO, "psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
 

branches/eam_branches/ipp-20110710/psphot/src/psphotEfficiency.c

@@ -545 +545 @@
     psFree(de);
 
-    psLogMsg("psphot", PS_LOG_INFO, "Detection efficiency: %lf sec\n", psTimerClear("psphot.fake"));
+    psLogMsg("psphot", PS_LOG_WARN, "Detection efficiency: %lf sec\n", psTimerClear("psphot.fake"));
 
     return true;

branches/eam_branches/ipp-20110710/psphot/src/psphotExtendedSourceAnalysis.c

@@ -157 +157 @@
     psFree(AnalysisRegion);
 
-    psLogMsg ("psphot", PS_LOG_INFO, "extended source analysis: %f sec for %d objects\n", psTimerMark ("psphot.extended"), Next);
+    psLogMsg ("psphot", PS_LOG_WARN, "extended source analysis: %f sec for %d objects\n", psTimerMark ("psphot.extended"), Next);
     psLogMsg ("psphot", PS_LOG_INFO, "  %d petrosian\n", Npetro);
     psLogMsg ("psphot", PS_LOG_INFO, "  %d annuli\n", Nannuli);

branches/eam_branches/ipp-20110710/psphot/src/psphotFindFootprints.c

@@ -67 +67 @@
         if (peak->saddlePoints) nSaddle += peak->saddlePoints->n;
     }
-    fprintf (stderr, "%d saddle points for %ld peaks\n", nSaddle, detections->peaks->n);
+    // fprintf (stderr, "%d saddle points for %ld peaks\n", nSaddle, detections->peaks->n);
 
-    psLogMsg ("psphot", PS_LOG_INFO, "%ld peaks, %ld total footprints: %f sec\n", detections->peaks->n, detections->footprints->n, psTimerMark ("psphot.footprints"));
+    psLogMsg ("psphot", PS_LOG_WARN, "%ld peaks, %ld total footprints: %f sec\n", detections->peaks->n, detections->footprints->n, psTimerMark ("psphot.footprints"));
 
     return detections;

branches/eam_branches/ipp-20110710/psphot/src/psphotFindPeaks.c

@@ -68 +68 @@
         pmPeaksWriteText (peaks, output);
     }
-    psLogMsg ("psphot", PS_LOG_INFO, "%ld peaks: %f sec\n", peaks->n, psTimerMark ("psphot.peaks"));
+    psLogMsg ("psphot", PS_LOG_WARN, "%ld peaks: %f sec\n", peaks->n, psTimerMark ("psphot.peaks"));
 
     return peaks;

branches/eam_branches/ipp-20110710/psphot/src/psphotFitSourcesLinear.c

@@ -353 +353 @@
         psImageMaskPixels (source->maskObj, "AND", PS_NOT_IMAGE_MASK(markVal));
 
-        // subtract object
+        // subtract object & add noise
         pmSourceSub (source, PM_MODEL_OP_FULL, maskVal);
     }
@@ -378 +378 @@
     psFree (border);
 
-    psLogMsg ("psphot.ensemble", PS_LOG_INFO, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot.linear"));
+    psLogMsg ("psphot.ensemble", PS_LOG_WARN, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot.linear"));
 
     psphotVisualPlotChisq (sources);

branches/eam_branches/ipp-20110710/psphot/src/psphotGuessModels.c

@@ -141 +141 @@
     psFree (cellGroups);
 
-    psLogMsg ("psphot.models", 4, "built models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.models"));
+    psLogMsg ("psphot.models", PS_LOG_WARN, "built models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.models"));
     return true;
 }

branches/eam_branches/ipp-20110710/psphot/src/psphotImageQuality.c

@@ -289 +289 @@
 #endif
 
-    psLogMsg ("psphot", PS_LOG_INFO, "Image Quality Stats from %ld psf stars : FWHM (major, minor) [pixels]: %f, %f\n",
+    psLogMsg ("psphot", PS_LOG_WARN, "Image Quality Stats from %ld psf stars : FWHM (major, minor) [pixels]: %f, %f\n",
               M2->n, fwhm_major, fwhm_minor);
 

branches/eam_branches/ipp-20110710/psphot/src/psphotKronIterate.c

@@ -96 +96 @@
 
     // psphotSaveImage (NULL, readout->mask, "kron.unmasked.fits");
-
-    pmSourcePhotometryMode photMode = PM_SOURCE_PHOT_PSFONLY;
 
     // XXX tmp visualization
@@ -173 +171 @@
     psFree (kronWindow);
 
-    psLogMsg ("psphot.kron", PS_LOG_DETAIL, "measure masked kron magnitudes : %f sec for %ld objects\n", psTimerMark ("psphot.kron"), sources->n);
+    psLogMsg ("psphot.kron", PS_LOG_WARN, "measure masked kron magnitudes : %f sec for %ld objects\n", psTimerMark ("psphot.kron"), sources->n);
 
     return true;

branches/eam_branches/ipp-20110710/psphot/src/psphotMagnitudes.c

@@ -146 +146 @@
     psFree (cellGroups);
 
-    psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "measure magnitudes : %f sec for %ld objects (%d with apertures)\n", psTimerMark ("psphot.mags"), sources->n, Nap);
+    psLogMsg ("psphot.magnitudes", PS_LOG_WARN, "measure magnitudes : %f sec for %ld objects (%d with apertures)\n", psTimerMark ("psphot.mags"), sources->n, Nap);
     return true;
 }

branches/eam_branches/ipp-20110710/psphot/src/psphotModelBackground.c

@@ -322 +322 @@
     }
 
-    psLogMsg ("psphot", PS_LOG_INFO, "built background image: %f sec\n", psTimerMark ("psphot.background"));
+    psLogMsg ("psphot", PS_LOG_WARN, "built background image: %f sec\n", psTimerMark ("psphot.background"));
 
     psMetadataAddF32(readout->analysis, PS_LIST_TAIL, "SKY_MEAN", PS_META_REPLACE, "sky mean", Value);

branches/eam_branches/ipp-20110710/psphot/src/psphotRadialApertures.c

@@ -144 +144 @@
     psFree(AnalysisRegion);
 
-    psLogMsg ("psphot", PS_LOG_INFO, "radial source apertures: %f sec for %d objects\n", psTimerMark ("psphot.radial"), Nradial);
+    psLogMsg ("psphot", PS_LOG_WARN, "radial source apertures: %f sec for %d objects\n", psTimerMark ("psphot.radial"), Nradial);
     return true;
 }

branches/eam_branches/ipp-20110710/psphot/src/psphotRoughClass.c

@@ -128 +128 @@
     psphotDumpMoments (recipe, sources);
 
-    psLogMsg ("psphot.roughclass", PS_LOG_INFO, "rough classification: %f sec\n", psTimerMark ("psphot.rough"));
+    psLogMsg ("psphot.roughclass", PS_LOG_WARN, "rough classification: %f sec\n", psTimerMark ("psphot.rough"));
 
     psphotVisualPlotMoments (recipe, readout->analysis, sources);

branches/eam_branches/ipp-20110710/psphot/src/psphotSourceStats.c

@@ -239 +239 @@
     psFree (cellGroups);
 
-    psLogMsg ("psphot", PS_LOG_INFO, "%ld sources, %d moments, %d faint, %d failed: %f sec\n", sources->n, Nmoments, Nfaint, Nfail, psTimerMark ("psphot.stats"));
+    psLogMsg ("psphot", PS_LOG_WARN, "%ld sources, %d moments, %d faint, %d failed: %f sec\n", sources->n, Nmoments, Nfaint, Nfail, psTimerMark ("psphot.stats"));
 
     psphotVisualShowMoments (sources);

branches/eam_branches/ipp-20110710/psphot/src/psphotSubtractBackground.c

@@ -103 +103 @@
         psphotSaveImage (NULL, image, name);
     }
-    psLogMsg ("psphot", PS_LOG_INFO, "subtracted background model: %f sec\n", psTimerMark ("psphot.background"));
+    psLogMsg ("psphot", PS_LOG_WARN, "subtracted background model: %f sec\n", psTimerMark ("psphot.background"));
 
     // the pmReadout selected in this function are all view on entries in config->files