Index: branches/pap/psModules/src/imcombine/pmSubtractionKernels.h
===================================================================
--- branches/pap/psModules/src/imcombine/pmSubtractionKernels.h	(revision 26707)
+++ branches/pap/psModules/src/imcombine/pmSubtractionKernels.h	(revision 26717)
@@ -12,5 +12,5 @@
     PM_SUBTRACTION_KERNEL_ISIS_RADIAL,  ///< ISIS + higher-order radial Hermitians
     PM_SUBTRACTION_KERNEL_HERM,         ///< Hermitian polynomial kernels
-    PM_SUBTRACTION_KERNEL_DECONV_HERM,	///< Deconvolved Hermitian polynomial kernels
+    PM_SUBTRACTION_KERNEL_DECONV_HERM,  ///< Deconvolved Hermitian polynomial kernels
     PM_SUBTRACTION_KERNEL_SPAM,         ///< Summed Pixels for Advanced Matching --- summed delta functions
     PM_SUBTRACTION_KERNEL_FRIES,        ///< Fibonacci Radius Increases Excellence of Subtraction
@@ -37,4 +37,5 @@
     psVector *uStop, *vStop;            ///< Width of kernel element (SPAM,FRIES only)
     psArray *preCalc;                   ///< Array of images containing pre-calculated kernel (for ISIS, HERM or DECONV_HERM)
+    psKernel *norm;                     ///< Normalisation component
     float penalty;                      ///< Penalty for wideness
     psVector *penalties;                ///< Penalty for each kernel component
@@ -49,22 +50,22 @@
     float mean, rms;                    ///< Mean and RMS of chi^2 from stamps
     int numStamps;                      ///< Number of good stamps
-    float fSigResMean;			///< mean fractional stdev of residuals
-    float fSigResStdev;			///< stdev of fractional stdev of residuals
-    float fMaxResMean;			///< mean fractional positive swing in residuals
-    float fMaxResStdev;			///< stdev of fractional positive swing in residuals
-    float fMinResMean;			///< mean fractional negative swing in residuals
-    float fMinResStdev;			///< stdev of fractional negative swing in residuals
-    psArray *sampleStamps;		///< array of brightest set of stamps for output visualizations
+    float fSigResMean;                  ///< mean fractional stdev of residuals
+    float fSigResStdev;                 ///< stdev of fractional stdev of residuals
+    float fMaxResMean;                  ///< mean fractional positive swing in residuals
+    float fMaxResStdev;                 ///< stdev of fractional positive swing in residuals
+    float fMinResMean;                  ///< mean fractional negative swing in residuals
+    float fMinResStdev;                 ///< stdev of fractional negative swing in residuals
+    psArray *sampleStamps;              ///< array of brightest set of stamps for output visualizations
 } pmSubtractionKernels;
 
 // pmSubtractionKernels->preCalc is an array of pmSubtractionKernelPreCalc structures
 typedef struct {
-    psVector *uCoords;			// used by RINGS
-    psVector *vCoords;			// used by RINGS
-    psVector *poly;			// used by RINGS
-
-    psVector *xKernel;			// used by ISIS, HERM, DECONV_HERM
-    psVector *yKernel;			// used by ISIS, HERM, DECONV_HERM
-    psKernel *kernel;			// used by ISIS, HERM, DECONV_HERM
+    psVector *uCoords;                  // used by RINGS
+    psVector *vCoords;                  // used by RINGS
+    psVector *poly;                     // used by RINGS
+
+    psVector *xKernel;                  // used by ISIS, HERM, DECONV_HERM
+    psVector *yKernel;                  // used by ISIS, HERM, DECONV_HERM
+    psKernel *kernel;                   // used by ISIS, HERM, DECONV_HERM
 } pmSubtractionKernelPreCalc;
 
@@ -168,8 +169,8 @@
 pmSubtractionKernelPreCalc *pmSubtractionKernelPreCalcAlloc(
     pmSubtractionKernelsType type, ///< type of kernel to allocate (not all can be pre-calculated)
-    int uOrder,			   ///< order in x-direction 
-    int vOrder,			   ///< order in x-direction 
-    int size,			   ///< Half-size of the kernel
-    float sigma			   ///< sigma of gaussian kernel
+    int uOrder,                    ///< order in x-direction
+    int vOrder,                    ///< order in x-direction
+    int size,                      ///< Half-size of the kernel
+    float sigma                    ///< sigma of gaussian kernel
     );
 
@@ -202,9 +203,9 @@
 /// Generate ISIS + RADIAL_HERM kernels
 pmSubtractionKernels *pmSubtractionKernelsISIS_RADIAL(int size, ///< Half-size of the kernel
-						      int spatialOrder, ///< Order of spatial variations
-						      const psVector *fwhms, ///< Gaussian FWHMs
-						      const psVector *orders, ///< Polynomial order of gaussians
-						      float penalty, ///< Penalty for wideness
-						      pmSubtractionMode mode ///< Mode for subtraction
+                                                      int spatialOrder, ///< Order of spatial variations
+                                                      const psVector *fwhms, ///< Gaussian FWHMs
+                                                      const psVector *orders, ///< Polynomial order of gaussians
+                                                      float penalty, ///< Penalty for wideness
+                                                      pmSubtractionMode mode ///< Mode for subtraction
                                                );
 
@@ -220,9 +221,9 @@
 /// Generate DECONV_HERM kernels
 pmSubtractionKernels *pmSubtractionKernelsDECONV_HERM(int size, ///< Half-size of the kernel
-						     int spatialOrder, ///< Order of spatial variations
-						     const psVector *fwhms, ///< Gaussian FWHMs
-						     const psVector *orders, ///< order of hermitian polynomials
-						     float penalty, ///< Penalty for wideness
-						     pmSubtractionMode mode ///< Mode for subtraction
+                                                     int spatialOrder, ///< Order of spatial variations
+                                                     const psVector *fwhms, ///< Gaussian FWHMs
+                                                     const psVector *orders, ///< order of hermitian polynomials
+                                                     float penalty, ///< Penalty for wideness
+                                                     pmSubtractionMode mode ///< Mode for subtraction
     );