Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 6481)
+++ trunk/psphot/src/psphot.h	(revision 6571)
@@ -10,7 +10,7 @@
 # include <pmPSFtry.h>
 # include <pmModelGroup.h>
-# include "psLibUtils.h"
-# include "psModulesUtils.h"
-# include "psSparse.h"
+// # include "psLibUtils.h"
+// # include "psModulesUtils.h"
+// # include "psSparse.h"
 # include "pmFPAConstruct.h"
 # include "pmConcepts.h"
@@ -21,12 +21,13 @@
 
 // top-level psphot functions
-ppConfig       *psphotArguments (int *argc, char **argv);
-ppFile         *psphotParseCamera (ppConfig *config);
-bool            psphotImageLoop (ppFile *input, ppConfig *config);
+pmConfig       *psphotArguments (int *argc, char **argv);
+bool            psphotParseCamera (pmConfig *config);
+bool            psphotImageLoop (pmConfig *config);
 
 bool            psphotModelTest (pmReadout *readout, psMetadata *arguments, psMetadata *recipe);
 bool            psphotReadout (pmReadout *readout, psMetadata *config);
-bool            ppImageLoadPixels (ppFile *input, psDB *db, int chipNum, int cellNum);
 void            psphotCleanup (void);
+
+// bool            ppImageLoadPixels (ppFile *input, psDB *db, int chipNum, int cellNum);
 
 // psphotReadout functions
@@ -47,15 +48,5 @@
 bool            psphotApResid (pmReadout *readout, psArray *sources, psMetadata *config, pmPSF *psf);
 
-// XXX deprecate these?
-// bool            psphotFullFit (pmReadout *readout, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky);
-// bool            psphotApplyPSF (pmReadout *readout, psMetadata *config, psArray *sources, pmPSF *psf, psStats *sky);
-// bool            psphotFitExtended (pmReadout *readout, psMetadata *config, psArray *sources, psStats *skyStats);
-
 // basic support functions
-pmModel        *pmModelCopy (pmModel *model);
-pmModel        *pmSourceMagnitudes (pmSource *source, pmPSF *psf, float apRadius);
-float           pmSourceCrossProduct (pmSource *Mi, pmSource *Mj);
-float           pmSourceCrossWeight (pmSource *Mi, pmSource *Mj);
-psArray        *pmSourceContour_EAM (psImage *image, int x, int y, float threshold);
 void            psphotModelGroupInit (void);
 int 	        psphotSortBySN (const void **a, const void **b);
@@ -63,5 +54,5 @@
 bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf);
 void            psphotTestArguments (int *argc, char **argv);
-bool            pmCellSetMask (pmCell *cell, psMetadata *recipe);
+bool            psphotMaskCell (pmCell *cell, psMetadata *recipe);
 bool            psphotBackgroundNames (psMetadata *arguments);
 bool            psphotSkyReplace (pmReadout *readout, psImage *background);
@@ -73,8 +64,7 @@
 bool 		psphotInitRadiusEXT (psMetadata *config, pmModelType type);
 bool 		psphotCheckRadiusEXT (pmReadout *readout, pmSource *source, pmModel *model);
-bool 	        psphotDefinePixels (pmSource *mySource, const pmReadout *readout, psF32 x, psF32 y, psF32 Radius);
-bool 	        psphotRedefinePixels (pmSource *mySource, const pmReadout *readout, psF32 x, psF32 y, psF32 Radius);
 
 // output functions
+# if (0)
 bool 	     	pmSourcesWriteSX   (psArray *sources, char *filename);
 bool 	     	pmSourcesWriteOBJ  (psArray *sources, char *filename);
@@ -93,11 +83,8 @@
 int             psphotSaveImage (psMetadata *header, psImage *image, char *filename);
 bool            psphotUpdateHeader (psMetadata *header, psMetadata *config);
-int  	     	pmSourcesDophotType (pmSource *source);
-bool            psMetadataItemTransfer (psMetadata *out, psMetadata *in, char *key);
+# endif
 
-char           *psphotSplitName (psMetadata *header);
-void            psphotOutputPrep (ppFile *file, ppConfig *config);
-void            psphotOutputCleanup (void);
-char           *psphotNameSubstitute (char *input, char *replace, char *key);
+// void            psphotOutputPrep (ppFile *file, ppConfig *config);
+// void            psphotOutputCleanup (void);
 
 bool            psphotMagnitudes (psMetadata *config, psArray *sources, pmPSF *psf);
@@ -107,11 +94,4 @@
 bool 		psphotEvalDBL (pmSource *source, pmModel *model);
 bool 		psphotEvalEXT (pmSource *source, pmModel *model);
-
-// functions to support simultaneous multi-source fitting
-bool 		psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, bool PSF);
-bool 		pmSourceFitSet (pmSource *source, psArray *modelSet, const bool PSF);
-psF32           pmModelFitSet (psVector *deriv, const psVector *params, const psVector *x);
-bool            pmModelFitSetInit (pmModelType type);
-void            pmModelFitSetClear (void);
 
 //  functions to support the source fitting process
@@ -124,10 +104,5 @@
 psArray	       *psphotFitDBL (pmReadout *readout, pmSource *source);
 
-// bicubic interpolation
-psPolynomial2D *psImageBicubeFit (psImage *image, int x, int y);
-psPlane         psImageBicubeMin (psPolynomial2D *poly);
-
-bool psImageJpegColormap (char *name);
-bool psImageJpeg (psImage *image, char *filename, float zero, float scale);
+// XXX these can probably be dropped:
 
 // optional mode for clip fit?
@@ -143,2 +118,26 @@
     const psVector *z,
     const psVector *t);
+
+// functions to support simultaneous multi-source fitting
+bool 		psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, bool PSF);
+bool 		pmSourceFitSet (pmSource *source, psArray *modelSet, const bool PSF);
+psF32           pmModelFitSet (psVector *deriv, const psVector *params, const psVector *x);
+bool            pmModelFitSetInit (pmModelType type);
+void            pmModelFitSetClear (void);
+
+// bicubic interpolation
+psPolynomial2D *psImageBicubeFit (psImage *image, int x, int y);
+psPlane         psImageBicubeMin (psPolynomial2D *poly);
+
+bool psImageJpegColormap (char *name);
+bool psImageJpeg (psImage *image, char *filename, float zero, float scale);
+
+
+// XXX deprecate
+
+// char           *psphotNameSubstitute (char *input, char *replace, char *key);
+// char           *psphotSplitName (psMetadata *header);
+// pmModel        *pmSourceMagnitudes (pmSource *source, pmPSF *psf, float apRadius);
+// float           pmSourceCrossProduct (pmSource *Mi, pmSource *Mj);
+// float           pmSourceCrossWeight (pmSource *Mi, pmSource *Mj);
+// psArray        *pmSourceContour_EAM (psImage *image, int x, int y, float threshold);