Index: trunk/ppSub/src/ppSub.h
===================================================================
--- trunk/ppSub/src/ppSub.h	(revision 21360)
+++ trunk/ppSub/src/ppSub.h	(revision 21524)
@@ -6,6 +6,6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 01:37:17 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -14,14 +14,6 @@
 #define PP_SUB_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
 #include <pslib.h>
 #include <psmodules.h>
-#include <psphot.h>
-#include <ppStats.h>
 
 /// @addtogroup ppSub
@@ -32,5 +24,5 @@
 /// Setup the arguments parsing
 bool ppSubArgumentsSetup(int argc, char *argv[], ///< Command-line arguments
-			 pmConfig *config    ///< Configuration
+                         pmConfig *config    ///< Configuration
     );
 
@@ -53,47 +45,41 @@
     );
 
-/// generate (if needed) and set or update the masks for input and reference images
-bool ppSubSetMasks (pmConfig *config,	  ///< Configuration
-		    const pmFPAview *view ///< View of active readout
+/// Generate (if needed) and set or update the masks for input and reference images
+bool ppSubSetMasks(pmConfig *config,     ///< Configuration
+                   const pmFPAview *view ///< View of active readout
     );
 
-/// Generate the PSF-matching kernel and convolve the images as needed.  Most of this function
-/// involves looking up the parameters in the recipe and supplying them to the function
-/// pmSubtractionMatch()
-bool ppSubMatchPSFs (pmConfig *config,	  ///< Configuration
-		     const pmFPAview *view ///< View of active readout
+/// Generate the PSF-matching kernel and convolve the images as needed.  Most of this function involves
+/// looking up the parameters in the recipe and supplying them to the function pmSubtractionMatch()
+bool ppSubMatchPSFs(pmConfig *config,    ///< Configuration
+                    const pmFPAview *view ///< View of active readout
     );
 
-/// generate the output readout and pass the kernel info to the header 
-bool ppSubDefineOutput(pmConfig *config,	  ///< Configuration
-		       const pmFPAview *view ///< View of active readout
+/// Generate the output readout and pass the kernel info to the header
+bool ppSubDefineOutput(pmConfig *config, ///< Configuration
+                       const pmFPAview *view ///< View of active readout
     );
 
-/// Calculate the variance factor for the output image based on the input images
-bool ppSubVarianceFactors(pmConfig *config,	  ///< Configuration
-			  psMetadata *stats,    ///< Statistics, for output
-			  const pmFPAview *view ///< View of active readout
-    );
-
-/// Photometry stage 1: measure the PSF from the minuend image 
-bool ppSubMakePSF(pmConfig *config,	  ///< Configuration
-		  const pmFPAview *view ///< View of active readout
+/// Photometry stage 1: measure the PSF from the minuend image
+bool ppSubMakePSF(pmConfig *config,       ///< Configuration
+                  const pmFPAview *view ///< View of active readout
     );
 
 /// Perform the actual image subtraction, update output concepts
-bool ppSubReadoutSubtract(pmConfig *config,	  ///< Configuration
-			  const pmFPAview *view ///< View of active readout
+bool ppSubReadoutSubtract(pmConfig *config,       ///< Configuration
+                          const pmFPAview *view ///< View of active readout
     );
 
 
 /// Photometry stage 2: find and measure sources on the subtracted image
-bool ppSubReadoutPhotometry(pmConfig *config,	  ///< Configuration
-			    psMetadata *stats,    ///< Statistics, for output
-			    const pmFPAview *view ///< View of active readout
+bool ppSubReadoutPhotometry(pmConfig *config,     ///< Configuration
+                            psMetadata *stats,    ///< Statistics, for output
+                            const pmFPAview *view ///< View of active readout
     );
 
 /// Renormalize, update headers and generate JPEGs
-bool ppSubReadoutUpdate(pmConfig *config,	  ///< Configuration
-			const pmFPAview *view ///< View of active readout
+bool ppSubReadoutUpdate(pmConfig *config, ///< Configuration
+                        psMetadata *stats, ///< Statistics for output, or NULL
+                        const pmFPAview *view ///< View of active readout
     );
 
@@ -107,23 +93,4 @@
     );
 
-/// Generate and Set the masks if needed
-bool ppSubSetMasks (
-    pmConfig *config,			///< Configuration
-    const pmFPAview *view 		///< view to readout
-    );
-
-/// Renormalize readout for peak pixels
-bool ppSubReadoutRenormPixels (
-    pmConfig *config, 			///< Configuration
-    psMetadata *recipe, 			///< Recipe
-    pmReadout *readout			///< Readout
-    );
-
-/// Renormalize readout for photometry analysis
-bool ppSubReadoutRenormPhot (
-    pmConfig *config, 			///< Configuration
-    psMetadata *recipe, 			///< Recipe
-    pmReadout *readout			///< Readout
-    );
 
 // Copy every instance of a single keyword from one metadata to another