Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 6571)
+++ trunk/psphot/src/psphot.h	(revision 6715)
@@ -3,16 +3,37 @@
 # include <unistd.h>   // for unlink
 # include <pslib.h>
-# include <pmObjects.h>
+# include <psmodules.h>
+
+# if (0)
+# include <psLine.h>
+# include <psSparse.h>
+# include <psEllipse.h>
+# include <psAdditionals.h>
+# include <pmConfig.h>
+# include <pmHDU.h>
+# include <pmHDUUtils.h>
+# include <pmFPA.h>
+# include <pmFPAview.h>
+# include <pmFPAfile.h>
+# include <pmFPARead.h>
+# include <pmFPAConstruct.h>
+# include <pmMaskBadPixels.h>
+# include <pmConcepts.h>
+
+# include <pmPeaks.h>
+# include <pmMoments.h>
+# include <pmModel.h>
+# include <pmSource.h>
+# include <pmSourceIO.h>
+# include <pmSourceSky.h>
+# include <pmSourceFitModel.h>
+# include <pmSourceFitSet.h>
+# include <pmSourceContour.h>
 # include <pmGrowthCurve.h>
-# include <pmConfig.h>
-# include <pmFPARead.h>
 # include <pmPSF.h>
 # include <pmPSFtry.h>
 # include <pmModelGroup.h>
-// # include "psLibUtils.h"
-// # include "psModulesUtils.h"
-// # include "psSparse.h"
-# include "pmFPAConstruct.h"
-# include "pmConcepts.h"
+# include <pmSourcePhotometry.h>
+# endif
 
 # define PSPHOT_RECIPE "PSPHOT"
@@ -26,25 +47,23 @@
 
 bool            psphotModelTest (pmReadout *readout, psMetadata *arguments, psMetadata *recipe);
-bool            psphotReadout (pmReadout *readout, psMetadata *config);
+bool            psphotReadout (pmConfig *config, pmFPAview *view);
 void            psphotCleanup (void);
 
-// bool            ppImageLoadPixels (ppFile *input, psDB *db, int chipNum, int cellNum);
+psArray        *psphotFakeSources ();
+int             psphotSaveImage (psMetadata *header, psImage *image, char *filename);
 
 // psphotReadout functions
-psStats        *psphotImageStats (pmReadout *readout, psMetadata *config);
-psPolynomial2D *psphotImageBackground (pmReadout *readout, psMetadata *config, psStats *sky);
+bool            psphotImageMedian (pmConfig *config, pmFPAview *view);
 psArray        *psphotFindPeaks (pmReadout *readout, psMetadata *config);
 psArray        *psphotSourceStats (pmReadout *readout, psMetadata *config, psArray *allpeaks);
 bool            psphotRoughClass (psArray *sources, psMetadata *config);
 bool            psphotBasicDeblend (psArray *sources, psMetadata *config);
-pmPSF          *psphotChoosePSF (psMetadata *config, psArray *sources);
-void            psphotOutput (pmReadout *readout, psMetadata *arguments);
-psImage        *psphotImageMedian (pmReadout *readout, psMetadata *config);
-
-// optional object analysis steps
-bool 	        psphotEnsemblePSF (pmReadout *readout, psMetadata *config, psArray *sources, pmPSF *psf, bool final);
-bool            psphotBlendFit (pmReadout *readout, psMetadata *config, psArray *sources, pmPSF *psf);
+pmPSF          *psphotChoosePSF (psArray *sources, psMetadata *config);
+bool 	        psphotEnsemblePSF (pmReadout *readout, psArray *sources, psMetadata *config, pmPSF *psf, bool final);
+bool            psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *config, pmPSF *psf);
 bool            psphotReplaceUnfit (psArray *sources);
 bool            psphotApResid (pmReadout *readout, psArray *sources, psMetadata *config, pmPSF *psf);
+bool            psphotMagnitudes (psArray *sources, psMetadata *config, pmPSF *psf);
+bool            psphotSkyReplace (pmConfig *config, pmFPAview *view);
 
 // basic support functions
@@ -54,7 +73,6 @@
 bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf);
 void            psphotTestArguments (int *argc, char **argv);
-bool            psphotMaskCell (pmCell *cell, psMetadata *recipe);
+bool            psphotMaskReadout (pmReadout *readout, psMetadata *recipe);
 bool            psphotBackgroundNames (psMetadata *arguments);
