Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 7638)
+++ trunk/psphot/src/psphot.h	(revision 7677)
@@ -12,5 +12,5 @@
 
 // top-level psphot functions
-pmConfig       *psphotArguments (int *argc, char **argv);
+pmConfig       *psphotArguments (int argc, char **argv);
 bool            psphotParseCamera (pmConfig *config);
 bool            psphotImageLoop (pmConfig *config);
@@ -31,5 +31,5 @@
 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            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);
@@ -40,6 +40,6 @@
 // basic support functions
 void            psphotModelGroupInit (void);
-int 	        psphotSortBySN (const void **a, const void **b);
-int 	        psphotSortByY (const void **a, const void **b);
+int             psphotSortBySN (const void **a, const void **b);
+int             psphotSortByY (const void **a, const void **b);
 bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf);
 void            psphotTestArguments (int *argc, char **argv);
@@ -48,30 +48,30 @@
 
 // functions to set the correct source pixels
-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 *recipe, pmModelType type);
-bool 		psphotCheckRadiusEXT (pmReadout *readout, pmSource *source, pmModel *model);
+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 *recipe, pmModelType type);
+bool            psphotCheckRadiusEXT (pmReadout *readout, pmSource *source, pmModel *model);
 
 // output functions
-bool 		psphotDumpMoments (psMetadata *recipe, psArray *sources);
+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
-bool 		psphotEvalPSF (pmSource *source, pmModel *model);
-bool 		psphotEvalDBL (pmSource *source, pmModel *model);
-bool 		psphotEvalEXT (pmSource *source, pmModel *model);
+bool            psphotEvalPSF (pmSource *source, pmModel *model);
+bool            psphotEvalDBL (pmSource *source, pmModel *model);
+bool            psphotEvalEXT (pmSource *source, pmModel *model);
 
 //  functions to support the source fitting process
-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);
-bool		psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf);
-pmModel	       *psphotFitEXT (pmReadout *readout, pmSource *source);
-psArray	       *psphotFitDBL (pmReadout *readout, pmSource *source);
+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);
+bool            psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf);
+pmModel        *psphotFitEXT (pmReadout *readout, pmSource *source);
+psArray        *psphotFitDBL (pmReadout *readout, pmSource *source);
 
 // functions to support simultaneous multi-source fitting
-bool 		psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, pmSourceFitMode mode);
+bool            psphotFitSet (pmSource *oneSrc, pmModel *oneModel, char *fitset, pmSourceFitMode mode);