Index: /branches/eam_branch_20080324/psphot/src/Makefile.am
===================================================================
--- /branches/eam_branch_20080324/psphot/src/Makefile.am	(revision 17333)
+++ /branches/eam_branch_20080324/psphot/src/Makefile.am	(revision 17334)
@@ -18,58 +18,59 @@
 
 libpsphot_la_SOURCES = \
-	psphotErrorCodes.c	 \
-	pmFootprint.c		 \
-	psphotVersion.c		 \
-	psphotModelGroupInit.c	 \
-	psphotMaskReadout.c	 \
-	psphotDefineFiles.c	 \
-	psphotReadout.c		 \
-	psphotModelBackground.c	 \
-	psphotSubtractBackground.c \
-	psphotFindDetections.c	 \
-	psphotFindPeaks.c	 \
-	psphotSourceStats.c	 \
-	psphotRoughClass.c	 \
-	psphotBasicDeblend.c	 \
-	psphotChoosePSF.c	 \
-	psphotGuessModels.c      \
-	psphotFitSourcesLinear.c \
-	psphotBlendFit.c	 \
-	psphotReplaceUnfit.c	 \
-	psphotApResid.c		 \
-	psphotMagnitudes.c	 \
-	psphotSkyReplace.c	 \
-	psphotEvalPSF.c		 \
-	psphotEvalFLT.c		 \
-	psphotSourceFits.c	 \
-	psphotRadiusChecks.c	 \
-	psphotOutput.c		 \
-	psphotGrowthCurve.c	 \
-	psphotFakeSources.c	 \
-	psphotModelWithPSF.c     \
-	psphotExtendedSources.c	 \
-	psphotRadialProfile.c	 \
-	psphotPetrosian.c	 \
-	psphotIsophotal.c	 \
-	psphotAnnuli.c		 \
-	psphotKron.c		 \
-	psphotKernelFromPSF.c	 \
-	psphotPSFConvModel.c	 \
-	psphotModelTest.c	 \
-	psphotFitSet.c		 \
-	psphotSourceFreePixels.c \
-	psphotSummaryPlots.c     \
-	psphotMergeSources.c	 \
-	psphotLoadPSF.c	         \
-	psphotReadoutCleanup.c	 \
-	psphotSourcePlots.c	 \
-	psphotRadialPlot.c	 \
-	psphotDeblendSatstars.c	 \
-	psphotMosaicSubimage.c	 \
-	psphotMakeResiduals.c	 \
-	psphotSourceSize.c	 \
-	psphotDiagnosticPlots.c	 \
-	psphotMakeFluxScale.c	 \
-	psphotCheckStarDistribution.c \
+	psphotErrorCodes.c	       \
+	pmFootprint.c		       \
+	psphotVersion.c		       \
+	psphotModelGroupInit.c	       \
+	psphotMaskReadout.c	       \
+	psphotDefineFiles.c	       \
+	psphotReadout.c		       \
+	psphotModelBackground.c	       \
+	psphotSubtractBackground.c     \
+	psphotFindDetections.c	       \
+	psphotFindPeaks.c	       \
+	psphotSourceStats.c	       \
+	psphotRoughClass.c	       \
+	psphotBasicDeblend.c	       \
+	psphotChoosePSF.c	       \
+	psphotGuessModels.c            \
+	psphotFitSourcesLinear.c       \
+	psphotBlendFit.c	       \
+	psphotReplaceUnfit.c	       \
+	psphotApResid.c		       \
+	psphotMagnitudes.c	       \
+	psphotSkyReplace.c	       \
+	psphotEvalPSF.c		       \
+	psphotEvalFLT.c		       \
+	psphotSourceFits.c	       \
+	psphotRadiusChecks.c	       \
+	psphotOutput.c		       \
+	psphotGrowthCurve.c	       \
+	psphotFakeSources.c	       \
+	psphotModelWithPSF.c           \
+	psphotExtendedSourceAnalysis.c \
+	psphotExtendedSourceFits.c     \
+	psphotRadialProfile.c	       \
+	psphotPetrosian.c	       \
+	psphotIsophotal.c	       \
+	psphotAnnuli.c		       \
+	psphotKron.c		       \
+	psphotKernelFromPSF.c	       \
+	psphotPSFConvModel.c	       \
+	psphotModelTest.c	       \
+	psphotFitSet.c		       \
+	psphotSourceFreePixels.c       \
+	psphotSummaryPlots.c           \
+	psphotMergeSources.c	       \
+	psphotLoadPSF.c	               \
+	psphotReadoutCleanup.c	       \
+	psphotSourcePlots.c	       \
+	psphotRadialPlot.c	       \
+	psphotDeblendSatstars.c	       \
+	psphotMosaicSubimage.c	       \
+	psphotMakeResiduals.c	       \
+	psphotSourceSize.c	       \
+	psphotDiagnosticPlots.c	       \
+	psphotMakeFluxScale.c	       \
+	psphotCheckStarDistribution.c  \
 	psphotAddNoise.c
 
Index: /branches/eam_branch_20080324/psphot/src/psphot.h
===================================================================
--- /branches/eam_branch_20080324/psphot/src/psphot.h	(revision 17333)
+++ /branches/eam_branch_20080324/psphot/src/psphot.h	(revision 17334)
@@ -45,5 +45,6 @@
 bool            psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background);
 bool            psphotSkyReplace (pmConfig *config, const pmFPAview *view);
-bool            psphotExtendedSources (pmReadout *readout, psArray *sources, psMetadata *recipe);
+bool            psphotExtendedSourceAnalysis (pmReadout *readout, psArray *sources, psMetadata *recipe);
+bool            psphotExtendedSourceFits (pmReadout *readout, psArray *sources, psMetadata *recipe);
 
 // used by psphotFindDetections
@@ -117,5 +118,6 @@
 bool            psphotMakeResiduals (psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal);
 
-pmModel        *psphotPSFConvModel (pmReadout *readout, pmSource *source, pmModelType modelType, int psfSize, psMaskType maskVal);
+pmModel        *psphotPSFConvModel (pmReadout *readout, pmSource *source, pmModelType modelType, psMaskType maskVal, int psfSize);
+
 psKernel       *psphotKernelFromPSF (pmSource *source, int nPix);