-bool            psphotSkyReplace (pmReadout *readout, psImage *background);
 
 // functions to set the correct source pixels
@@ -66,27 +84,6 @@
 
 // output functions
-# if (0)
-bool 	     	pmSourcesWriteSX   (psArray *sources, char *filename);
-bool 	     	pmSourcesWriteOBJ  (psArray *sources, char *filename);
-bool 	     	pmSourcesWriteCMP  (psArray *sources, char *filename, psMetadata *header);
-bool 	     	pmSourcesWriteCMF  (psArray *sources, char *filename, psMetadata *header);
-bool 	     	pmSourcesWriteText (psArray *sources, char *filename);
-
-bool 	     	pmModelWritePSFs (psArray *sources, char *filename);
-bool 	     	pmModelWriteEXTs (psArray *sources, char *filename);
-bool 	     	pmModelWriteNULLs (psArray *sources, char *filename);
-bool 	     	pmPeaksWriteText (psArray *sources, char *filename);
-bool 	     	pmMomentsWriteText (psArray *sources, char *filename);
-
-bool            psphotSamplePSFs (pmPSF *psf, psImage *image, char *output);
 bool 		psphotDumpMoments (psMetadata *config, psArray *sources);
-int             psphotSaveImage (psMetadata *header, psImage *image, char *filename);
 bool            psphotUpdateHeader (psMetadata *header, psMetadata *config);
-# endif
-
-// void            psphotOutputPrep (ppFile *file, ppConfig *config);
-// void            psphotOutputCleanup (void);
-
-bool            psphotMagnitudes (psMetadata *config, psArray *sources, pmPSF *psf);
 
 // PSF / DBL / EXT evaluation functions
@@ -106,4 +103,25 @@
 // XXX these can probably be dropped:
 
+// functions to support simultaneous multi-source fitting
+bool 		psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, bool PSF);
+
+# if (0)
+
+pmHDU          *pmHDUFromReadout (pmReadout *readout);
+bool            psRegionIsNaN (psRegion region);
+bool            pmReadoutSetWeights(pmReadout *readout);
+
+// 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);
+
+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);
+
 // optional mode for clip fit?
 psPolynomial4D *psVectorChiClipFitPolynomial4D(
@@ -119,18 +137,22 @@
     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);
+# endif
 
-// bicubic interpolation
-psPolynomial2D *psImageBicubeFit (psImage *image, int x, int y);
-psPlane         psImageBicubeMin (psPolynomial2D *poly);
+# if (0)
+bool            psphotSamplePSFs (pmPSF *psf, psImage *image, char *output);
+int             psphotSaveImage (psMetadata *header, psImage *image, char *filename);
 
-bool psImageJpegColormap (char *name);
-bool psImageJpeg (psImage *image, char *filename, float zero, float scale);
+bool 	     	pmSourcesWriteSX   (psArray *sources, char *filename);
+bool 	     	pmSourcesWriteOBJ  (psArray *sources, char *filename);
+bool 	     	pmSourcesWriteCMP  (psArray *sources, char *filename, psMetadata *header);
+bool 	     	pmSourcesWriteCMF  (psArray *sources, char *filename, psMetadata *header);
+bool 	     	pmSourcesWriteText (psArray *sources, char *filename);
+bool 	     	pmPeaksWriteText (psArray *sources, char *filename);
 
+bool 	     	pmModelWritePSFs (psArray *sources, char *filename);
+bool 	     	pmModelWriteEXTs (psArray *sources, char *filename);
+bool 	     	pmModelWriteNULLs (psArray *sources, char *filename);
+bool 	     	pmMomentsWriteText (psArray *sources, char *filename);
+# endif
 
 // XXX deprecate
@@ -142,2 +164,11 @@
 // float           pmSourceCrossWeight (pmSource *Mi, pmSource *Mj);
 // psArray        *pmSourceContour_EAM (psImage *image, int x, int y, float threshold);
+// psStats        *psphotImageStats (pmReadout *readout, psMetadata *config);
+// psPolynomial2D *psphotImageBackground (pmReadout *readout, psMetadata *config, psStats *sky);
+// void            psphotOutput (pmReadout *readout, psMetadata *arguments);
+
+// void            psphotOutputPrep (ppFile *file, ppConfig *config);
+// void            psphotOutputCleanup (void);
+
+// bool            ppImageLoadPixels (ppFile *input, psDB *db, int chipNum, int cellNum);
+