Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 4946)
+++ trunk/psphot/src/psphot.h	(revision 4949)
@@ -1,4 +1,6 @@
 # include <pslib.h>
-# include <pmObjects.h>
+// # include <pmObjects.h>
+// my additions and modifications:
+# include "pmObjects_EAM.h"
 # include <string.h>
 # include <strings.h>
@@ -7,5 +9,5 @@
 # include <math.h>
 
-# define  M_PI 3.14159265358979323846264338328      /* pi */
+// # define  M_PI 3.14159265358979323846264338328      /* pi */
 
 typedef struct {
@@ -18,5 +20,5 @@
 // data to test a given PSF model type
 typedef struct {
-  psModelType modelType;
+  pmModelType modelType;
   pmPSF      *psf;
   psArray    *sources;      // pointers to the original sources
@@ -61,6 +63,6 @@
 void         psphotOutput (psImageData *imdata, psMetadata *config, psArray *sources);
 
-bool         psphotMarkPSF (psSource *source, float shapeNsigma, float minSN, float maxChi, float SATURATE);
-bool         psphotSubtractPSF (psSource *source);
+bool         psphotMarkPSF (pmSource *source, float shapeNsigma, float minSN, float maxChi, float SATURATE);
+bool         psphotSubtractPSF (pmSource *source);
 int 	     psphotSortBySN (const void **a, const void **b);
 
@@ -69,10 +71,10 @@
 
 // psf utilities
-pmPSF       *pmPSFAlloc (psModelType type);
+pmPSF       *pmPSFAlloc (pmModelType type);
 pmPSF_Test  *pmPSF_TestAlloc (psArray *stars, char *modelName);
 pmPSF_Test  *pmPSF_TestModel (psArray *sources, char *modelName, float radius);
 bool	     pmPSFFromModels (pmPSF *psf, psArray *models, psVector *mask);
-psModel	    *psModelFromPSF (psModel *model, pmPSF *psf);
-bool	     pmSourcePhotometry (float *fitMag, float *obsMag, psModel *model, psImage *image, psImage *mask);
+pmModel	    *pmModelFromPSF (pmModel *model, pmPSF *psf);
+bool	     pmSourcePhotometry (float *fitMag, float *obsMag, pmModel *model, psImage *image, psImage *mask);
 bool	     pmPSFMetricModel (pmPSF_Test *test, float RADIUS);
 
@@ -83,18 +85,18 @@
 bool 	     pmSourcesWriteCMF (psImageData *imdata, char *filename, psArray *sources);
 bool 	     pmSourcesWriteSX (psImageData *imdata, char *filename, psArray *sources);
-int  	     pmSourcesDophotType (psSource *source);
-bool 	     psPeaksWriteText (psArray *sources, char *filename);
-bool 	     psMomentsWriteText (psArray *sources, char *filename);
-bool 	     psModelWritePSFs (psArray *sources, char *filename);
-bool 	     psModelWriteFLTs (psArray *sources, char *filename);
-bool 	     psModelWriteNULLs (psArray *sources, char *filename);
+int  	     pmSourcesDophotType (pmSource *source);
+bool 	     pmPeaksWriteText (psArray *sources, char *filename);
+bool 	     pmMomentsWriteText (psArray *sources, char *filename);
+bool 	     pmModelWritePSFs (psArray *sources, char *filename);
+bool 	     pmModelWriteFLTs (psArray *sources, char *filename);
+bool 	     pmModelWriteNULLs (psArray *sources, char *filename);
 
 // psModule extra utilities
-bool 	     pmSourceDefinePixels(psSource *mySource, const psImageData *imdata, psF32 x, psF32 y, psF32 Radius);
-bool 	     pmSourceLocalSky_EAM (psSource *source, psStatsOptions statsOptions, psF32 Radius);
-bool 	     pmSourceFitModel_EAM(psSource *source, psModel *model, const bool PSF);
-bool 	     pmSourceMoments_EAM(psSource *source, psF32 radius);
-bool 	     pmModelFitStatus (psModel *model);
-int	     pmSourceDophotType (psSource *source);
+bool 	     pmSourceDefinePixels(pmSource *mySource, const psImageData *imdata, psF32 x, psF32 y, psF32 Radius);
+bool 	     pmSourceLocalSky_EAM (pmSource *source, psStatsOptions statsOptions, psF32 Radius);
+bool 	     pmSourceFitModel_EAM(pmSource *source, pmModel *model, const bool PSF);
+bool 	     pmSourceMoments_EAM(pmSource *source, psF32 radius);
+bool 	     pmModelFitStatus (pmModel *model);
+int	     pmSourceDophotType (pmSource *source);
 
 // minimize 
@@ -114,14 +116,14 @@
 psF32        pmConfigLookupF32 (bool *status, psMetadata *config, psMetadata *header, char *name);
 psVector    *psVectorCreate (double lower, double upper, double delta, psElemType type);
-void 	     psImageMaskRegion (psImage *image, psRegion *region, bool logical_and, int maskValue);
-void 	     psImageKeepRegion (psImage *image, psRegion *region, bool logical_and, int maskValue);
-void 	     psImageMaskCircle (psImage *image, double x, double y, double radius, bool logical_and, int maskValue);
-void 	     psImageKeepCircle (psImage *image, double x, double y, double radius, bool logical_and, int maskValue);
+//void 	     psImageMaskRegion (psImage *image, psRegion *region, bool logical_and, int maskValue);
+//void 	     psImageKeepRegion (psImage *image, psRegion *region, bool logical_and, int maskValue);
+//void 	     psImageMaskCircle (psImage *image, double x, double y, double radius, bool logical_and, int maskValue);
+//void 	     psImageKeepCircle (psImage *image, double x, double y, double radius, bool logical_and, int maskValue);
 psVector    *psGetRowVectorFromImage(psImage *image, psU32 row);
 
 // basic image functions
 bool         psImageInit (psImage *image,...);
-void	     psImageSmooth (psImage *image, float sigma, float Nsigma);
-psRegion    *psRegionForImage (psRegion *out, psImage *image, psRegion *in);
+//void	     psImageSmooth (psImage *image, float sigma, float Nsigma);
+//psRegion    *psRegionForImage (psRegion *out, psImage *image, psRegion *in);
 psRegion    *psRegionSquare (psF32 x, psF32 y, psF32 radius);
 int          psphotSaveImage (psMetadata *header, psImage *image, char *filename);
@@ -153,6 +155,2 @@
 int             fs_usage ();
 bool		DumpImage (psImage *image, char *filename);
-
-// deprecated
-// void pmSourceMaskRegion (psSource *source, psRegion *region);
-//psVector    *p_psGetRowVectorFromImage(psImage *image, psU32 row);