Index: trunk/psphot/src/pmObjects_EAM.h
===================================================================
--- trunk/psphot/src/pmObjects_EAM.h	(revision 4954)
+++ trunk/psphot/src/pmObjects_EAM.h	(revision 4977)
@@ -5,6 +5,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-07 03:33:01 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-08 04:32:40 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22,22 +22,18 @@
 #include<math.h>
 #include "pslib.h"
-
-// XXX EAM : this function should be added to psLib
-int          psImageCountPixelMask (psImage *mask, psU8 value);
-
-// XXX EAM : bug : missing from psLib/*.h
-bool psMinimizeGaussNewtonDelta (psVector *delta,
-                                 const psVector *params,
-                                 const psVector *paramMask,
-                                 const psArray  *x,
-                                 const psVector *y,
-                                 const psVector *yErr,
-                                 psMinimizeLMChi2Func func);
-
-// XXX EAM : switch to psPoly when ready
-psF64	        Polynomial2DEval(const psPolynomial2D* myPoly, psF64 x, psF64 y);
-
-// XXX EAM : psEllipse needs to be be included in psLib
-# include "psEllipse.h"
+#include "psLibUtils.h"
+// #include "pmModelGroup.h"
+
+// defined mask values for mask image pixels.
+// this is probably a bad solution: we will want to set mask values
+// outside of the PSPHOT code.  Perhaps we can set up a registered 
+// set of mask values with specific meanings that other functions
+// can add to or define?
+enum {
+    PSPHOT_MASK_CLEAR     = 0x00,
+    PSPHOT_MASK_INVALID   = 0x01,
+    PSPHOT_MASK_SATURATED = 0x02,
+    PSPHOT_MASK_MARKED    = 0x08,
+} psphotMaskValues;
 
 /** pmPeakType
@@ -91,6 +87,4 @@
 } pmMoments;
 
-typedef int pmModelType;
-
 /** pmPSFClump data structure
  *  
@@ -105,4 +99,6 @@
     float dY;
 } pmPSFClump;
+
+typedef int pmModelType;
 
 /** pmModel data structure
@@ -169,18 +165,4 @@
 pmSource;
 
-/** pmPSF data structure
- *  
- *  
- *  
- */
-typedef struct
-{
-    pmModelType type;			///< PSF Model in use
-    psArray *params;			///< Model parameters (psPolynomial2D)
-    float chisq;			///< PSF goodness statistic
-    int nPSFstars;			///< number of stars used to measure PSF
-}
-pmPSF;
-
 pmPeak *pmPeakAlloc(
     int x,				///< Row-coordinate in image space
@@ -316,100 +298,3 @@
 );
 
-/**
- * 
- *  The object model functions are defined to allow for the flexible addition
- *  of new object models. Every object model, with parameters represented by
- *  pmModel, has an associated set of functions which provide necessary support
- *  operations. A set of abstract functions allow the programmer to select the
- *  approriate function or property for a specific named object model.
- * 
- */
-
-/**
- * 
- *  This function is the model chi-square minimization function for this model.
- * 
- */
-typedef psMinimizeLMChi2Func pmModelFunc;
-
-
-/**
- * 
- * This function returns the integrated flux for the given model parameters.
- */
-typedef psF64 (*pmModelFlux)(const psVector *params);
-
-
-/**
- * 
- *  This function returns the radius at which the given model and parameters
- *  achieves the given flux.
- * 
- */
-typedef psF64 (*pmModelRadius)(const psVector *params, double flux);
-
-/**
- * 
- *  This function sets the model parameter limits vectors for the given model
- * 
- */
-typedef bool (*pmModelLimits)(psVector **beta_lim, psVector **params_min, psVector **params_max);
-
-/**
- * 
- *  This function provides the model guess parameters based on the details of
- *   the given source.
- * 
- */
-typedef bool (*pmModelGuessFunc)(pmModel *model, pmSource *source);
-
-
-/**
- * 
- *  This function constructs the PSF model for the given source based on the
- *  supplied psf and the FLT model for the object.
- * 
- */
-typedef bool (*pmModelFromPSFFunc)(pmModel *modelPSF, pmModel *modelFLT, pmPSF *psf);
-
-
-/**
- * 
- *  This function returns the success / failure status of the given model fit
- * 
- */
-typedef bool (*pmModelFitStatusFunc)(pmModel *model);
-
-/**
- * 
- *  Each of the function types above has a corresponding function which returns
- *  the function given the model type:
- * 
- */
-pmModelFunc          pmModelFunc_GetFunction (pmModelType type);
-pmModelFlux          pmModelFlux_GetFunction (pmModelType type);
-pmModelRadius        pmModelRadius_GetFunction (pmModelType type);
-pmModelLimits        pmModelLimits_GetFunction (pmModelType type);
-pmModelGuessFunc     pmModelGuessFunc_GetFunction (pmModelType type);
-pmModelFromPSFFunc   pmModelFromPSFFunc_GetFunction (pmModelType type);
-pmModelFitStatusFunc pmModelFitStatusFunc_GetFunction (pmModelType type);
-
-// pmModelGroup utility functions
-int                  pmModelParameterCount (pmModelType type);
-char                *pmModelGetType (pmModelType type);
-pmModelType          pmModelSetType (char *name);
-
-// structure to carry model group functions
-typedef struct {
-    char *name;
-    int nParams;
-    pmModelFunc          modelFunc;
-    pmModelFlux          modelFlux;
-    pmModelRadius        modelRadius;
-    pmModelLimits        modelLimits;
-    pmModelGuessFunc     modelGuessFunc;
-    pmModelFromPSFFunc   modelFromPSFFunc;
-    pmModelFitStatusFunc modelFitStatusFunc;
-} pmModelGroup;
-
 #endif