IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 9813


Ignore:
Timestamp:
Oct 31, 2006, 9:40:34 AM (20 years ago)
Author:
eugene
Message:

changed name of radiusTMP to radiusFit in pmModel

Location:
trunk/psphot/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psphot/src/psphotEnsemblePSF.c

    r9771 r9813  
    123123        // fill in the model pixel values
    124124        psImageInit (flux, 0.0);
    125         psImageKeepCircle (mask, x, y, model->radiusTMP, "OR", PM_MASK_MARK);
     125        psImageKeepCircle (mask, x, y, model->radiusFit, "OR", PM_MASK_MARK);
    126126        pmModelAdd (flux, mask, model, false, false);
    127 
    128         // XXX test output line
    129         if ((fabs(x - 298) < 2) && (fabs(y - 583) < 2)) {
    130             psphotSaveImage (NULL, inSource->pixels, "weird.obj.fits");
    131             psphotSaveImage (NULL, flux, "weird.mod.fits");
    132         }
    133127
    134128        // calculate nDOF (nPix - 1)
    … …  
    224218        y = model->params->data.F32[PM_PAR_YPOS];
    225219
    226         psImageKeepCircle (Fi->mask, x, y, model->radiusTMP, "OR", PM_MASK_MARK);
     220        psImageKeepCircle (Fi->mask, x, y, model->radiusFit, "OR", PM_MASK_MARK);
    227221        pmSourceChisq (model, Fi->pixels, Fi->mask, Fi->weight);
    228         psImageKeepCircle (Fi->mask, x, y, model->radiusTMP, "AND", PS_NOT_U8(PM_MASK_MARK));
     222        psImageKeepCircle (Fi->mask, x, y, model->radiusFit, "AND", PS_NOT_U8(PM_MASK_MARK));
    229223    }
    230224

  • trunk/psphot/src/psphotRadiusChecks.c

    r9270 r9813  
    2424
    2525    // set the fit radius based on the object flux limit and the model
    26     model->radiusTMP = (RADIUS_TYPE) (modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + PSF_FIT_PADDING);
    27     if (isnan(model->radiusTMP)) psAbort ("apply_psf_model", "error in radius");
     26    model->radiusFit = (RADIUS_TYPE) (modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + PSF_FIT_PADDING);
     27    if (isnan(model->radiusFit)) psAbort ("apply_psf_model", "error in radius");
    2828       
    2929    if (source->mode & PM_SOURCE_MODE_SATSTAR) {
    30         model->radiusTMP *= 2;
     30        model->radiusFit *= 2;
    3131    }
    3232
    33     bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusTMP);
     33    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusFit);
    3434    return status;
    3535}
    … …  
    4141
    4242    // set the fit radius based on the object flux limit and the model
    43     model->radiusTMP = (RADIUS_TYPE) (modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING);
    44     if (isnan(model->radiusTMP)) psAbort ("apply_psf_model", "error in radius");
     43    model->radiusFit = (RADIUS_TYPE) (modelRadiusPSF (model->params, PSF_FIT_NSIGMA*moments->dSky) + dR + PSF_FIT_PADDING);
     44    if (isnan(model->radiusFit)) psAbort ("apply_psf_model", "error in radius");
    4545       
    4646    if (source->mode &  PM_SOURCE_MODE_SATSTAR) {
    47         model->radiusTMP *= 2;
     47        model->radiusFit *= 2;
    4848    }
    4949
    50     bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusTMP);
     50    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusFit);
    5151    return status;
    5252}
    … …  
    7474
    7575    // set the fit radius based on the object flux limit and the model
    76     model->radiusTMP = (RADIUS_TYPE) (modelRadiusEXT (model->params, EXT_FIT_NSIGMA*moments->dSky) + EXT_FIT_PADDING);
    77     if (isnan(model->radiusTMP)) psAbort (__func__, "error in radius");
     76    model->radiusFit = (RADIUS_TYPE) (modelRadiusEXT (model->params, EXT_FIT_NSIGMA*moments->dSky) + EXT_FIT_PADDING);
     77    if (isnan(model->radiusFit)) psAbort (__func__, "error in radius");
    7878
    7979    // redefine the pixels if needed
    80     bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusTMP);
     80    bool status = pmSourceRedefinePixels (source, readout, model->params->data.F32[2], model->params->data.F32[3], model->radiusFit);
    8181    return status;
    8282}

  • trunk/psphot/src/psphotSourceFits.c

    r9734 r9813  
    6060
    6161    // fit PSF model (set/unset the pixel mask)
    62     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_MASK_MARK);
     62    psImageKeepCircle (source->mask, x, y, PSF->radiusFit, "OR", PM_MASK_MARK);
    6363    pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF);
    64     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", PS_NOT_U8(PM_MASK_MARK));
     64    psImageKeepCircle (source->mask, x, y, PSF->radiusFit, "AND", PS_NOT_U8(PM_MASK_MARK));
    6565
    6666    // correct model chisq for flux trend
    … …  
    126126
    127127    // fit PSF model (set/unset the pixel mask)
    128     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_MASK_MARK);
     128    psImageKeepCircle (source->mask, x, y, PSF->radiusFit, "OR", PM_MASK_MARK);
    129129    pmSourceFitModel (source, PSF, PM_SOURCE_FIT_PSF);
    130     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", PS_NOT_U8(PM_MASK_MARK));
     130    psImageKeepCircle (source->mask, x, y, PSF->radiusFit, "AND", PS_NOT_U8(PM_MASK_MARK));
    131131
    132132    // correct model chisq for flux trend
    … …  
    317317
    318318    // fit PSF model (set/unset the pixel mask)
    319     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_MASK_MARK);
     319    psImageKeepCircle (source->mask, x, y, PSF->radiusFit, "OR", PM_MASK_MARK);
    320320    pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF);
    321     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", PS_NOT_U8(PM_MASK_MARK));
     321    psImageKeepCircle (source->mask, x, y, PSF->radiusFit, "AND", PS_NOT_U8(PM_MASK_MARK));
    322322
    323323    return (modelSet);
    … …  
    342342
    343343    // fit EXT (not PSF) model (set/unset the pixel mask)
    344     psImageKeepCircle (source->mask, x, y, EXT->radiusTMP, "OR", PM_MASK_MARK);
     344    psImageKeepCircle (source->mask, x, y, EXT->radiusFit, "OR", PM_MASK_MARK);
    345345    pmSourceFitModel (source, EXT, PM_SOURCE_FIT_EXT);
    346     psImageKeepCircle (source->mask, x, y, EXT->radiusTMP, "AND", PS_NOT_U8(PM_MASK_MARK));
     346    psImageKeepCircle (source->mask, x, y, EXT->radiusFit, "AND", PS_NOT_U8(PM_MASK_MARK));
    347347
    348348    return (EXT);

  • trunk/psphot/src/psphotWeightBias.c

    r9595 r9813  
    6060
    6161        // fit PSF model (set/unset the pixel mask)
    62         psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_MASK_MARK);
     62        psImageKeepCircle (source->mask, x, y, PSF->radiusFit, "OR", PM_MASK_MARK);
    6363        pmSourceFitModel (source, PSF, PM_SOURCE_FIT_NORM);
    64         psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", PS_NOT_U8(PM_MASK_MARK));
     64        psImageKeepCircle (source->mask, x, y, PSF->radiusFit, "AND", PS_NOT_U8(PM_MASK_MARK));
    6565
    6666        // re-subtract PSF for object, leave local sky
Note: See TracChangeset for help on using the changeset viewer.