IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 30140


Ignore:
Timestamp:
Dec 21, 2010, 2:58:29 PM (15 years ago)
Author:
eugene
Message:

add some visualization; modification to pmSourceRedefinePixels API; other minor changes

Location:
branches/eam_branches/ipp-20101205/psphot/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20101205/psphot/src/psphotExtendedSourceAnalysis.c

    r29936 r30140  
    133133        radius = PS_MAX (radius, source->pixels->numRows - source->peak->yf + source->pixels->row0);
    134134        radius = PS_MAX (radius, source->pixels->numCols - source->peak->xf + source->pixels->col0);
    135         pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius);
     135        pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius, false);
    136136
    137137        // if we request any of these measurements, we require the radial profile

  • branches/eam_branches/ipp-20101205/psphot/src/psphotExtendedSourceAnalysisByObject.c

    r30101 r30140  
    114114            radius = PS_MAX (radius, source->pixels->numRows - source->peak->yf + source->pixels->row0);
    115115            radius = PS_MAX (radius, source->pixels->numCols - source->peak->xf + source->pixels->col0);
    116             pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius);
     116            pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius, false);
    117117
    118118            // if we request any of these measurements, we require the radial profile

  • branches/eam_branches/ipp-20101205/psphot/src/psphotFitSourcesLinear.c

    r29936 r30140  
    297297    psLogMsg ("psphot.ensemble", PS_LOG_INFO, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot.linear"));
    298298
     299    psphotVisualShowImage (readout);
    299300    psphotVisualShowResidualImage (readout);
    300301    psphotVisualPlotChisq (sources);

  • branches/eam_branches/ipp-20101205/psphot/src/psphotFitSourcesLinearStack.c

    r29548 r30140  
    176176
    177177    psLogMsg ("psphot.ensemble", PS_LOG_INFO, "measure ensemble of PSFs: %f sec\n", psTimerMark ("psphot.linear"));
    178 
    179178    return true;
    180179}

  • branches/eam_branches/ipp-20101205/psphot/src/psphotMakePSFReadout.c

    r29936 r30140  
    6060    // Use bright stellar objects to measure PSF. If we do not have enough stars to generate
    6161    // the PSF, build one from the SEEING guess and model class
    62     if (!psphotChoosePSF (config, view, filerule)) {
     62    if (!psphotChoosePSF (config, view, filerule, true)) {
    6363        psLogMsg ("psphot", 3, "failure to construct a psf model");
    6464        return psphotReadoutCleanup (config, view, filerule);

  • branches/eam_branches/ipp-20101205/psphot/src/psphotRadialApertures.c

    r30101 r30140  
    119119        radius = PS_MAX (radius, source->pixels->numRows - source->peak->yf + source->pixels->row0);
    120120        radius = PS_MAX (radius, source->pixels->numCols - source->peak->xf + source->pixels->col0);
    121         pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius);
     121        pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius, false);
    122122
    123123        if (!psphotRadialApertureSource (source, recipe, skynoise, maskVal, radMax, 0)) {

  • branches/eam_branches/ipp-20101205/psphot/src/psphotRadialAperturesByObject.c

    r30101 r30140  
    138138            // radius = PS_MAX (radius, source->pixels->numRows - source->peak->yf + source->pixels->row0);
    139139            // radius = PS_MAX (radius, source->pixels->numCols - source->peak->xf + source->pixels->col0);
    140             pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, outerRadius + 2);
     140            pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, outerRadius + 2, false);
    141141
    142142            if (!psphotRadialApertureSource (source, recipe, skynoise, maskVal, radMax, nMatchedPSF)) {

  • branches/eam_branches/ipp-20101205/psphot/src/psphotRadiusChecks.c

    r29936 r30140  
    7777    source->apRadius = PSF_APERTURE;
    7878
    79     bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
     79    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius, false);
    8080
    8181    // set the mask to flag the excluded pixels
    … …  
    115115    source->apRadius = PSF_APERTURE;
    116116
    117     bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
     117    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius, false);
    118118
    119119    // set the mask to flag the excluded pixels
    … …  
    172172
    173173    // redefine the pixels if needed
    174     pmSourceRedefinePixels (source, readout, peak->xf, peak->yf, rawRadius);
     174    pmSourceRedefinePixels (source, readout, peak->xf, peak->yf, rawRadius, false);
    175175
    176176    // set the mask to flag the excluded pixels
    … …  
    199199
    200200    // redefine the pixels if needed
    201     pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
     201    pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius, false);
    202202
    203203    // set the mask to flag the excluded pixels

  • branches/eam_branches/ipp-20101205/psphot/src/psphotReadout.c

    r29936 r30140  
    112112    // use bright stellar objects to measure PSF if we were supplied a PSF for any input file,
    113113    // this step is skipped
    114     if (!psphotChoosePSF (config, view, filerule)) { // pass 1
     114    if (!psphotChoosePSF (config, view, filerule, true)) { // pass 1
    115115        psLogMsg ("psphot", 3, "failure to construct a psf model");
    116116        return psphotReadoutCleanup (config, view, filerule);

  • branches/eam_branches/ipp-20101205/psphot/src/psphotReadoutFindPSF.c

    r29936 r30140  
    4949    }
    5050
    51     if (!psphotChoosePSF(config, view, filerule)) {
     51    if (!psphotChoosePSF(config, view, filerule, true)) {
    5252        psError(PSPHOT_ERR_PSF, false, "Failed to construct a psf model");
    5353        return psphotReadoutCleanup (config, view, filerule);

  • branches/eam_branches/ipp-20101205/psphot/src/psphotStackMatchPSFsUtils.c

    r29548 r30140  
    383383        goto escape;
    384384    }
     385
     386    // save the PSF on the new readout->analysis:
     387    // if (!psMetadataAddPtr (readoutOut->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot psf model", options->psf)) {
     388    //     psError (PSPHOT_ERR_UNKNOWN, false, "problem saving sources on readout");
     389    //     return false;
     390    // }
    385391
    386392    // dumpImage(readoutOut, readoutSrc, index, "conv");

  • branches/eam_branches/ipp-20101205/psphot/src/psphotVisual.c

    r29548 r30140  
    24082408    if (myKapa == -1) return false;
    24092409
    2410     psphotVisualScaleImage (myKapa, readout->image, readout->mask, "resid", 1);
     2410    psphotVisualScaleImage (myKapa, readout->variance, readout->mask, "variance", 1);
     2411    psphotVisualScaleImage (myKapa, readout->image, readout->mask, "resid", 0);
    24112412
    24122413    pmVisualAskUser(NULL);
Note: See TracChangeset for help on using the changeset viewer.