Index: trunk/psModules/src/objects/pmSource.h
===================================================================
--- trunk/psModules/src/objects/pmSource.h	(revision 19906)
+++ 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 <pslib.h>
+#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