Index: branches/tap_branches/psastro/src/psastro.h
===================================================================
--- branches/tap_branches/psastro/src/psastro.h	(revision 25900)
+++ branches/tap_branches/psastro/src/psastro.h	(revision 27838)
@@ -76,9 +76,11 @@
 bool              psastroChooseGlintStars (pmConfig *config, psArray *refs, const char *source);
 
+bool              psastroLoadCrosstalk (pmConfig *config);
+
 psArray          *psastroLoadRefstars (pmConfig *config, const char *source);
 bool              psastroChipAstrom (pmConfig *config);
 bool              psastroOneChip (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
 bool              psastroOneChipGrid (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
-bool              psastroOneChipFit (pmFPA *fpa, pmChip *chip, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
+bool              psastroOneChipFit (pmFPA *fpa, pmChip *chip, pmReadout *readout, psArray *refset, psArray *rawset, psMetadata *recipe, psMetadata *updates);
 bool              psastroChooseRefstars (pmConfig *config, psArray *refs, const char *source);
 bool              psastroRefstarSubset (pmReadout *readout);
@@ -86,8 +88,10 @@
 bool              psastroLuminosityFunctionPlot(psVector *lnMag, psVector *Mag, pmLumFunc *lumFunc, pmLumFunc *rawFunc);
 psArray          *psastroRemoveClumps (psArray *input, int scale);
+psArray          *psastroRemoveClumpsIterate (psArray *input, int scale, int nIter);
+bool              psastroRemoveClumpsRawstars (pmConfig *config);
 
 
 // utility functions:
-bool              psastroUpdateChipToFPA (pmFPA *fpa, pmChip *chip, psArray *rawstars, psArray *refstars);
+bool              psastroUpdateChipToFPA (pmFPA *fpa, pmChip *chip);
 bool              psastroWriteStars (char *filename, psArray *sources);
 bool              psastroWriteTransform (psPlaneTransform *map);
@@ -146,6 +150,10 @@
 
 bool 		  psastroZeroPoint (pmConfig *config);
-bool 		  psastroZeroPointReadout(pmReadout *readout, float zeropt, float exptime);
+psVector         *psastroZeroPointReadoutAccum(psVector *dMag, pmReadout *readout, float exptime);
+bool              psastroZeroPointAnalysis (psMetadata *header, psVector *dMag, float zeropt, psMetadata *recipe);
 bool 		  psastroZeroPointFromRecipe (float *zeropt, float *exptime, float *ghostMaxMag, pmFPA *fpa, psMetadata *recipe);
+
+psStats          *psastroStatsPercentile (psVector *myVector, psMetadata *recipe);
+float             psastroStatsPercentileValue (psHistogram *histogram, psHistogram *cumulative, psVector *myVector, float flimit);
 
 // masking functions