Index: trunk/psModules/src/pmObjects.h
===================================================================
--- trunk/psModules/src/pmObjects.h	(revision 3699)
+++ trunk/psModules/src/pmObjects.h	(revision 3877)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-14 02:42:41 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-10 23:48:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24,8 +24,8 @@
 
 typedef enum {
-    PM_PEAK_LONE  = 0x00000001,           ///< Isolated peak.
-    PM_PEAK_EDGE  = 0x00000002,           ///< Peak on edge.
-    PM_PEAK_FLAT  = 0x00000004,           ///< Peak has equal-value neighbors.
-    PM_PEAK_UNDEF = 0x00000008            ///< Undefined.
+    PM_PEAK_LONE,           ///< Isolated peak.
+    PM_PEAK_EDGE,           ///< Peak on edge.
+    PM_PEAK_FLAT,           ///< Peak has equal-value neighbors.
+    PM_PEAK_UNDEF           ///< Undefined.
 } psPeakType;
 
@@ -54,5 +54,5 @@
 
 typedef enum {
-    PS_MODEL_GAUSS,  ///< Regular 2-D Gaussian
+    PS_MODEL_GAUSS,   ///< Regular 2-D Gaussian
     PS_MODEL_PGAUSS,  ///< Psuedo 2-D Gaussian
     PS_MODEL_TWIST_GAUSS, ///< 2-D Twisted Gaussian
@@ -67,8 +67,9 @@
 {
     psModelType type;       ///< Model to be used.
-    psS32 Nparams;          ///< Number of parameters.
-    psF32 *params;          ///< Paramater values.
-    psF32 *dparams;         ///< Parameter errors.
+    psVector *params;       ///< Paramater values.
+    psVector *dparams;      ///< Parameter errors.
     psF32 chisq;            ///< Fit chi-squared.
+    psS32 nDOF;             ///< number of degrees of freedom
+    psS32 nIter;            ///< number of iterations to reach min
 }
 psModel;
@@ -121,7 +122,7 @@
 value) of all peaks.
  *****************************************************************************/
-psList *pmFindImagePeaks(const psImage *image, ///< The input image where peaks will be found (psF32)
-                         psF32 threshold ///< Threshold above which to find a peak
-                        );
+psArray *pmFindImagePeaks(const psImage *image, ///< The input image where peaks will be found (psF32)
+                          psF32 threshold ///< Threshold above which to find a peak
+                         );
 
 /******************************************************************************
@@ -209,6 +210,7 @@
 /******************************************************************************
 XXX: Why only *x argument?
- *****************************************************************************/
-psF32 pmMinLM_Gauss2D(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
+XXX EAM: psMinimizeLMChi2Func returns psF64, not psF32
+ *****************************************************************************/
+psF64 pmMinLM_Gauss2D(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
                       psVector *params,  ///< A psVector which holds the parameters of this function
                       psVector *x  ///< A psVector which holds the row/col coordinate
@@ -218,5 +220,5 @@
 XXX: Why only *x argument?
  *****************************************************************************/
-psF32 pmMinLM_PsuedoGauss2D(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
+psF64 pmMinLM_PsuedoGauss2D(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
                             psVector *params, ///< A psVector which holds the parameters of this function
                             psVector *x  ///< A psVector which holds the row/col coordinate
@@ -225,5 +227,5 @@
 /******************************************************************************
  *****************************************************************************/
-psF32 pmMinLM_Wauss2D(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
+psF64 pmMinLM_Wauss2D(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
                       psVector *params,  ///< A psVector which holds the parameters of this function
                       psVector *x  ///< A psVector which holds the row/col coordinate
@@ -232,5 +234,5 @@
 /******************************************************************************
  *****************************************************************************/
-psF32 pmMinLM_TwistGauss2D(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
+psF64 pmMinLM_TwistGauss2D(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
                            psVector *params, ///< A psVector which holds the parameters of this function
                            psVector *x  ///< A psVector which holds the row/col coordinate
@@ -239,5 +241,5 @@
 /******************************************************************************
  *****************************************************************************/
-psF32 pmMinLM_Sersic(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
+psF64 pmMinLM_Sersic(psVector *deriv,  ///< A possibly-NULL structure for the output derivatives
                      psVector *params,  ///< A psVector which holds the parameters of this function
                      psVector *x  ///< A psVector which holds the row/col coordinate
@@ -246,5 +248,5 @@
 /******************************************************************************
  *****************************************************************************/
-psF32 pmMinLM_SersicCore(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
+psF64 pmMinLM_SersicCore(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
                          psVector *params, ///< A psVector which holds the parameters of this function
                          psVector *x  ///< A psVector which holds the row/col coordinate
@@ -253,5 +255,5 @@
 /******************************************************************************
  *****************************************************************************/
-psF32 pmMinLM_PsuedoSersic(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
+psF64 pmMinLM_PsuedoSersic(psVector *deriv, ///< A possibly-NULL structure for the output derivatives
                            psVector *params, ///< A psVector which holds the parameters of this function
                            psVector *x  ///< A psVector which holds the row/col coordinate