Index: trunk/psphot/src/psphot.h
===================================================================
--- trunk/psphot/src/psphot.h	(revision 13593)
+++ trunk/psphot/src/psphot.h	(revision 13900)
@@ -16,5 +16,5 @@
 psString        psphotVersionLong(void);
 
-bool            psphotModelTest (pmReadout *readout, psMetadata *recipe);
+bool            psphotModelTest (pmReadout *readout, psMetadata *recipe, psMaskType maskVal, psMaskType mark);
 bool            psphotReadout (pmConfig *config, const pmFPAview *view);
 bool            psphotReadoutCleanup (pmConfig *config, pmReadout *readout, psMetadata *recipe, pmPSF *psf, psArray *sources);
@@ -26,14 +26,14 @@
 
 // psphotReadout functions
-bool            psphotImageMedian (pmConfig *config, const pmFPAview *view);
+bool            psphotImageMedian (pmConfig *config, const pmFPAview *view, psMaskType maskVal);
 psArray        *psphotFindPeaks (pmReadout *readout, psMetadata *recipe,
-                                 const bool returnFootprints, const int pass);
+                                 const bool returnFootprints, const int pass, psMaskType maskVal);
 #include "pmFootprint.h"
 psErrorCode     psphotCullPeaks(const psImage *img, const psImage *weight,
                                 const psMetadata *recipe, psArray *footprints);
-psArray        *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *allpeaks);
-bool            psphotRoughClass (psArray *sources, psMetadata *recipe, const bool findPsfClump);
+psArray        *psphotSourceStats (pmReadout *readout, psMetadata *recipe, psArray *allpeaks, psMaskType maskVal, psMaskType mark);
+bool            psphotRoughClass (psArray *sources, psMetadata *recipe, const bool findPsfClump, psMaskType maskSat);
 bool            psphotBasicDeblend (psArray *sources, psMetadata *recipe);
-pmPSF          *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe);
+pmPSF          *psphotChoosePSF (pmReadout *readout, psArray *sources, psMetadata *recipe, psMaskType maskVal, psMaskType mark);
 bool            psphotPSFstats (pmReadout *readout, psMetadata *recipe, pmPSF *psf);
 bool            psphotMomentsStats (pmReadout *readout, psMetadata *recipe, psArray *sources);
@@ -41,11 +41,11 @@
 bool            psphotEnsemblePSF (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, bool final);
 #endif
-bool            psphotFitSourcesLinear (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, bool final);
-bool            psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
-bool            psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
-bool            psphotReplaceUnfit (psArray *sources);
-bool            psphotReplaceAll (psArray *sources);
-bool            psphotApResid (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf);
-bool            psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background);
+bool            psphotFitSourcesLinear (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, bool final, psMaskType maskVal);
+bool            psphotGuessModels (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal);
+bool            psphotBlendFit (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal);
+bool            psphotReplaceUnfit (psArray *sources, psMaskType maskVal);
+bool            psphotReplaceAll (psArray *sources, psMaskType maskVal);
+bool            psphotApResid (pmReadout *readout, psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal, psMaskType mark);
+bool            psphotMagnitudes (psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background, psMaskType maskVal, psMaskType mark);
 bool            psphotSkyReplace (pmConfig *config, const pmFPAview *view);
 
@@ -56,6 +56,6 @@
 int             pmSourceSortBySN (const void **a, const void **b);
 int             pmSourceSortByY (const void **a, const void **b);
-bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore);
-bool            psphotMaskReadout (pmReadout *readout, psMetadata *recipe, pmConfig *config);
+bool            psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore, psMaskType maskVal);
+bool            psphotMaskReadout (pmReadout *readout, psMetadata *recipe, psMaskType maskVal);
 void            psphotSourceFreePixels (psArray *sources);
 
@@ -83,12 +83,12 @@
 bool            psphotInitLimitsPSF (psMetadata *recipe, pmReadout *readout);
 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            psphotFitBlend (pmReadout *readout, pmSource *source, pmPSF *psf, psMaskType maskVal);
+bool            psphotFitBlob (pmReadout *readout, pmSource *source, psArray *sources, pmPSF *psf, psMaskType maskVal);
+bool            psphotFitPSF (pmReadout *readout, pmSource *source, pmPSF *psf, psMaskType maskVal);
+pmModel        *psphotFitEXT (pmReadout *readout, pmSource *source, psMaskType maskVal);
+psArray        *psphotFitDBL (pmReadout *readout, pmSource *source, psMaskType maskVal);
 
 // 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, psMaskType maskVal);
 
 // plotting functions (available if libkapa is installed)
@@ -101,16 +101,16 @@
 pmPSF          *psphotLoadPSF (pmConfig *config, const pmFPAview *view, psMetadata *recipe);
 bool            psphotSetHeaderNstars (psMetadata *recipe, psArray *sources);
-bool            psphotAddNoise (pmReadout *readout, psArray *sources, psMetadata *recipe, bool add);
+bool            psphotAddNoise (pmReadout *readout, psArray *sources, psMetadata *recipe, bool add, psMaskType maskVal);
 bool            psphotRadialPlot (int *kapa, const char *filename, pmSource *source);
-bool            psphotSourcePlots (pmReadout *readout, psArray *sources, psMetadata *recipe);
+bool            psphotSourcePlots (pmReadout *readout, psArray *sources, psMetadata *recipe, psMaskType maskVal);
 bool            psphotMosaicSubimage (psImage *outImage, pmSource *source, int Xo, int Yo, int DX, int DY);
 
-bool            psphotAddWithTest (pmSource *source, bool useState);
-bool            psphotSubWithTest (pmSource *source, bool useState);
-bool            psphotSetState (pmSource *source, bool curState);
+bool            psphotAddWithTest (pmSource *source, bool useState, psMaskType maskVal);
+bool            psphotSubWithTest (pmSource *source, bool useState, psMaskType maskVal);
+bool            psphotSetState (pmSource *source, bool curState, psMaskType maskVal);
 bool            psphotDeblendSatstars (psArray *sources, psMetadata *recipe);
 bool            psphotSourceSize (pmReadout *readout, psArray *sources, psMetadata *recipe);
 
-bool            psphotMakeResiduals (psArray *sources, psMetadata *recipe, pmPSF *psf);
+bool            psphotMakeResiduals (psArray *sources, psMetadata *recipe, pmPSF *psf, psMaskType maskVal);
 
 #endif