Index: trunk/archive/modules/include/phase2.h
===================================================================
--- trunk/archive/modules/include/phase2.h	(revision 910)
+++ trunk/archive/modules/include/phase2.h	(revision 918)
@@ -25,12 +25,12 @@
 
 /** Returns the kernel of OT shifts made during the course of the exposure. */
-psImage *phase2GetKernel(psVector *shifts ///< List of OT shifts, from which the kernel will be calculated
-			 );
+psImage *psPhase2GetKernel(psVector *shifts ///< List of OT shifts, from which the kernel will be calculated
+			   );
 
 /** Returns an image that is the result of convolving the input image with the specified kernel. */
-psReadout *phase2ConvolveWithKernel(psReadout *out, ///< Output image, or NULL
-				    const psReadout *in, ///< Input image to be convolved
-				    const psImage *kernel ///< Kernel by which to convolve
-				    );
+psReadout *psPhase2ConvolveWithKernel(psReadout *out, ///< Output image, or NULL
+				      const psReadout *in, ///< Input image to be convolved
+				      const psImage *kernel ///< Kernel by which to convolve
+				      );
 
 /************************************************************************************************************/
@@ -78,16 +78,17 @@
 
 /** Subtracts an overscan and bias from the input image. */
-psReadout *phase2SubtractBias(psReadout *in, ///< Input image to be de-biased, and output
-			      psPolynomial1D *polySpec, ///< Polynomial specification to use for fit, outputed
-			      const psImageRegionArray *regions, ///< Bias regions
-			      psOverscanAxis overscanAxis, ///< Overscan axis
-			      const psStatsOptions *stat, ///< Statistic to use
-			      const psImage *bias ///< Bias (or dark) image to subtract
-			      );
+psReadout *psPhase2SubtractBias(psReadout *in, ///< Input image to be de-biased, and output
+				psPolynomial1D *polySpec, ///< Polynomial specification to use for fit,
+							  ///< outputed
+				const psImageRegionArray *regions, ///< Bias regions
+				psOverscanAxis overscanAxis, ///< Overscan axis
+				const psStatsOptions *stat, ///< Statistic to use
+				const psImage *bias ///< Bias (or dark) image to subtract
+				);
 
 /** Trims the input image to remove the edges corrupted by OT shifting, and the overscan. */
-psReadout *phase2Trim(psReadout *in,	///< Input image to be trimmed, and output
-		      const psImageRegion *region ///< Region to keep
-		      );
+psReadout *psPhase2Trim(psReadout *in,	///< Input image to be trimmed, and output
+			const psImageRegion *region ///< Region to keep
+			);
 
 /************************************************************************************************************/
@@ -99,18 +100,18 @@
  *  image metadata.
  */
-psReadout *phase2CorrectNonLinearity(psReadout *in, ///< Input image to be corrected, and output
-				     psPolynomial1D *coeff ///< Polynomial with which to correct
-				     );
+psReadout *psPhase2CorrectNonLinearity(psReadout *in, ///< Input image to be corrected, and output
+				       psPolynomial1D *coeff ///< Polynomial with which to correct
+				       );
 
 /** Flat-fields the image. */
-psReadout *phase2FlatField(psReadout *in, ///< Input image to be flat-fielded, and output
-			   const psReadout *flat ///< Flat-field image
-			   );
+psReadout *psPhase2FlatField(psReadout *in, ///< Input image to be flat-fielded, and output
+			     const psImage *flat ///< Flat-field image
+			     );
 
 /** Subtracts the sky background. */
-psReadout *phase2SubtractSky(psReadout *in, ///< Input image to be sky-subtracted, and output
-			     psPolynomial2D *poly, ///< Polynomial specification, returns coeffcients
-			     const psImageArray *skyImages ///< Array of sky images
-			     );
+psReadout *psPhase2SubtractSky(psReadout *in, ///< Input image to be sky-subtracted, and output
+			       psPolynomial2D *poly, ///< Polynomial specification, returns coeffcients
+			       const psImageArray *skyImages ///< Array of sky images
+			       );
 
 /************************************************************************************************************/
