Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 5828)
+++ trunk/psphot/src/psphot.h	(revision 5980)
@@ -4,4 +4,5 @@
 # include <pslib.h>
 # include <pmObjects.h>
+# include <pmGrowthCurve.h>
 # include <pmPSF.h>
 # include <pmPSFtry.h>
@@ -37,4 +38,5 @@
 int             psphotSaveImage (psMetadata *header, psImage *image, char *filename);
 bool 	        psphotDefinePixels (pmSource *mySource, const eamReadout *imdata, psF32 x, psF32 y, psF32 Radius);
+bool 	        psphotRedefinePixels (pmSource *mySource, const eamReadout *imdata, psF32 x, psF32 y, psF32 Radius);
 void            psphotModelGroupInit (void);
 
@@ -84,5 +86,7 @@
 bool psphotReplaceUnfit (psArray *sources);
 bool psphotDumpMoments (psMetadata *config, psArray *sources);
-bool psphotApResid (psArray *sources, psMetadata *config, pmPSF *psf);
+bool psphotApResid (eamReadout *imdata, psArray *sources, psMetadata *config, pmPSF *psf);
+bool psphotAssessPSF (eamReadout *imdata, psMetadata *config, pmPSF *psf);
+
 bool psphotWritePSF (pmPSF *psf, char *filename);
 pmPSF *psphotReadPSF (char *filename);
@@ -90,6 +94,8 @@
 bool psPolynomial2DtoMD (psMetadata *md, psPolynomial2D *poly, char *format, ...);
 bool psPolynomial3DtoMD (psMetadata *md, psPolynomial3D *poly, char *format, ...);
+bool psPolynomial4DtoMD (psMetadata *md, psPolynomial4D *poly, char *format, ...);
 psPolynomial2D *psPolynomial2DfromMD (psMetadata *folder);
 psPolynomial3D *psPolynomial3DfromMD (psMetadata *folder);
+psPolynomial4D *psPolynomial4DfromMD (psMetadata *folder);
 bool psphotModelTest (eamReadout *imdata, psMetadata *config);
 
@@ -112,2 +118,21 @@
 psPolynomial2D *psImageBicubeFit (psImage *image, int x, int y);
 psPlane psImageBicubeMin (psPolynomial2D *poly);
+void psphotTestArguments (int *argc, char **argv);
+
+bool psphotGrowthCurve (eamReadout *imdata, pmPSF *psf);
+
+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);
+
+// XXX deprecated
+// bool psphotApResidFullFit (psVector *x, psVector *y, psVector *radius, psVector *rflux, psVector *apresid, psVector *dmag);
+// bool psphotApResidPolyFit (psVector *x, psVector *y, psVector *radius, psVector *rflux, psVector *apresid, psVector *dmag);