Changeset 25964 for branches/pap/ppStack/src/ppStack.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/ppStack/src/ppStack.h (modified) (2 diffs)

branches/pap/ppStack/src/ppStack.h

@@ -59 +59 @@
 // Perform stacking on a readout
 //
-// Returns an array of pixels to inspect for each input image
+// Returns two arrays: pixels to inspect for each input image, and pixels to reject for each input image.
 psArray *ppStackReadoutInitial(const pmConfig *config,   // Configuration
                                pmReadout *outRO,   // Output readout
@@ -84 +84 @@
                          const psVector *weightings, // Weighting factors for each image
                          const psVector *addVariance, // Additional variance for rejection
-                         bool full,                   // Combine full image?
                          bool safety,                 // Enable safety switch?
                          const psVector *norm         // Normalisations to apply