@@ -119,19 +120,19 @@
 
 /** Returns an image that has the bad pixels masked.  Also masks saturated pixels */
-psReadout *phase2MaskBadPixels(psReadout *in ///< Image to be masked, and output
-			       const psImage *mask ///< Bad pixel mask to apply
-			       );
+psReadout *psPhase2MaskBadPixels(psReadout *in ///< Image to be masked, and output
+				 const psImage *mask ///< Bad pixel mask to apply
+				 );
 
 /** Masks Cosmic Rays on the input image on the basis of morphology. */
-psReadout *phase2MaskCRs(psReadout *in,	///< Input image to be masked, and output
-			 int algorithm,	///< Algorithm number to use
-			 const void *params ///< Parameters for algorithm
-			 );
+psReadout *psPhase2MaskCRs(psReadout *in, ///< Input image to be masked, and output
+			   int algorithm, ///< Algorithm number to use
+			   const void *params ///< Parameters for algorithm
+			   );
 
 /** Masks optical defects in the input image */
-psChip *phase2MaskOpticalDefects(psChip *in, ///< Image to be masked (with astrometry), and output
-				 const psDlist *catalog, ///< Catalog stars nearby: a list of psObjects
-				 int grow ///< Number of pixels to grow
-				 );
+psChip *psPhase2MaskOpticalDefects(psChip *in, ///< Image to be masked (with astrometry), and output
+				   const psDlist *catalog, ///< Catalog stars nearby: a list of psObjects
+				   int grow ///< Number of pixels to grow
+				   );
 
 /************************************************************************************************************/
@@ -140,14 +141,14 @@
 
 /** Measures the PSF on the input image.  Returns the PSF */
-psImage *phase2MeasurePSF(const psReadout *in, ///< Input image for which to measure the PSF
-			  int algorithm, ///< Algorithm number to use
-			  const void *params ///< Parameters for algorithm
-			  );
+psImage *psPhase2MeasurePSF(const psReadout *in, ///< Input image for which to measure the PSF
+			    int algorithm, ///< Algorithm number to use
+			    const void *params ///< Parameters for algorithm
+			    );
 
 /** Find and measure objects on the input image.  Fills in the "objects" member of the psReadout */
-psReadout *phase2GetObjects(psReadout *in, ///< Input image on which to find objects, and output
-			    const psImage *psf, ///< PSF to use to find objects
-			    const psVector *levels ///< Threshold levels (std dev.s)
-			    );
+psReadout *psPhase2GetObjects(psReadout *in, ///< Input image on which to find objects, and output
+			      const psImage *psf, ///< PSF to use to find objects
+			      const psVector *levels ///< Threshold levels (std dev.s)
+			      );
 
 /************************************************************************************************************/
@@ -156,9 +157,9 @@
 
 /** Corrects astrometry on the input chip */
-psChip *phase2Astrometry(psChip *in,	///< Input chip for which to do astrometry, and output
-			 const psDlist *catalog, ///< Catalog stars on the chip: a list of psObjects
-			 int nClips,	///< Number of clipping iterations
-			 float clipLevel ///< Level at which to clip
-			 );
+psChip *psPhase2Astrometry(psChip *in,	///< Input chip for which to do astrometry, and output
+			   const psDlist *catalog, ///< Catalog stars on the chip: a list of psObjects
+			   int nClips,	///< Number of clipping iterations
+			   float clipLevel ///< Level at which to clip
+			   );
 
 /************************************************************************************************************/
@@ -173,8 +174,8 @@
 
 /** Return postage stamps of a set of regions */
-psImageArray *phase2PostageStamps(const psChip *in, ///< Chip from which to form postage stamps
-				  const psDlist *regions ///< Regions to postage-stampise: a list of
-				                         ///< psPostageStampSpec
-);
+psImageArray *psPhase2PostageStamps(const psChip *in, ///< Chip from which to form postage stamps
+				    const psDlist *regions ///< Regions to postage-stampise: a list of
+				                           ///< psPostageStampSpec
+				    );
 
 /************************************************************************************************************/