Index: trunk/psModules/src/pmObjects.h
===================================================================
--- trunk/psModules/src/pmObjects.h	(revision 3089)
+++ trunk/psModules/src/pmObjects.h	(revision 3498)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-25 02:45:43 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-24 22:36:52 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28,5 +28,6 @@
     PM_PEAK_LONE,           // Isolated peak.
     PM_PEAK_EDGE,           // Peak on edge.
-    PM_PEAK_FLAT            // Peak has equal-value neighbors.
+    PM_PEAK_FLAT,           // Peak has equal-value neighbors.
+    PM_PEAK_UNDEF           // Undefined.
 } psPeakType;
 
@@ -60,5 +61,6 @@
     PS_MODEL_WAUSS,
     PS_MODEL_SERSIC,
-    PS_MODEL_SERSIC_CORE
+    PS_MODEL_SERSIC_CORE,
+    PS_MODEL_UNDEFINED
 } psModelType;
 
@@ -75,10 +77,12 @@
 // XXX: What is this enum?
 typedef enum {
-    PS_SOURCE_TYPE_1,
-    PS_SOURCE_TYPE_2,
-    PS_SOURCE_TYPE_3,
-    PS_SOURCE_TYPE_4,
-    PS_SOURCE_TYPE_5,
-    PS_SOURCE_TYPE_6
+    PS_SOURCE_PSFSTAR,
+    PS_SOURCE_GALAXY,
+    PS_SOURCE_DEFECT,
+    PS_SOURCE_SATURATED,
+    PS_SOURCE_SATSTAR,
+    PS_SOURCE_FAINTSTAR,
+    PS_SOURCE_BRIGHTSTAR,
+    PS_SOURCE_OTHER
 } psSourceType;
 
@@ -94,4 +98,11 @@
 psSource;
 
+psPeak *pmPeakAlloc(psS32 x,
+                    psS32 y,
+                    psF32 counts,
+                    psPeakType class);
+psMoments *pmMomentsAlloc();
+psModel *pmModelAlloc(psModelType type);
+psSource *pmSourceAlloc();
 
 /******************************************************************************
@@ -131,4 +142,5 @@
 psSource *pmSourceLocalSky(const psImage *image,
                            const psPeak *peak,
+                           psStatsOptions statsOptions,
                            psF32 innerRadius,
                            psF32 outerRadius);
@@ -137,17 +149,12 @@
  *****************************************************************************/
 psSource *pmSourceMoments(psSource *source,
-                          const psImage *image,
                           psF32 radius);
 
 /******************************************************************************
-pmSourceRoughClass(source, saturate, SNlim, valid): make a guessat the source
-classification.
- *****************************************************************************/
-psSource *pmSourceRoughClass(psSource *source,
-                             psF32 saturate,
-                             float SNlim,
-                             const psRegion *valid);
-
-
+pmSourceRoughClass(pmArray *source, psMetaDeta *metadata): make a guess at the
+source classification.
+ *****************************************************************************/
+bool pmSourceRoughClass(psArray *source,
+                        psMetadata *metadata);
 /******************************************************************************
 pmSourceSetPixelCircle(source, image, radius)
@@ -161,5 +168,6 @@
  *****************************************************************************/
 bool pmSourceModelGuess(psSource *source,
-                        const psImage *image);
+                        const psImage *image,
+                        psModelType model);
 
 /******************************************************************************
@@ -183,5 +191,7 @@
 /******************************************************************************
  *****************************************************************************/
-bool pmSourceSubModel(psSource *source);
+bool pmSourceSubModel(psImage *image,
+                      psSource *source,
+                      bool center);
 
 /******************************************************************************