Index: trunk/psModules/src/objects/pmFootprint.h =================================================================== --- trunk/psModules/src/objects/pmFootprint.h (revision 20937) +++ trunk/psModules/src/objects/pmFootprint.h (revision 20945) @@ -3,6 +3,6 @@ * @author RHL, Princeton & IfA; EAM, IfA * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2008-08-01 00:00:17 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-12-09 21:16:09 $ * Copyright 2006 Institute for Astronomy, University of Hawaii */ @@ -10,4 +10,9 @@ #ifndef PM_FOOTPRINT_H #define PM_FOOTPRINT_H + +#include +#include "pmSpan.h" + + typedef struct { const int id; //!< unique ID @@ -17,5 +22,5 @@ psArray *peaks; //!< the peaks lying in this footprint psRegion region; //!< A region describing the psImage the footprints live in - bool normalized; //!< Are the spans sorted? + bool normalized; //!< Are the spans sorted? } pmFootprint; @@ -27,8 +32,8 @@ void pmFootprintSetBBox(pmFootprint *fp); -pmSpan *pmFootprintAddSpan(pmFootprint *fp, // the footprint to add to - const int y, // row to add - int x0, // range of - int x1); // columns +pmSpan *pmFootprintAddSpan(pmFootprint *fp, // the footprint to add to + const int y, // row to add + int x0, // range of + int x1); // columns psArray *pmFootprintsFind(const psImage *img, const float threshold, const int npixMin); @@ -45,6 +50,6 @@ psImage *pmSetFootprintID(psImage *idImage, const pmFootprint *fp, const int id); void pmSetFootprintArrayIDsForImage(psImage *idImage, - const psArray *footprints, // the footprints to insert - const bool relativeIDs); // show IDs starting at 0, not pmFootprint->id + const psArray *footprints, // the footprints to insert + const bool relativeIDs); // show IDs starting at 0, not pmFootprint->id psErrorCode pmFootprintsAssignPeaks(psArray *footprints, const psArray *peaks); Index: trunk/psModules/src/objects/pmModel.h =================================================================== --- trunk/psModules/src/objects/pmModel.h (revision 20937) +++ trunk/psModules/src/objects/pmModel.h (revision 20945) @@ -5,6 +5,6 @@ * @author EAM, IfA * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2008-04-08 18:33:16 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-12-09 21:16:09 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -13,4 +13,7 @@ # ifndef PM_MODEL_H # define PM_MODEL_H + +#include +#include "pmPSF.h" /// @addtogroup Objects Object Detection / Analysis Functions @@ -87,6 +90,6 @@ float chisq; ///< Fit chi-squared. float chisqNorm; ///< re-normalized fit chi-squared. - float mag; ///< integrated model magnitude - float magErr; ///< integrated model magnitude error + float mag; ///< integrated model magnitude + float magErr; ///< integrated model magnitude error int nDOF; ///< number of degrees of freedom int nIter; ///< number of iterations to reach min Index: trunk/psModules/src/objects/pmPSF.h =================================================================== --- trunk/psModules/src/objects/pmPSF.h (revision 20937) +++ trunk/psModules/src/objects/pmPSF.h (revision 20945) @@ -6,6 +6,6 @@ * @author EAM, IfA * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2007-11-27 03:14:57 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-12-09 21:16:09 $ * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ @@ -13,4 +13,10 @@ # ifndef PM_PSF_H # define PM_PSF_H + +#include +#include "pmTrend2D.h" +#include "pmGrowthCurve.h" +#include "pmResiduals.h" +#include "pmFPA.h" /// @addtogroup Objects Object Detection / Analysis Functions Index: trunk/psModules/src/objects/pmPeaks.h =================================================================== --- trunk/psModules/src/objects/pmPeaks.h (revision 20937) +++ trunk/psModules/src/objects/pmPeaks.h (revision 20945) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2008-12-08 02:51:14 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-12-09 21:16:09 $ * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ @@ -17,4 +17,7 @@ # ifndef PM_PEAKS_H # define PM_PEAKS_H + +#include +#include "pmFootprint.h" /// @addtogroup Objects Object Detection / Analysis Functions @@ -59,6 +62,6 @@ float SN; ///< S/N implied by detection level bool assigned; ///< is peak assigned to a source? - pmPeakType type; ///< Description of peak. - pmFootprint *footprint; ///< reference to containing footprint + pmPeakType type; ///< Description of peak. + pmFootprint *footprint; ///< reference to containing footprint } pmPeak; Index: trunk/psModules/src/objects/pmSource.h =================================================================== --- trunk/psModules/src/objects/pmSource.h (revision 20937) +++ trunk/psModules/src/objects/pmSource.h (revision 20945) @@ -3,6 +3,6 @@ * @author EAM, IfA; GLG, MHPCC * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2008-10-06 13:05:13 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-12-09 21:16:09 $ * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ @@ -11,5 +11,9 @@ # define PM_SOURCE_H -# include "pmSourceExtendedPars.h" +#include +#include "pmPeaks.h" +#include "pmModel.h" +#include "pmMoments.h" +#include "pmSourceExtendedPars.h" /// @addtogroup Objects Object Detection / Analysis Functions @@ -24,9 +28,9 @@ */ typedef enum { - PM_SOURCE_TYPE_UNKNOWN, ///< not yet classified - PM_SOURCE_TYPE_DEFECT, ///< a cosmic-ray - PM_SOURCE_TYPE_SATURATED, ///< random saturated pixels (eg, bleed trails) - PM_SOURCE_TYPE_STAR, ///< a good-quality star (subtracted model is PSF) - PM_SOURCE_TYPE_EXTENDED, ///< an extended object (eg, galaxy) (subtracted model is EXT) + PM_SOURCE_TYPE_UNKNOWN, ///< not yet classified + PM_SOURCE_TYPE_DEFECT, ///< a cosmic-ray + PM_SOURCE_TYPE_SATURATED, ///< random saturated pixels (eg, bleed trails) + PM_SOURCE_TYPE_STAR, ///< a good-quality star (subtracted model is PSF) + PM_SOURCE_TYPE_EXTENDED, ///< an extended object (eg, galaxy) (subtracted model is EXT) } pmSourceType; @@ -59,11 +63,11 @@ * XXX do I have to re-organize this (again!) to allow an arbitrary set of extended model fits?? * XXX put the Mag and Err inside the pmModel? - * XXX keep the modelEXT or add to the psArray - * + * XXX keep the modelEXT or add to the psArray + * * */ struct pmSource { const int id; ///< Unique ID for object - int seq; ///< ID for output (generated on write) + int seq; ///< ID for output (generated on write) pmPeak *peak; ///< Description of peak pixel. psImage *pixels; ///< Rectangular region including object pixels. @@ -76,8 +80,8 @@ pmModel *modelPSF; ///< PSF Model fit (parameters and type) pmModel *modelEXT; ///< EXT Model fit used for subtraction (parameters and type) - psArray *modelFits; ///< collection of extended source models (best == modelEXT) + psArray *modelFits; ///< collection of extended source models (best == modelEXT) pmSourceType type; ///< Best identification of object. pmSourceMode mode; ///< analysis flags set for object. - psArray *blends; ///< collection of sources thought to be confused with object + psArray *blends; ///< collection of sources thought to be confused with object float psfMag; ///< calculated from flux in modelPSF float extMag; ///< calculated from flux in modelEXT @@ -85,5 +89,5 @@ float apMag; ///< apMag corresponding to psfMag or extMag (depending on type) float pixWeight; ///< model-weighted coverage of valid pixels - float psfChisq; ///< probability of PSF + float psfChisq; ///< probability of PSF float crNsigma; ///< Nsigma deviation from PSF to CR float extNsigma; ///< Nsigma deviation from PSF to EXT @@ -186,5 +190,5 @@ */ pmPSFClump pmSourcePSFClump( - psRegion *region, ///< restrict measurement to specified region + psRegion *region, ///< restrict measurement to specified region psArray *source, ///< The input pmSource psMetadata *metadata ///< Contains classification parameters @@ -202,5 +206,5 @@ */ bool pmSourceRoughClass( - psRegion *region, ///< restrict measurement to specified region + psRegion *region, ///< restrict measurement to specified region psArray *sources, ///< The input pmSources psMetadata *metadata, ///< Contains classification parameters Index: trunk/psModules/src/objects/pmSpan.h =================================================================== --- trunk/psModules/src/objects/pmSpan.h (revision 20937) +++ trunk/psModules/src/objects/pmSpan.h (revision 20945) @@ -3,6 +3,6 @@ * @author EAM, IfA * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2008-08-01 00:00:17 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2008-12-09 21:16:09 $ * Copyright 2006 Institute for Astronomy, University of Hawaii */ @@ -10,4 +10,6 @@ # ifndef PM_SPAN_H # define PM_SPAN_H + +#include /// @addtogroup Objects Object Detection / Analysis Functions