IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 30166


Ignore:
Timestamp:
Dec 24, 2010, 3:19:26 PM (15 years ago)
Author:
eugene
Message:

change psphotVisualShowResidualImage API; revert pmSourceRedefinePixels API; replace pmSourceCopyData with pmSourceCopy

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

Legend:

Unmodified
Added
Removed

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

    r29936 r30166  
    187187    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);
    188188
    189     psphotVisualShowResidualImage (readout);
     189    psphotVisualShowResidualImage (readout, false);
     190    psphotVisualShowObjectRegions (readout, recipe, sources);
    190191    psphotVisualShowFlags (sources);
    191192

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

    r30140 r30166  
    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, false);
     135        pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius);
    136136
    137137        // if we request any of these measurements, we require the radial profile
    … …  
    173173    psLogMsg ("psphot", PS_LOG_INFO, "  %d kron\n", Nkron);
    174174
    175     psphotVisualShowResidualImage (readout);
     175    psphotVisualShowResidualImage (readout, false);
    176176
    177177    if (doPetrosian) {

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

    r30140 r30166  
    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, false);
     116            pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius);
    117117
    118118            // if we request any of these measurements, we require the radial profile

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

    r30142 r30166  
    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, false);
     121        pmSourceRedefinePixels (source, readout, source->peak->xf, source->peak->yf, 1.5*radius);
    122122
    123123        if (!psphotRadialApertureSource (source, recipe, skynoise, maskVal, radMax, 0)) {
    … …  
    142142        radialAperSet = source->parent->radialAper;
    143143    }
    144 
     144    psAssert(radialAperSet, "this should be defined before calling");
    145145    psAssert(radialAperSet->data[entry] == NULL, "why is this already defined?");
    146146

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

    r30140 r30166  
    7777    source->apRadius = PSF_APERTURE;
    7878
    79     bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius, false);
     79    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
    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, false);
     117    bool status = pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
    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, false);
     174    pmSourceRedefinePixels (source, readout, peak->xf, peak->yf, rawRadius);
    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, false);
     201    pmSourceRedefinePixels (source, readout, PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], model->fitRadius);
    202202
    203203    // set the mask to flag the excluded pixels

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

    r29548 r30166  
    365365
    366366    // copy most data from the primary source (modelEXT, blends stay NULL)
    367     pmSource *newSrc = pmSourceCopyData (source);
     367    pmSource *newSrc = pmSourceCopy (source);
    368368    newSrc->modelPSF = psMemIncrRefCounter (DBL->data[1]);
    369369
    … …  
    385385            psLogMsg ("psphot", 1, "PAR %d : %f +/- %f\n", i, source->modelPSF->params->data.F32[i], source->modelPSF->dparams->data.F32[i]);
    386386        }
    387         psphotVisualShowResidualImage (readout);
     387        psphotVisualShowResidualImage (readout, false);
    388388    }
    389389# endif
Note: See TracChangeset for help on using the changeset viewer.