Index: trunk/psModules/src/objects/pmSource.h =================================================================== --- trunk/psModules/src/objects/pmSource.h (revision 21363) +++ trunk/psModules/src/objects/pmSource.h (revision 21516) @@ -3,6 +3,6 @@ * @author EAM, IfA; GLG, MHPCC * - * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ - * @date $Date: 2009-02-06 02:31:25 $ + * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ + * @date $Date: 2009-02-16 22:30:50 $ * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ @@ -35,23 +35,41 @@ } pmSourceType; +// bit flags to distinguish analysis results typedef enum { - PM_SOURCE_MODE_DEFAULT = 0x0000, ///< - PM_SOURCE_MODE_PSFMODEL = 0x0001, ///< Source fitted with a psf model (linear or non-linear) - PM_SOURCE_MODE_EXTMODEL = 0x0002, ///< Source fitted with an extended-source model - PM_SOURCE_MODE_FITTED = 0x0004, ///< Source fitted with non-linear model (PSF or EXT; good or bad) - PM_SOURCE_MODE_FAIL = 0x0008, ///< Fit (non-linear) failed (non-converge, off-edge, run to zero) - PM_SOURCE_MODE_POOR = 0x0010, ///< Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?) - PM_SOURCE_MODE_PAIR = 0x0020, ///< Source fitted with a double psf - PM_SOURCE_MODE_PSFSTAR = 0x0040, ///< Source used to define PSF model - PM_SOURCE_MODE_SATSTAR = 0x0080, ///< Source model peak is above saturation - PM_SOURCE_MODE_BLEND = 0x0100, ///< Source is a blend with other sourcers - PM_SOURCE_MODE_EXTERNAL = 0x0200, ///< Source based on supplied input position - PM_SOURCE_MODE_BADPSF = 0x0400, ///< Failed to get good estimate of object's PSF - PM_SOURCE_MODE_DEFECT = 0x0800, ///< Source is thought to be a defect - PM_SOURCE_MODE_SATURATED = 0x1000, ///< Source is thought to be saturated pixels (bleed trail) - PM_SOURCE_MODE_CR_LIMIT = 0x2000, ///< Source has crNsigma above limit - PM_SOURCE_MODE_EXT_LIMIT = 0x4000, ///< Source has extNsigma above limit - PM_SOURCE_MODE_SUBTRACTED = 0x8000, ///< XXX this flag is actually only used internally (move) + PM_SOURCE_MODE_DEFAULT = 0x00000000, ///< Initial value: resets all bits + PM_SOURCE_MODE_PSFMODEL = 0x00000001, ///< Source fitted with a psf model (linear or non-linear) + PM_SOURCE_MODE_EXTMODEL = 0x00000002, ///< Source fitted with an extended-source model + PM_SOURCE_MODE_FITTED = 0x00000004, ///< Source fitted with non-linear model (PSF or EXT; good or bad) + PM_SOURCE_MODE_FAIL = 0x00000008, ///< Fit (non-linear) failed (non-converge, off-edge, run to zero) + PM_SOURCE_MODE_POOR = 0x00000010, ///< Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?) + PM_SOURCE_MODE_PAIR = 0x00000020, ///< Source fitted with a double psf + PM_SOURCE_MODE_PSFSTAR = 0x00000040, ///< Source used to define PSF model + PM_SOURCE_MODE_SATSTAR = 0x00000080, ///< Source model peak is above saturation + PM_SOURCE_MODE_BLEND = 0x00000100, ///< Source is a blend with other sourcers + PM_SOURCE_MODE_EXTERNAL = 0x00000200, ///< Source based on supplied input position + PM_SOURCE_MODE_BADPSF = 0x00000400, ///< Failed to get good estimate of object's PSF + PM_SOURCE_MODE_DEFECT = 0x00000800, ///< Source is thought to be a defect + PM_SOURCE_MODE_SATURATED = 0x00001000, ///< Source is thought to be saturated pixels (bleed trail) + PM_SOURCE_MODE_CR_LIMIT = 0x00002000, ///< Source has crNsigma above limit + PM_SOURCE_MODE_EXT_LIMIT = 0x00004000, ///< Source has extNsigma above limit + PM_SOURCE_MODE_MOMENTS_FAILURE = 0x00008000, ///< could not measure the moments + PM_SOURCE_MODE_SKY_FAILURE = 0x00010000, ///< could not measure the local sky + PM_SOURCE_MODE_SKYVAR_FAILURE = 0x00020000, ///< could not measure the local sky variance + PM_SOURCE_MODE_BELOW_MOMENTS_SN = 0x00040000, ///< moments not measured due to low S/N + PM_SOURCE_MODE_BIG_RADIUS = 0x00100000, ///< poor moments for small radius, try large radius + PM_SOURCE_MODE_AP_MAGS = 0x00200000, ///< source has an aperture magnitude + PM_SOURCE_MODE_BLEND_FIT = 0x00400000, ///< source was fitted as a blend + PM_SOURCE_MODE_EXTENDED_FIT = 0x00800000, ///< full extended fit was used + PM_SOURCE_MODE_EXTENDED_STATS = 0x01000000, ///< extended aperture stats calculated + PM_SOURCE_MODE_LINEAR_FIT = 0x02000000, ///< source fitted with the linear fit + PM_SOURCE_MODE_NONLINEAR_FIT = 0x04000000, ///< source fitted with the non-linear fit + PM_SOURCE_MODE_RADIAL_FLUX = 0x08000000, ///< radial flux measurements calculated + PM_SOURCE_MODE_SIZE_SKIPPED = 0x10000000, ///< size could not be determined } pmSourceMode; + +typedef enum { + PM_SOURCE_TMPF_MODEL_GUESS = 0x0001, + PM_SOURCE_TMPF_SUBTRACTED = 0x0002, +} pmSourceTmpF; /** pmSource data structure @@ -68,6 +86,6 @@ */ struct pmSource { - const int id; ///< Unique ID for object - int seq; ///< ID for output (generated on write) + const int id; ///< Unique ID for object (generated on alloc) + int seq; ///< ID for output (generated on write OR set on read) pmPeak *peak; ///< Description of peak pixel. psImage *pixels; ///< Rectangular region including object pixels. @@ -83,4 +101,5 @@ pmSourceType type; ///< Best identification of object. pmSourceMode mode; ///< analysis flags set for object. + pmSourceTmpF tmpFlags; ///< internal-only flags psArray *blends; ///< collection of sources thought to be confused with object float psfMag; ///< calculated from flux in modelPSF @@ -240,6 +259,7 @@ bool pmSourceCachePSF (pmSource *source, psImageMaskType maskVal); -int pmSourceSortBySN (const void **a, const void **b); -int pmSourceSortByY (const void **a, const void **b); +int pmSourceSortBySN (const void **a, const void **b); +int pmSourceSortByY (const void **a, const void **b); +int pmSourceSortBySeq (const void **a, const void **b); pmSourceMode pmSourceModeFromString (const char *name);