IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28909


Ignore:
Timestamp:
Aug 13, 2010, 12:18:27 PM (16 years ago)
Author:
eugene
Message:

add pixWeightNotPoor, change pixWeight to pixWeightNotBad

Location:
branches/eam_branches/ipp-20100621/psModules/src/objects
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSource.c

    r28860 r28909  
    140140    source->sky    = NAN;
    141141    source->skyErr = NAN;
    142     source->pixWeight = NAN;
     142    source->pixWeightNotBad = NAN;
     143    source->pixWeightNotPoor = NAN;
    143144
    144145    source->psfChisq = NAN;

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSource.h

    r28904 r28909  
    7777    float apRadius;                     ///< radius for aperture magnitude
    7878
    79     float psfWeightNotBad;              ///< PSF-weighted coverage of unmasked (not BAD) pixels
    80     float psfWeightNotPoor;             ///< PSF-weighted coverage of unmasked (not POOR) pixels
     79    float pixWeightNotBad;              ///< PSF-weighted coverage of unmasked (not BAD) pixels
     80    float pixWeightNotPoor;             ///< PSF-weighted coverage of unmasked (not POOR) pixels
    8181
    8282    float psfChisq;                     ///< probability of PSF

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c

    r28860 r28909  
    202202        psMetadataAdd (row, PS_LIST_TAIL, "PSF_MINOR",        PS_DATA_F32, "PSF width (minor axis)",                     axes.minor);
    203203        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    204         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     204        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeightNotBad);
    205205        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NDOF",         PS_DATA_S32, "degrees of freedom",                         nDOF);
    206206        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NPIX",         PS_DATA_S32, "number of pixels in fit",                    nPix);
    … …  
    342342        }
    343343
    344         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     344        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
    345345        source->crNsigma  = psMetadataLookupF32 (&status, row, "CR_NSIGMA");
    346346        source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_DV2.c

    r28860 r28909  
    202202        psMetadataAdd (row, PS_LIST_TAIL, "PSF_MINOR",        PS_DATA_F32, "PSF width (minor axis)",                     axes.minor);
    203203        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    204         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     204        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor (bad)",          source->pixWeightNotBad);
     205        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF_PERFECT",   PS_DATA_F32, "PSF coverage/quality factor (poor)",         source->pixWeightNotPoor);
    205206        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NDOF",         PS_DATA_S32, "degrees of freedom",                         nDOF);
    206207        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NPIX",         PS_DATA_S32, "number of pixels in fit",                    nPix);
    … …  
    348349        }
    349350
    350         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     351        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
     352        source->pixWeightNotPoor = psMetadataLookupF32 (&status, row, "PSF_QF_PERFECT");
    351353        source->crNsigma  = psMetadataLookupF32 (&status, row, "CR_NSIGMA");
    352354        source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c

    r28860 r28909  
    202202        psMetadataAdd (row, PS_LIST_TAIL, "PSF_MINOR",        PS_DATA_F32, "PSF width (minor axis)",                     axes.minor);
    203203        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    204         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     204        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeightNotBad);
    205205        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NDOF",         PS_DATA_S32, "degrees of freedom",                         nDOF);
    206206        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NPIX",         PS_DATA_S32, "number of pixels in fit",                    nPix);
    … …  
    371371        }
    372372
    373         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     373        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
    374374        source->crNsigma  = psMetadataLookupF32 (&status, row, "CR_NSIGMA");
    375375        source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c

    r28860 r28909  
    192192        psMetadataAdd (row, PS_LIST_TAIL, "PSF_MINOR",        PS_DATA_F32, "PSF width (minor axis)",                     axes.minor);
    193193        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    194         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     194        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeightNotBad);
    195195        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NDOF",         PS_DATA_S32, "degrees of freedom",                         nDOF);
    196196        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NPIX",         PS_DATA_S32, "number of pixels in fit",                    nPix);
    … …  
    328328        }
    329329
    330         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     330        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
    331331        source->crNsigma  = psMetadataLookupF32 (&status, row, "CR_NSIGMA");
    332332        source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c

    r28860 r28909  
    191191        psMetadataAdd (row, PS_LIST_TAIL, "PSF_MINOR",        PS_DATA_F32, "PSF width (minor axis)",                     axes.minor);
    192192        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    193         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     193        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeightNotBad);
    194194        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NDOF",         PS_DATA_S32, "degrees of freedom",                         nDOF);
    195195        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NPIX",         PS_DATA_S32, "number of pixels in fit",                    nPix);
    … …  
    333333        }
    334334
    335         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     335        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
    336336        source->crNsigma  = psMetadataLookupF32 (&status, row, "CR_NSIGMA");
    337337        source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_CMF_PS1_V3.c

    r28860 r28909  
    193193        psMetadataAdd (row, PS_LIST_TAIL, "PSF_MINOR",        PS_DATA_F32, "PSF width (minor axis)",                     axes.minor);
    194194        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    195         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     195        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor (bad)",          source->pixWeightNotBad);
     196        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF_PERFECT",   PS_DATA_F32, "PSF coverage/quality factor (poor)",         source->pixWeightNotPoor);
    196197        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NDOF",         PS_DATA_S32, "degrees of freedom",                         nDOF);
    197198        psMetadataAdd (row, PS_LIST_TAIL, "PSF_NPIX",         PS_DATA_S32, "number of pixels in fit",                    nPix);
    … …  
    362363        }
    363364
    364         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     365        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
     366        source->pixWeightNotPoor = psMetadataLookupF32 (&status, row, "PSF_QF_PERFECT");
    365367        source->crNsigma  = psMetadataLookupF32 (&status, row, "CR_NSIGMA");
    366368        source->extNsigma = psMetadataLookupF32 (&status, row, "EXT_NSIGMA");

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_PS1_CAL_0.c

    r28860 r28909  
    188188        psMetadataAdd (row, PS_LIST_TAIL, "PSF_WIDTH_Y",      PS_DATA_F32, "PSF width in y coordinate",                  axes.minor);
    189189        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    190         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     190        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeightNotBad);
    191191
    192192        // XXX not sure how to get this : need to load Nimages with weight?
    … …  
    300300        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    301301
    302         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     302        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
    303303
    304304        // note that some older versions used PSF_PROBABILITY: this was not well defined.

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

    r28860 r28909  
    125125        psMetadataAdd (row, PS_LIST_TAIL, "PSF_WIDTH_Y",      PS_DATA_F32, "PSF width in y coordinate",                  axes.minor);
    126126        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    127         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     127        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeightNotBad);
    128128        // XXX not sure how to get this : need to load Nimages with weight
    129129        psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", nImageOverlap);
    … …  
    226226        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    227227
    228         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     228        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
    229229
    230230        // XXX other values saved but not loaded?

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

    r28860 r28909  
    149149        psMetadataAdd (row, PS_LIST_TAIL, "PSF_WIDTH_Y",      PS_DATA_F32, "PSF width in y coordinate",                  axes.minor);
    150150        psMetadataAdd (row, PS_LIST_TAIL, "PSF_THETA",        PS_DATA_F32, "PSF orientation angle",                      axes.theta);
    151         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
     151        psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeightNotBad);
    152152
    153153        // XXX not sure how to get this : need to load Nimages with weight?
    … …  
    269269        source->peak->yf   = PAR[PM_PAR_YPOS]; // more accurate position
    270270
    271         source->pixWeight = psMetadataLookupF32 (&status, row, "PSF_QF");
     271        source->pixWeightNotBad = psMetadataLookupF32 (&status, row, "PSF_QF");
    272272
    273273        // note that some older versions used PSF_PROBABILITY: this was not well defined.

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_RAW.c

    r28643 r28909  
    128128                 source[0].peak->SN,
    129129                 source[0].apRadius,
    130                  source[0].pixWeight,
     130                 source[0].pixWeightNotBad,
    131131                 model[0].nDOF,
    132132                 model[0].nIter);
    … …  
    190190                 source[0].peak->SN,
    191191                 source[0].apRadius,
    192                  source[0].pixWeight,
     192                 source[0].pixWeightNotBad,
    193193                 model[0].nDOF,
    194194                 model[0].nIter);

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceIO_SMPDATA.c

    r28643 r28909  
    114114        psMetadataAdd (row, PS_LIST_TAIL, "THETA",   PS_DATA_F32, "", axes.theta);
    115115        psMetadataAdd (row, PS_LIST_TAIL, "DOPHOT",  PS_DATA_U8,  "", type);
    116         psMetadataAdd (row, PS_LIST_TAIL, "WEIGHT",  PS_DATA_U8,  "", PS_MIN (255, PS_MAX(0, 255*source->pixWeight)));
     116        psMetadataAdd (row, PS_LIST_TAIL, "WEIGHT",  PS_DATA_U8,  "", PS_MIN (255, PS_MAX(0, 255*source->pixWeightNotBad)));
    117117        psMetadataAdd (row, PS_LIST_TAIL, "DUMMY",   PS_DATA_U16, "", 0);
    118118
    … …  
    197197        source->apMag  = psMetadataLookupF32 (&status, row, "MAG_AP")  - ZERO_POINT;
    198198
    199         source->pixWeight = psMetadataLookupU8 (&status, row, "WEIGHT")/255.0;
     199        source->pixWeightNotBad = psMetadataLookupU8 (&status, row, "WEIGHT")/255.0;
    200200        int dophot = psMetadataLookupU8 (&status, row, "DOPHOT");
    201201        pmSourceSetDophotType (source, dophot);

  • branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourcePhotometry.c

    r28904 r28909  
    209209    // if the aper mag is NAN, the flux < 0.  this can happen for sources near the
    210210    // detection limits (esp near bright neighbors)
     211    source->apMag = source->apMagRaw;
    211212    if (isfinite (source->apMag) && isPSF && psf) {
    212213        if (psf->growth && (mode & PM_SOURCE_PHOT_GROWTH)) {
    … …  
    311312bool pmSourcePixelWeight (float *pixWeightNotBad, float *pixWeightNotPoor, pmModel *model, psImage *mask, psImageMaskType maskVal, psImageMaskType markVal)
    312313{
    313     PS_ASSERT_PTR_NON_NULL(pixWeight, false);
     314    PS_ASSERT_PTR_NON_NULL(pixWeightNotBad, false);
     315    PS_ASSERT_PTR_NON_NULL(pixWeightNotPoor, false);
    314316    PS_ASSERT_PTR_NON_NULL(mask, false);
    315317    PS_ASSERT_PTR_NON_NULL(model, false);
Note: See TracChangeset for help on using the changeset viewer.