Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 6117)
+++ trunk/psphot/src/psphot.h	(revision 6311)
@@ -24,5 +24,5 @@
 bool            psphotImageLoop (ppFile *input, ppConfig *config);
 
-bool            psphotModelTest (pmReadout *readout, psMetadata *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);
@@ -36,5 +36,5 @@
 bool            psphotBasicDeblend (psArray *sources, psMetadata *config, psStats *sky);
 pmPSF          *psphotChoosePSF (psMetadata *config, psArray *sources, psStats *sky);
-void            psphotOutput (pmReadout *readout, psMetadata *config);
+void            psphotOutput (pmReadout *readout, psMetadata *arguments);
 
 // optional object analysis steps
@@ -80,5 +80,5 @@
 bool 	     	pmMomentsWriteText (psArray *sources, char *filename);
 
-bool 		psphotSamplePSFs (psMetadata *config, pmPSF *psf, psImage *image);
+bool            psphotSamplePSFs (pmPSF *psf, psImage *image, char *output);
 bool 		psphotDumpMoments (psMetadata *config, psArray *sources);
 int             psphotSaveImage (psMetadata *header, psImage *image, char *filename);
@@ -86,4 +86,8 @@
 int  	     	pmSourcesDophotType (pmSource *source);
 bool            psMetadataItemTransfer (psMetadata *out, psMetadata *in, char *key);
+
+char           *psphotSplitName (psMetadata *header);
+void            psphotOutputPrep (ppFile *file, ppConfig *config);
+char           *psphotNameSubstitute (char *input, char *replace, char *key);
 
 bool            psphotMagnitudes (psMetadata *config, psArray *sources, pmPSF *psf);