IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 18, 2006, 9:01:19 PM (20 years ago)
Author:
eugene
Message:

mods to fix mask issues, negative-radius errors, simpsons formula for integral

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psphot/src/psphotSourceFits.c

    r6862 r6900  
    1818
    1919    // fit PSF model (set/unset the pixel mask)
    20     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_SOURCE_MASK_MARKED);
     20    psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_MASK_MARK);
    2121    pmSourceFitModel (source, PSF, PM_SOURCE_FIT_PSF);
    22     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", ~PM_SOURCE_MASK_MARKED);
     22    psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", NOT_U8(PM_MASK_MARK));
    2323   
    2424    // correct model chisq for flux trend
    … …  
    193193
    194194    modelSet = psArrayAlloc (2);
     195    modelSet->n = 0;
    195196
    196197    DBL = pmModelCopy (PSF);
    … …  
    210211
    211212    // fit PSF model (set/unset the pixel mask)
    212     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_SOURCE_MASK_MARKED);
     213    psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_MASK_MARK);
    213214    pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF);
    214     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", ~PM_SOURCE_MASK_MARKED);
     215    psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", NOT_U8(PM_MASK_MARK));
    215216
    216217    return (modelSet);
    … …  
    230231
    231232    // fit EXT (not PSF) model (set/unset the pixel mask)
    232     psImageKeepCircle (source->mask, x, y, EXT->radiusTMP, "OR", PM_SOURCE_MASK_MARKED);
     233    psImageKeepCircle (source->mask, x, y, EXT->radiusTMP, "OR", PM_MASK_MARK);
    233234    pmSourceFitModel (source, EXT, PM_SOURCE_FIT_EXT);
    234     psImageKeepCircle (source->mask, x, y, EXT->radiusTMP, "AND", ~PM_SOURCE_MASK_MARKED);
     235    psImageKeepCircle (source->mask, x, y, EXT->radiusTMP, "AND", NOT_U8(PM_MASK_MARK));
    235236
    236237    return (EXT);
    … …  
    293294
    294295    // fit PSF model (set/unset the pixel mask)
    295     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_SOURCE_MASK_MARKED);
     296    psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "OR", PM_MASK_MARK);
    296297    pmSourceFitSet (source, modelSet, PM_SOURCE_FIT_PSF);
    297     psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", ~PM_SOURCE_MASK_MARKED);
     298    psImageKeepCircle (source->mask, x, y, PSF->radiusTMP, "AND", NOT_U8(PM_MASK_MARK));
    298299
    299300    // correct model chisq for flux trend
Note: See TracChangeset for help on using the changeset viewer.