Index: branches/pap/psModules/src/imcombine/pmStack.h
===================================================================
--- branches/pap/psModules/src/imcombine/pmStack.h	(revision 25780)
+++ branches/pap/psModules/src/imcombine/pmStack.h	(revision 25964)
@@ -30,4 +30,5 @@
     psPixels *reject;                   ///< Pixels to reject
     psPixels *inspect;                  ///< Pixels to inspect
+    psPixels *discard;                  ///< Pixels to discard
     float weight;                       ///< Relative weighting for image
     float addVariance;                  ///< Additional variance when rejecting
@@ -49,9 +50,8 @@
                     float rej,          ///< Rejection limit (standard deviations)
                     float sys,          ///< Relative systematic error
-                    float discard,      ///< Fraction of values to discard for Olympic weighted mean
-                    bool entire,        ///< Combine entire image even if rejection lists provided?
+                    float olympic,      ///< Fraction of values to discard for Olympic weighted mean
                     bool useVariance,   ///< Use variance values for rejection?
                     bool safe,          ///< Play safe with small numbers of input pixels (mask if N <= 2)?
-                    bool rejectInspect  ///< Reject pixels instead of marking them for inspection?
+                    bool rejection      ///< Reject pixels instead of marking them for inspection?
     );