IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10801


Ignore:
Timestamp:
Dec 17, 2006, 12:49:47 AM (20 years ago)
Author:
eugene
Message:

cleanup log messages

Location:
trunk/psphot/src
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/psphot/src/psphotApResid.c

    r10555 r10801  
    115115        Npsf ++;
    116116    }
    117     psLogMsg ("psphot.apresid", 4, "measure aperture residuals : %f sec for %d objects (%d skipped, %d failed, %ld invalid)\n",
     117    psLogMsg ("psphot.apresid", PS_LOG_DETAIL, "measure aperture residuals for %d objects (%d skipped, %d failed, %ld invalid)\n",
    118118              psTimerMark ("psphot"), Npsf, Nskip, Nfail, sources->n - Npsf - Nskip - Nfail);
    119119
    … …  
    333333    psMetadataAdd (recipe, PS_LIST_TAIL, "NAPMIFIT", PS_DATA_S32 | PS_META_REPLACE, "ap residual scatter", psf->nApResid);
    334334
    335     psLogMsg ("psphot.apresid", 3, "measure full-frame aperture residual: %f sec\n", psTimerMark ("psphot"));
    336     psLogMsg ("psphot.apresid", 4, "aperture residual: %f +/- %f : %f bias, %f skysat (%d of %d used)\n",
     335    psLogMsg ("psphot.apresid", PS_LOG_INFO, "measure full-frame aperture residual: %f sec\n", psTimerMark ("psphot"));
     336    psLogMsg ("psphot.apresid", PS_LOG_DETAIL, "aperture residual: %f +/- %f : %f bias, %f skysat (%d of %d used)\n",
    337337              psf->ApResid, psf->dApResid, psf->skyBias, psf->skySat, Nkeep, Npsf);
    338     psLogMsg ("psphot.apresid", 4, "apresid trends: %f %f %f %f %f\n",
     338    psLogMsg ("psphot.apresid", PS_LOG_MINUTIA, "apresid trends: %f %f %f %f %f\n",
    339339              1e3*psf->ApTrend->coeff[1][0][0][0],
    340340              1e6*psf->ApTrend->coeff[2][0][0][0],

  • trunk/psphot/src/psphotBasicDeblend.c

    r9734 r10801  
    120120        psFree (contour);
    121121    }
    122     psLogMsg ("psphot.deblend", 3, "identified %d blended objects (%f sec)\n", Nblend, psTimerMark ("psphot"));
     122    psLogMsg ("psphot.deblend", PS_LOG_INFO, "identified %d blended objects (%f sec)\n", Nblend, psTimerMark ("psphot"));
    123123
    124124    psFree (SN);

  • trunk/psphot/src/psphotBlendFit.c

    r9888 r10801  
    8686    }
    8787
    88     psLogMsg ("psphot.psphotBlendFit", 3, "fit models: %f sec for %d objects (%d psf, %d ext, %d failed, %ld skipped)\n", psTimerMark ("psphot"), Nfit, Npsf, Next, Nfail, sources->n - Nfit);
     88    psLogMsg ("psphot.psphotBlendFit", PS_LOG_INFO, "fit models: %f sec for %d objects (%d psf, %d ext, %d failed, %ld skipped)\n", psTimerMark ("psphot"), Nfit, Npsf, Next, Nfail, sources->n - Nfit);
    8989    return (true);
    9090}

  • trunk/psphot/src/psphotChoosePSF.c

    r10267 r10801  
    7575        if (source->mode & PM_SOURCE_MODE_PSFSTAR) psArrayAdd (stars, 200, source);
    7676    }
    77     psLogMsg ("psphot.pspsf", 4, "selected candidate %ld PSF objects\n", stars->n);
     77    psLogMsg ("psphot.pspsf", PS_LOG_DETAIL, "selected candidate %ld PSF objects\n", stars->n);
    7878
    7979    if (stars->n == 0) {
    … …  
    173173    psVectorStats (stats, dSx, NULL, NULL, 0);
    174174    float dSxo = stats->sampleMean;
    175     psLogMsg ("psphot.choosePSF", 3, "dSx: mean: %f, median: %f, stdev: %f, npts: %ld", stats->sampleMean, stats->sampleMedian, stats->sampleStdev, dSx->n);
     175    psLogMsg ("psphot.choosePSF", PS_LOG_INFO, "dSx: mean: %f, median: %f, stdev: %f, npts: %ld", stats->sampleMean, stats->sampleMedian, stats->sampleStdev, dSx->n);
    176176
    177177    psVectorStats (stats, dSy, NULL, NULL, 0);
    178178    float dSyo = stats->sampleMean;
    179     psLogMsg ("psphot.choosePSF", 3, "dSy: mean: %f, median: %f, stdev: %f, npts: %ld", stats->sampleMean, stats->sampleMedian, stats->sampleStdev, dSy->n);
     179    psLogMsg ("psphot.choosePSF", PS_LOG_INFO, "dSy: mean: %f, median: %f, stdev: %f, npts: %ld", stats->sampleMean, stats->sampleMedian, stats->sampleStdev, dSy->n);
    180180
    181181    for (int i = 0; i < dSN->n; i++) {
    … …  
    186186    psVectorStats (stats, dSx, NULL, NULL, 0);
    187187    float nSx = stats->sampleStdev;
    188     psLogMsg ("psphot.choosePSF", 3, "dSx: mean: %f, median: %f, stdev: %f, npts: %ld", stats->sampleMean, stats->sampleMedian, stats->sampleStdev, dSx->n);
     188    psLogMsg ("psphot.choosePSF", PS_LOG_INFO, "dSx: mean: %f, median: %f, stdev: %f, npts: %ld", stats->sampleMean, stats->sampleMedian, stats->sampleStdev, dSx->n);
    189189    psVectorStats (stats, dSy, NULL, NULL, 0);
    190190    float nSy = stats->sampleStdev;
    191     psLogMsg ("psphot.choosePSF", 3, "dSy: mean: %f, median: %f, stdev: %f, npts: %ld", stats->sampleMean, stats->sampleMedian, stats->sampleStdev, dSy->n);
     191    psLogMsg ("psphot.choosePSF", PS_LOG_INFO, "dSy: mean: %f, median: %f, stdev: %f, npts: %ld", stats->sampleMean, stats->sampleMedian, stats->sampleStdev, dSy->n);
    192192
    193193    psFree (Sx);
    … …  
    234234        psMetadataConfigWrite (psfData, "psfmodel.dat");
    235235        psFree (psfData);
    236         psLogMsg ("psphot.choosePSF", 3, "wrote out psf-subtracted image, psf data, exiting\n");
     236        psLogMsg ("psphot.choosePSF", PS_LOG_INFO, "wrote out psf-subtracted image, psf data, exiting\n");
    237237        exit (0);
    238238    }
    … …  
    247247
    248248    modelName = pmModelGetType (psf->type);
    249     psLogMsg ("psphot.pspsf", 3, "select psf model: %f sec\n", psTimerMark ("psphot"));
    250     psLogMsg ("psphot.pspsf", 3, "selected psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
     249    psLogMsg ("psphot.pspsf", PS_LOG_INFO, "select psf model: %f sec\n", psTimerMark ("psphot"));
     250    psLogMsg ("psphot.pspsf", PS_LOG_INFO, "psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
    251251
    252252    return (psf);

  • trunk/psphot/src/psphotEnsemblePSF.c

    r10171 r10801  
    105105        psFree (fitSource);
    106106    }
    107     psLogMsg (__func__, 4, "built fitSources: %f (%ld objects)\n", psTimerMark ("psphot"), refSources->n);
     107    psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built fitSources: %f (%ld objects)\n", psTimerMark ("psphot"), refSources->n);
    108108
    109109    // vectors to store stats for each object
    … …  
    178178    }
    179179    psSparseResort (sparse);
    180     psLogMsg (__func__, 4, "built matrix: %f (%d elements)\n", psTimerMark ("psphot"), sparse->Nelem);
     180    psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built matrix: %f (%d elements)\n", psTimerMark ("psphot"), sparse->Nelem);
    181181
    182182    // set the sky, sky_x, sky_y components of border matrix
    … …  
    242242    psFree (border);
    243243
    244     psLogMsg (__func__, 3, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot"));
     244    psLogMsg ("psphot.ensemble", PS_LOG_INFO, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot"));
    245245    return true;
    246246}

  • trunk/psphot/src/psphotFindPeaks.c

    r10295 r10801  
    2020    psImage *smooth_im = psImageCopy (NULL, readout->image, PS_TYPE_F32);
    2121    psImageSmooth (smooth_im, SIGMA, NSIGMA);
    22     psLogMsg ("psphot", 4, "smooth image: %f sec\n", psTimerMark ("psphot"));
     22    psLogMsg ("psphot", PS_LOG_MINUTIA, "smooth image: %f sec\n", psTimerMark ("psphot"));
    2323
    2424    psImage *smooth_wt = psImageCopy (NULL, readout->weight, PS_TYPE_F32);
    … …  
    2626    smooth_wt = (psImage*)psBinaryOp(smooth_wt, smooth_wt, "*",
    2727                                     psScalarAlloc(1/(4*M_PI*PS_SQR(SIGMA)), PS_TYPE_F32));
    28     psLogMsg ("psphot", 4, "smooth weight: %f sec\n", psTimerMark ("psphot"));
     28    psLogMsg ("psphot", PS_LOG_MINUTIA, "smooth weight: %f sec\n", psTimerMark ("psphot"));
    2929
    3030    psImage *mask = readout->mask;
    … …  
    3636    }
    3737
    38     psTimerStart ("psphot");
    3938    for (int j = 0; j < smooth_im->numRows; j++) {
    4039        for (int i = 0; i < smooth_im->numCols; i++) {
    … …  
    4746        }
    4847    }
    49     psLogMsg ("psphot", 4, "built S/N map: %f sec\n", psTimerMark ("psphot"));
    50 
    51     psTimerStart ("psphot");
     48    psLogMsg ("psphot", PS_LOG_MINUTIA, "built S/N map: %f sec\n", psTimerMark ("psphot"));
    5249
    5350    // set peak threshold
    … …  
    5552    // threshold = NSIGMA*sky->sampleStdev + sky->sampleMean;
    5653    threshold = PS_SQR(NSIGMA);
    57     psLogMsg ("psphot", 4, "threshold: %f DN\n", threshold);
     54    psLogMsg ("psphot", PS_LOG_DETAIL, "threshold: %f DN\n", threshold);
    5855
    5956    // find the peaks in the smoothed image
    … …  
    6865        pmPeaksWriteText (peaks, output);
    6966    }
    70     psLogMsg ("psphot", 3, "%ld peaks: %f sec\n", peaks->n, psTimerMark ("psphot"));
     67    psLogMsg ("psphot", PS_LOG_INFO, "%ld peaks: %f sec\n", peaks->n, psTimerMark ("psphot"));
    7168
    7269    return (peaks);

  • trunk/psphot/src/psphotGuessModels.c

    r10052 r10801  
    33// construct an initial PSF model for each object
    44bool psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf) {
     5
     6  psTimerStart ("psphot");
    57
    68  // setup the PSF fit radius details
    … …  
    3537    source->modelPSF = modelPSF;
    3638  }
    37   psLogMsg ("psphot.emsemble", 4, "built models: %f (%ld objects)\n", psTimerMark ("psphot"), sources->n);
     39  psLogMsg ("psphot.models", 4, "built models: %f (%ld objects)\n", psTimerMark ("psphot"), sources->n);
    3840  return true;
    3941}

  • trunk/psphot/src/psphotImageMedian.c

    r10553 r10801  
    199199        }
    200200    }
    201     psLogMsg ("psphot", 3, "build median image: %f sec\n", psTimerMark ("psphot"));
     201    psLogMsg ("psphot", PS_LOG_MINUTIA, "build median image: %f sec\n", psTimerMark ("psphot"));
    202202
    203203    // measure background stats and save for later output
    … …  
    210210    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_NX",   PS_DATA_S32 | PS_META_REPLACE, "sky model size (x)",      nx);
    211211    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_NY",   PS_DATA_S32 | PS_META_REPLACE, "sky model size (y)",      ny);
    212     psLogMsg ("psphot", 3, "background sky : min %f mean %f max %f stdev %f", statsBck->min, statsBck->sampleMean, statsBck->max, statsBck->sampleStdev);
     212    psLogMsg ("psphot", PS_LOG_INFO, "background sky : min %f mean %f max %f stdev %f",
     213              statsBck->min, statsBck->sampleMean, statsBck->max, statsBck->sampleStdev);
    213214    psFree (statsBck);
    214215
    … …  
    232233    // linear interpolation to full-scale
    233234    psImageUnbin (background->image, model->image, DX, DY, dx, dy);
    234     psLogMsg ("psphot", 3, "build resampled image: %f sec\n", psTimerMark ("psphot"));
     235    psLogMsg ("psphot", PS_LOG_MINUTIA, "build resampled image: %f sec\n", psTimerMark ("psphot"));
    235236
    236237    // back-sub image pixels, from output background file (don't create if not requested)
    … …  
    267268# endif
    268269
    269     psLogMsg ("psphot", 3, "subtracted background model: %f sec\n", psTimerMark ("psphot"));
     270    psLogMsg ("psphot", PS_LOG_INFO, "subtracted background model: %f sec\n", psTimerMark ("psphot"));
    270271    psFree(stats);
    271272    psFree(rng);

  • trunk/psphot/src/psphotMagnitudes.c

    r10185 r10801  
    4848    }   
    4949
    50     psLogMsg ("psphot.magnitudes", 4, "measure magnitudes : %f sec for %ld objects (%d with apertures)\n", psTimerMark ("psphot"), sources->n, Nap);
     50    psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "measure magnitudes : %f sec for %ld objects (%d with apertures)\n", psTimerMark ("psphot"), sources->n, Nap);
    5151    return true;
    5252}

  • trunk/psphot/src/psphotReplaceUnfit.c

    r10201 r10801  
    5050      source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
    5151    }
    52     psLogMsg ("psphot.replace", 3, "replace models: %f sec (%ld objects)\n", psTimerMark ("psphot"), sources->n);
     52    psLogMsg ("psphot.replace", PS_LOG_INFO, "replace models: %f sec (%ld objects)\n", psTimerMark ("psphot"), sources->n);
    5353    return true;
    5454}

  • trunk/psphot/src/psphotRoughClass.c

    r10053 r10801  
    55
    66    pmPSFClump   psfClump;
     7
     8    psTimerStart ("psphot");
    79
    810    psfClump = pmSourcePSFClump (sources, recipe);
    … …  
    2224    psphotDumpMoments (recipe, sources);
    2325
     26    psLogMsg ("psphot.roughclass", PS_LOG_INFO, "rough classification (%f sec)\n", psTimerMark ("psphot"));
     27
    2428    return true;
    2529}

  • trunk/psphot/src/psphotSkyReplace.c

    r9270 r10801  
    44// in order to  successfully replace the sky, we must define a corresponding file...
    55bool psphotSkyReplace (pmConfig *config, pmFPAview *view) {
     6
     7    psTimerStart ("psphot");
    68
    79    // find the currently selected readout
    … …  
    2628        }
    2729    }
     30    psLogMsg ("psphot.sky", PS_LOG_DETAIL, "replace background flux : %f sec\n", psTimerMark ("psphot"));
    2831    return true;
    2932}

  • trunk/psphot/src/psphotSourceStats.c

    r10053 r10801  
    7474    }
    7575
    76     psLogMsg ("psphot", 3, "%ld moments: %f sec\n", sources->n, psTimerMark ("psphot"));
     76    psLogMsg ("psphot", PS_LOG_INFO, "%ld moments: %f sec\n", sources->n, psTimerMark ("psphot"));
    7777
    7878    return (sources);
Note: See TracChangeset for help on using the changeset viewer.