Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 6851)
+++ trunk/psphot/src/psphot.h	(revision 6862)
@@ -23,14 +23,15 @@
 // psphotReadout functions
 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 (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);
+psArray        *psphotFindPeaks (pmReadout *readout, psMetadata *recipe);
+psArray        *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *allpeaks);
+bool            psphotRoughClass (psArray *sources, psMetadata *recipe);
+bool            psphotBasicDeblend (psArray *sources, psMetadata *recipe);
+pmPSF          *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe);
+bool            psphotPSFstats (pmReadout *readout, psMetadata *recipe, pmPSF *psf);
+bool 	        psphotEnsemblePSF (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, bool final);
+bool            psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, 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            psphotApResid (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
+bool            psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf);
 bool            psphotSkyReplace (pmConfig *config, pmFPAview *view);
 
@@ -42,17 +43,17 @@
 void            psphotTestArguments (int *argc, char **argv);
 bool            psphotMaskReadout (pmReadout *readout, psMetadata *recipe);
-bool            psphotBackgroundNames (psMetadata *arguments);
+// bool            psphotBackgroundNames (psMetadata *arguments);
 
 // functions to set the correct source pixels
-bool 		psphotInitRadiusPSF (psMetadata *config, pmModelType type);
+bool 		psphotInitRadiusPSF (psMetadata *recipe, pmModelType type);
 bool 		psphotCheckRadiusPSF (pmReadout *readout, pmSource *source, pmModel *model);
 bool 		psphotCheckRadiusPSFBlend (pmReadout *readout, pmSource *source, pmModel *model, float dR);
-bool 		psphotInitRadiusEXT (psMetadata *config, pmModelType type);
+bool 		psphotInitRadiusEXT (psMetadata *recipe, pmModelType type);
 bool 		psphotCheckRadiusEXT (pmReadout *readout, pmSource *source, pmModel *model);
 
 // output functions
-bool 		psphotDumpMoments (psMetadata *config, psArray *sources);
-psMetadata     *psphotDefineHeader (psMetadata *config);
-bool            psphotWeightBias (pmReadout *readout, psArray *sources, psMetadata *config, pmPSF *psf);
+bool 		psphotDumpMoments (psMetadata *recipe, psArray *sources);
+psMetadata     *psphotDefineHeader (psMetadata *recipe);
+bool            psphotWeightBias (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
 
 // PSF / DBL / EXT evaluation functions
@@ -62,6 +63,6 @@
 
 //  functions to support the source fitting process
-bool 		psphotInitLimitsPSF (psMetadata *config);
-bool		psphotInitLimitsEXT (psMetadata *config);
+bool 		psphotInitLimitsPSF (psMetadata *recipe);
+bool		psphotInitLimitsEXT (psMetadata *recipe);
 bool		psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf);
 bool		psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf);
@@ -73,71 +74,2 @@
 bool 		psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, pmSourceFitMode mode);
 
-// XXX these can probably be dropped:
-
-# 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(
-    psPolynomial4D *poly,
-    psStats *stats,
-    const psVector *mask,
-    psMaskType maskValue,
-    const psVector *f,
-    const psVector *fErr,
-    const psVector *x,
-    const psVector *y,
-    const psVector *z,
-    const psVector *t);
-
-# endif
-
-# if (0)
-bool            psphotSamplePSFs (pmPSF *psf, psImage *image, char *output);
-int             psphotSaveImage (psMetadata *header, psImage *image, char *filename);
-
-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
-
-// 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);
-// 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);
-