Changeset 25964 for branches/pap/psModules/src/imcombine/pmStack.h

Timestamp:

Oct 28, 2009, 5:35:05 PM (17 years ago)

Author:

Paul Price

Message:

Reworking stack combination because there are *three* modes for pixels going into the final stack (after rejection), not just two: tested and good, tested and rejected, and not tested. The code did not recognise the third, which is a distinct state because we don't want these pixels grown, as we do for rejected pixels. This cannot be fixed merely by using the 'safe' combination because that would discard the 'tested and good' pixels that have only a single unrejected input but are good because they have survived the testing process. Needed to add a new state into the combination process. Now I add these pixels straight into the 'reject' list. This requires a little bit more fiddling around in ppStack. Not sure it's working yet.

File:

• branches/pap/psModules/src/imcombine/pmStack.h (modified) (2 diffs)

branches/pap/psModules/src/imcombine/pmStack.h

@@ -30 +30 @@
     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 +50 @@
                     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?
     );