IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 20453


Ignore:
Timestamp:
Oct 28, 2008, 3:05:05 PM (18 years ago)
Author:
eugene
Message:

cleanup timer marks

Location:
trunk
Files:
1 deleted
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/objects/pmPSFtry.c

    r20250 r20453  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2008-10-18 00:49:19 $
     7 *  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2008-10-29 01:04:27 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    168168
    169169    // stage 1:  fit an EXT model to all candidates PSF sources -- this is independent of the modeled 2D variations in the PSF
    170     psTimerStart ("fit");
     170    psTimerStart ("psf.fit");
    171171    for (int i = 0; i < psfTry->sources->n; i++) {
    172172
    … …  
    196196        Next ++;
    197197    }
    198     psLogMsg ("psphot.psftry", 4, "fit ext:   %f sec for %d of %ld sources\n", psTimerMark ("fit"), Next, sources->n);
     198    psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit ext:   %f sec for %d of %ld sources\n", psTimerMark ("psf.fit"), Next, sources->n);
    199199    psTrace ("psModules.object", 3, "keeping %d of %ld PSF candidates (EXT)\n", Next, sources->n);
    200200
    … …  
    213213
    214214    // stage 3: refit with fixed shape parameters
    215     psTimerStart ("fit");
     215    psTimerStart ("psf.fit");
    216216    for (int i = 0; i < psfTry->sources->n; i++) {
    217217
    … …  
    267267    psfTry->psf->nPSFstars = Npsf;
    268268
    269     psLogMsg ("psphot.psftry", 4, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("fit"), Npsf, sources->n);
     269    psLogMsg ("psphot.psftry", PS_LOG_MINUTIA, "fit psf:   %f sec for %d of %ld sources\n", psTimerMark ("psf.fit"), Npsf, sources->n);
    270270    psTrace ("psModules.object", 3, "keeping %d of %ld PSF candidates (PSF)\n", Npsf, sources->n);
    271271

  • trunk/psphot/src/psphotAddNoise.c

    r18001 r20453  
    2020    PS_ASSERT (readout->parent->concepts, false);
    2121
    22     psTimerStart ("psphot");
     22    psTimerStart ("psphot.noise");
    2323
    2424    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
    … …  
    9393    }
    9494    if (add) {
    95         psLogMsg ("psphot.noise", PS_LOG_INFO, "add noise for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));
     95        psLogMsg ("psphot.noise", PS_LOG_INFO, "add noise for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.noise"));
    9696    } else {
    97         psLogMsg ("psphot.noise", PS_LOG_INFO, "sub noise for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));
     97        psLogMsg ("psphot.noise", PS_LOG_INFO, "sub noise for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.noise"));
    9898    }
    9999    return true;

  • trunk/psphot/src/psphotApResid.c

    r20449 r20453  
    1818    PS_ASSERT_PTR_NON_NULL(recipe, false);
    1919
    20     psTimerStart ("psphot");
     20    psTimerStart ("psphot.apresid");
    2121
    2222    bool measureAptrend = psMetadataLookupBool (&status, recipe, "MEASURE.APTREND");
    … …  
    218218    psMetadataAdd (recipe, PS_LIST_TAIL, "NAPMIFIT", PS_DATA_S32 | PS_META_REPLACE, "number of apresid stars", psf->nApResid);
    219219
    220     // psLogMsg ("psphot.apresid", PS_LOG_INFO, "measure full-frame aperture residuals for %d of %d objects: %f sec\n", Nkeep, Npsf, psTimerMark ("psphot"));
    221220    psLogMsg ("psphot.apresid", PS_LOG_DETAIL, "aperture residual: %f +/- %f\n", psf->ApResid, psf->dApResid);
     221    psLogMsg ("psphot.apresid", PS_LOG_INFO, "measure full-frame aperture residuals for: %f sec\n", psTimerMark ("psphot.apresid"));
    222222
    223223    psFree (mag);

  • trunk/psphot/src/psphotBasicDeblend.c

    r13006 r20453  
    1010    int Nblend = 0;
    1111
    12     psTimerStart ("psphot");
     12    psTimerStart ("psphot.deblend.basic");
    1313
    1414    float FRACTION = psMetadataLookupF32 (&status, recipe, "DEBLEND_PEAK_FRACTION");
    … …  
    122122        psFree (contour);
    123123    }
    124     psLogMsg ("psphot.deblend", PS_LOG_INFO, "identified %d blended objects: %f sec\n", Nblend, psTimerMark ("psphot"));
     124    psLogMsg ("psphot.deblend", PS_LOG_INFO, "identified %d blended objects: %f sec\n", Nblend, psTimerMark ("psphot.deblend.basic"));
    125125
    126126    psFree (SN);

  • trunk/psphot/src/psphotBlendFit.c

    r19910 r20453  
    1010    bool status;
    1111
    12     psTimerStart ("psphot");
     12    psTimerStart ("psphot.fit.nonlinear");
    1313
    1414    // bit-masks to test for good/bad pixels
    … …  
    119119    }
    120120
    121     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);
     121    psLogMsg ("psphot.psphotBlendFit", PS_LOG_INFO, "fit models: %f sec for %d objects (%d psf, %d ext, %d failed, %ld skipped)\n", psTimerMark ("psphot.fit.nonlinear"), Nfit, Npsf, Next, Nfail, sources->n - Nfit);
    122122
    123123    psphotVisualShowResidualImage (readout);

  • trunk/psphot/src/psphotChoosePSF.c

    r20287 r20453  
    2121    bool status;
    2222
    23     psTimerStart ("psphot");
     23    psTimerStart ("psphot.choose.psf");
    2424
    2525    // bit-masks to test for good/bad pixels
    … …  
    308308
    309309    char *modelName = pmModelClassGetName (psf->type);
    310     psLogMsg ("psphot.pspsf", PS_LOG_INFO, "select psf model: %f sec\n", psTimerMark ("psphot"));
     310    psLogMsg ("psphot.pspsf", PS_LOG_INFO, "select psf model: %f sec\n", psTimerMark ("psphot.choose.psf"));
    311311    psLogMsg ("psphot.pspsf", PS_LOG_INFO, "psf model %s, ApResid: %f +/- %f\n", modelName, psf->ApResid, psf->dApResid);
    312312

  • trunk/psphot/src/psphotDeblendSatstars.c

    r13006 r20453  
    66    pmSource *source;
    77
    8     psTimerStart ("psphot");
     8    psTimerStart ("psphot.deblend.sat");
    99
    1010    int Nblend = 0;
    … …  
    155155    psFree (index);
    156156
    157     psLogMsg ("psphot", PS_LOG_INFO, "found %d satstar blend peaks, leaving %ld sources: %f sec\n", Nblend, sources->n, psTimerMark ("psphot"));
     157    psLogMsg ("psphot", PS_LOG_INFO, "found %d satstar blend peaks, leaving %ld sources: %f sec\n", Nblend, sources->n, psTimerMark ("psphot.deblend.sat"));
    158158    return true;
    159159}

  • trunk/psphot/src/psphotFindDetections.c

    r20177 r20453  
    88    float NSIGMA_PEAK = 25.0;
    99    int NMAX = 0;
    10 
    11     psTimerStart ("psphot");
    1210
    1311    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)

  • trunk/psphot/src/psphotFindFootprints.c

    r19869 r20453  
    55    bool status;
    66
    7     psTimerStart ("footprints");
     7    psTimerStart ("psphot.footprints");
    88
    99    int npixMin = psMetadataLookupS32(&status, recipe, "FOOTPRINT_NPIXMIN");
    … …  
    4040    psFree (detections->peaks);
    4141
    42     psLogMsg ("psphot", PS_LOG_DETAIL, "found %ld footprints: %f sec\n", footprints->n, psTimerMark ("footprints"));
     42    psLogMsg ("psphot", PS_LOG_MINUTIA, "found %ld footprints: %f sec\n", footprints->n, psTimerMark ("psphot.footprints"));
    4343
    4444    // optionally grow footprints isotropically by growRadius pixels
    4545    if (growRadius > 0) {
    4646        psArray *tmp = pmFootprintArrayGrow(footprints, growRadius);
    47         psLogMsg ("psphot", PS_LOG_DETAIL, "grow footprint coverage by %d pixels, %ld footprints become %ld footprints: %f sec\n", growRadius, footprints->n, tmp->n, psTimerMark ("footprints"));
     47        psLogMsg ("psphot", PS_LOG_MINUTIA, "grow footprint coverage by %d pixels, %ld footprints become %ld footprints: %f sec\n", growRadius, footprints->n, tmp->n, psTimerMark ("psphot.footprints"));
    4848        psFree(footprints);
    4949        footprints = tmp;
    … …  
    5757
    5858        psArray *mergedFootprints = pmFootprintArraysMerge(detections->footprints, footprints, includePeaks);
    59         psLogMsg ("psphot", PS_LOG_DETAIL, "merged %ld new footprints with %ld existing ones: %f sec\n", footprints->n, detections->footprints->n, psTimerMark ("footprints"));
     59        psLogMsg ("psphot", PS_LOG_MINUTIA, "merged %ld new footprints with %ld existing ones: %f sec\n", footprints->n, detections->footprints->n, psTimerMark ("psphot.footprints"));
    6060
    6161        psFree(footprints);
    … …  
    6868    psphotCullPeaks(readout->image, readout->weight, recipe, detections->footprints);
    6969    detections->peaks = pmFootprintArrayToPeaks(detections->footprints);
    70     psLogMsg ("psphot", PS_LOG_INFO, "%ld peaks, %ld total footprints: %f sec\n", detections->peaks->n, detections->footprints->n, psTimerMark ("footprints"));
     70    psLogMsg ("psphot", PS_LOG_INFO, "%ld peaks, %ld total footprints: %f sec\n", detections->peaks->n, detections->footprints->n, psTimerMark ("psphot.footprints"));
    7171
    7272    return detections;

  • trunk/psphot/src/psphotFindPeaks.c

    r17870 r20453  
    88    bool status = false;
    99
    10     psTimerStart ("peaks");
     10    psTimerStart ("psphot.peaks");
    1111
    1212    // find the peaks in the smoothed image
    … …  
    4848        pmPeaksWriteText (peaks, output);
    4949    }
    50     psLogMsg ("psphot", PS_LOG_INFO, "%ld peaks: %f sec\n", peaks->n, psTimerMark ("peaks"));
     50    psLogMsg ("psphot", PS_LOG_INFO, "%ld peaks: %f sec\n", peaks->n, psTimerMark ("psphot.peaks"));
    5151
    5252    return peaks;

  • trunk/psphot/src/psphotFitSourcesLinear.c

    r19910 r20453  
    2020    // float r;
    2121
    22     psTimerStart ("psphot");
     22    psTimerStart ("psphot.linear");
    2323
    2424    // bit-masks to test for good/bad pixels
    … …  
    9393        psArrayAdd (fitSources, 100, source);
    9494    }
    95     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built fitSources: %f (%ld objects)\n", psTimerMark ("psphot"), sources->n);
     95    psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built fitSources: %f sec (%ld objects)\n", psTimerMark ("psphot.linear"), sources->n);
    9696
    9797    // vectors to store stats for each object
    … …  
    163163
    164164    psSparseResort (sparse);
    165     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built matrix: %f (%d elements)\n", psTimerMark ("psphot"), sparse->Nelem);
     165    psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "built matrix: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);
    166166
    167167    // set the sky, sky_x, sky_y components of border matrix
    168168    SetBorderMatrixElements (border, readout, fitSources, CONSTANT_PHOTOMETRIC_WEIGHTS, SKY_FIT_ORDER, markVal);
    169     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "set border: %f (%d elements)\n", psTimerMark ("psphot"), sparse->Nelem);
    170169
    171170    psSparseConstraint constraint;
    … …  
    184183        skyfit = NULL;
    185184    }
    186     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "solve matrix: %f (%d elements)\n", psTimerMark ("psphot"), sparse->Nelem);
     185    psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "solve matrix: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);
    187186
    188187    // adjust I0 for fitSources and subtract
    … …  
    203202        source->mode |= PM_SOURCE_MODE_SUBTRACTED;
    204203    }
    205     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "sub models: %f (%d elements)\n", psTimerMark ("psphot"), sparse->Nelem);
     204    psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "sub models: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);
    206205
    207206    // measure chisq for each source
    … …  
    211210        pmSourceChisq (model, source->pixels, source->maskObj, source->weight, maskVal);
    212211    }
    213     psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "get chisqs: %f (%d elements)\n", psTimerMark ("psphot"), sparse->Nelem);
     212    psLogMsg ("psphot.ensemble", PS_LOG_MINUTIA, "get chisqs: %f sec (%d elements)\n", psTimerMark ("psphot.linear"), sparse->Nelem);
    214213
    215214    // psFree (index);
    … …  
    221220    psFree (border);
    222221
    223     psLogMsg ("psphot.ensemble", PS_LOG_INFO, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot"));
     222    psLogMsg ("psphot.ensemble", PS_LOG_INFO, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot.linear"));
    224223
    225224    psphotVisualShowResidualImage (readout);
    … …  
    241240    fullArray = psRegionForImage (readout->mask, fullArray);
    242241    psImageMaskRegion (readout->mask, fullArray, "OR", markVal);
    243     psLogMsg ("psphot.ensemble", PS_LOG_INFO, "step 1: %f sec\n", psTimerMark ("psphot"));
    244242
    245243    // turn off MARK for all object pixels
    … …  
    252250        psImageMaskCircle (source->maskView, x, y, model->radiusFit, "AND", PS_NOT_U8(markVal));
    253251    }
    254     psLogMsg ("psphot.ensemble", PS_LOG_INFO, "step 2: %f sec\n", psTimerMark ("psphot"));
    255252
    256253    // accumulate the image statistics from the masked regions
    … …  
    289286        }
    290287    }
    291     psLogMsg ("psphot.ensemble", PS_LOG_INFO, "step 3: %f sec\n", psTimerMark ("psphot"));
    292288
    293289    // turn off MARK for all image pixels
    294290    psImageMaskRegion (readout->mask, fullArray, "AND", PS_NOT_U8(markVal));
    295     psLogMsg ("psphot.ensemble", PS_LOG_INFO, "step 4: %f sec\n", psTimerMark ("psphot"));
    296291
    297292    // set the Border T elements
    … …  
    310305        psSparseBorderElementT (border, 2, 2, y2);
    311306    }
    312     psLogMsg ("psphot.ensemble", PS_LOG_INFO, "step 5: %f sec\n", psTimerMark ("psphot"));
    313307
    314308    return true;

  • trunk/psphot/src/psphotGuessModels.c

    r20411 r20453  
    2727    bool status;
    2828
    29     psTimerStart ("psphot");
     29    psTimerStart ("psphot.models");
    3030
    3131    // select the appropriate recipe information
    … …  
    142142    }
    143143   
    144     psLogMsg ("psphot.models", 4, "built models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));
     144    psLogMsg ("psphot.models", 4, "built models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.models"));
    145145    return true;
    146146}

  • trunk/psphot/src/psphotMagnitudes.c

    r20069 r20453  
    66    int Nap = 0;
    77
    8     psTimerStart ("psphot");
     8    psTimerStart ("psphot.mags");
    99
    1010    pmReadout *backModel = psphotSelectBackground (config, view);
    … …  
    6060    }
    6161
    62     psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "measure magnitudes : %f sec for %ld objects (%d with apertures)\n", psTimerMark ("psphot"), sources->n, Nap);
     62    psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "measure magnitudes : %f sec for %ld objects (%d with apertures)\n", psTimerMark ("psphot.mags"), sources->n, Nap);
    6363    return true;
    6464}

  • trunk/psphot/src/psphotMakeFluxScale.c

    r20252 r20453  
    55    bool status = false;
    66
    7     psTimerStart ("residuals");
     7    psTimerStart ("psphot.fluxscale");
    88
    99    int Nx = psMetadataLookupS32(&status, recipe, "PSF.FLUXSCALE.NX");
    … …  
    7272    psFree(trend);
    7373
     74    psLogMsg ("psphot", PS_LOG_MINUTIA, "built flux scale: %f sec\n", psTimerMark ("psphot.fluxscale"));
     75
    7476    return success;
    7577}

  • trunk/psphot/src/psphotMakeGrowthCurve.c

    r20236 r20453  
    55    bool status;
    66
    7     psTimerStart ("growth");
     7    psTimerStart ("psphot.growth");
    88
    99    // set limits on the aperture magnitudes
    … …  
    3434    }
    3535
    36     psLogMsg ("psphot", PS_LOG_INFO, "built growth curve: %f sec\n", psTimerMark ("growth"));
     36    psLogMsg ("psphot", PS_LOG_MINUTIA, "built growth curve: %f sec\n", psTimerMark ("psphot.growth"));
    3737
    3838    return true;

  • trunk/psphot/src/psphotMakeResiduals.c

    r20451 r20453  
    77    psU8 mflux;
    88
    9     psTimerStart ("residuals");
     9    psTimerStart ("psphot.residuals");
    1010
    1111    if (!psMetadataLookupBool(&status, recipe, "PSF.RESIDUALS")) return true;
    … …  
    273273    psFree (B);
    274274
    275     psLogMsg ("psphot.pspsf", PS_LOG_INFO, "generate residuals for %ld objects: %f sec\n", input->n, psTimerMark ("residuals"));
     275    psLogMsg ("psphot.pspsf", PS_LOG_MINUTIA, "generate residuals for %ld objects: %f sec\n", input->n, psTimerMark ("psphot.residuals"));
    276276
    277277    psFree (xC);

  • trunk/psphot/src/psphotModelBackground.c

    r18833 r20453  
    99    static char *defaultStatsName = "FITTED_MEAN";
    1010
    11     psTimerStart ("psphot");
     11    psTimerStart ("psphot.background");
    1212
    1313    // find the currently selected readout
    … …  
    283283    }
    284284
    285     psLogMsg ("psphot", PS_LOG_MINUTIA, "build median image: %f sec\n", psTimerMark ("psphot"));
     285    psLogMsg ("psphot", PS_LOG_INFO, "built background image: %f sec\n", psTimerMark ("psphot.background"));
    286286
    287287    psMetadataAddF32(recipe, PS_LIST_TAIL, "SKY_MEAN", PS_META_REPLACE, "sky mean", Value);

  • trunk/psphot/src/psphotReplaceUnfit.c

    r19869 r20453  
    66    pmSource *source;
    77
    8     psTimerStart ("psphot");
     8    psTimerStart ("psphot.replace");
    99
    1010    for (int i = 0; i < sources->n; i++) {
    … …  
    1919        source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
    2020    }
    21     psLogMsg ("psphot.replace", 3, "replace unfitted models: %f sec (%ld objects)\n", psTimerMark ("psphot"), sources->n);
     21    psLogMsg ("psphot.replace", 3, "replace unfitted models: %f sec (%ld objects)\n", psTimerMark ("psphot.replace"), sources->n);
    2222    return true;
    2323}
    … …  
    2828    pmSource *source;
    2929
    30     psTimerStart ("psphot");
     30    psTimerStart ("psphot.replace");
    3131
    3232    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
    … …  
    4343      source->mode &= ~PM_SOURCE_MODE_SUBTRACTED;
    4444    }
    45     psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));
     45    psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.replace"));
    4646    return true;
    4747}
    … …  
    5252    pmSource *source;
    5353
    54     psTimerStart ("psphot");
     54    psTimerStart ("psphot.replace");
    5555
    5656    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
    … …  
    6767      source->mode |= PM_SOURCE_MODE_SUBTRACTED;
    6868    }
    69     psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot"));
     69    psLogMsg ("psphot.replace", PS_LOG_INFO, "replaced models for %ld objects: %f sec\n", sources->n, psTimerMark ("psphot.replace"));
    7070    return true;
    7171}

  • trunk/psphot/src/psphotRoughClass.c

    r19986 r20453  
    1414    bool status;
    1515
    16     psTimerStart ("psphot");
     16    psTimerStart ("psphot.rough");
    1717
    1818    // we make this measurement on a NxM grid of regions across the readout
    … …  
    4141    psphotDumpMoments (recipe, sources);
    4242
    43     psLogMsg ("psphot.roughclass", PS_LOG_INFO, "rough classification: %f sec\n", psTimerMark ("psphot"));
     43    psLogMsg ("psphot.roughclass", PS_LOG_INFO, "rough classification: %f sec\n", psTimerMark ("psphot.rough"));
    4444
    4545    psphotVisualPlotMoments (recipe, sources);

  • trunk/psphot/src/psphotSignificanceImage.c

    r20286 r20453  
    1111
    1212    // smooth the image and weight map
    13     psTimerStart ("smooth");
     13    psTimerStart ("psphot.smooth");
    1414
    1515    // XXX we can a) choose fft to convolve if needed and b) multithread fftw
    … …  
    4545    psImage *smooth_im = psImageCopy(NULL, readout->image, PS_TYPE_F32);
    4646    psImageSmoothMask(smooth_im, smooth_im, readout->mask, maskVal, SIGMA_SMTH, NSIGMA_SMTH, minGauss);
    47     psLogMsg("psphot", PS_LOG_MINUTIA, "smooth image: %f sec\n", psTimerMark("smooth"));
     47    psLogMsg("psphot", PS_LOG_MINUTIA, "smooth image: %f sec\n", psTimerMark("psphot.smooth"));
    4848
    4949    // Smooth the weight, applying the mask as we go.  The variance is smoothed by the PSF^2,
    … …  
    5757    psImageSmoothMask(smooth_wt, smooth_wt, readout->mask, maskVal, SIGMA_SMTH * M_SQRT1_2,
    5858                      NSIGMA_SMTH, minGauss);
    59     psLogMsg("psphot", PS_LOG_MINUTIA, "smooth weight: %f sec\n", psTimerMark("smooth"));
     59    psLogMsg("psphot", PS_LOG_MINUTIA, "smooth weight: %f sec\n", psTimerMark("psphot.smooth"));
    6060
    6161    psImage *mask = readout->mask;
    … …  
    116116        }
    117117    }
    118     psLogMsg ("psphot", PS_LOG_INFO, "built smoothed signficance image: %f sec\n", psTimerMark("smooth"));
     118    psLogMsg ("psphot", PS_LOG_INFO, "built smoothed signficance image: %f sec\n", psTimerMark("psphot.smooth"));
    119119
    120120    // optionally save example images under trace

  • trunk/psphot/src/psphotSkyReplace.c

    r13411 r20453  
    55bool psphotSkyReplace (pmConfig *config, const pmFPAview *view) {
    66
    7     psTimerStart ("psphot");
     7    psTimerStart ("psphot.skyreplace");
    88
    99    // find the currently selected readout
    … …  
    2828        }
    2929    }
    30     psLogMsg ("psphot.sky", PS_LOG_DETAIL, "replace background flux : %f sec\n", psTimerMark ("psphot"));
     30    psLogMsg ("psphot.sky", PS_LOG_DETAIL, "replace background flux : %f sec\n", psTimerMark ("psphot.skyreplace"));
    3131    return true;
    3232}

  • trunk/psphot/src/psphotSourceSize.c

    r20255 r20453  
    1515    bool status;
    1616
    17     psTimerStart ("psphot");
     17    psTimerStart ("psphot.size");
    1818
    1919    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
    … …  
    228228
    229229    psLogMsg ("psphot.size", PS_LOG_INFO, "measure source sizes for %ld sources: %f sec\n",
    230               sources->n - first, psTimerMark ("psphot"));
     230              sources->n - first, psTimerMark ("psphot.size"));
    231231
    232232    psphotVisualPlotSourceSize (sources);

  • trunk/psphot/src/psphotSourceStats.c

    r19910 r20453  
    77    float BIG_RADIUS;
    88
    9     psTimerStart ("psphot");
     9    psTimerStart ("psphot.stats");
    1010
    1111    // bit-masks to test for good/bad pixels
    … …  
    119119    }
    120120
    121     psLogMsg ("psphot", PS_LOG_INFO, "%ld sources, %d moments, %d failed: %f sec\n", sources->n, Nmoments, Nfail, psTimerMark ("psphot"));
     121    psLogMsg ("psphot", PS_LOG_INFO, "%ld sources, %d moments, %d failed: %f sec\n", sources->n, Nmoments, Nfail, psTimerMark ("psphot.stats"));
    122122
    123123    psphotVisualShowMoments (sources);

  • trunk/psphot/src/psphotSubtractBackground.c

    r18836 r20453  
    1010    pmReadout *backSub = NULL;
    1111
    12     psTimerStart ("psphot");
     12    psTimerStart ("psphot.background");
    1313
    1414    // find the currently selected readout
    … …  
    6363    }
    6464
    65     psLogMsg ("psphot", PS_LOG_MINUTIA, "build resampled image: %f sec\n", psTimerMark ("psphot"));
     65    psLogMsg ("psphot", PS_LOG_MINUTIA, "build resampled image: %f sec\n", psTimerMark ("psphot.background"));
    6666
    6767    // back-sub image pixels, from output background file (don't create if not requested)
    … …  
    105105        psphotSaveImage (NULL, image, name);
    106106    }
    107     psLogMsg ("psphot", PS_LOG_INFO, "subtracted background model: %f sec\n", psTimerMark ("psphot"));
     107    psLogMsg ("psphot", PS_LOG_INFO, "subtracted background model: %f sec\n", psTimerMark ("psphot.background"));
    108108
    109109    // the pmReadout selected in this function are all view on entries in config->files
Note: See TracChangeset for help on using the changeset viewer.