Changeset 42555 for trunk/psModules/src/imcombine/pmStack.c

Timestamp:

Dec 3, 2023, 2:51:47 PM (3 years ago)

Author:

eugene

Message:

pmStackCombineByPercentile option to set nminpix

File:

• trunk/psModules/src/imcombine/pmStack.c (modified) (6 diffs)

trunk/psModules/src/imcombine/pmStack.c

@@ -1548 +1548 @@
   } continue; }
 
+// combine pixels, averaging the inner XX percentile range, after rejecting 5-sigma outliers (robust 5 sigma)
 bool pmStackCombineByPercentile(
     pmReadout *combined,                // output stacked readout
@@ -1553 +1554 @@
     psArray *stackData,                 // input exposures
     psF64 rejectFraction,               // outlier fraction of pixels to reject
+    int nminpix,                        // minimum number of input values required to generate an output value
     psImageMaskType badMaskBits,        // treat these bits as 'bad'
     psImageMaskType suspectMaskBits,    // treat these bits as 'suspect'
     psImageMaskType blankMaskBits       // use this mask value for pixels missing input data (distinguish between Ninput = 0 and Ngood = 0?)
-    ) {
+                                ) {
     int minInputCols, maxInputCols, minInputRows, maxInputRows; // Smallest and largest values to combine
     int xSize, ySize;                   // Size of the output image
@@ -1640 +1642 @@
                 nGood ++;
             }
-# define MIN_GOOD_PERCENTILE 3
-
-            if (nGood < MIN_GOOD_PERCENTILE) ESCAPE;
+
+            if (nGood < nminpix) ESCAPE;
             
             pixelData->n = nGood;
@@ -1677 +1678 @@
             int nGoodClip = Nhi - Nlo;
 
-            int isTest = false;
+            int isTest = true;
             isTest = isTest || ((x == 4743) && (y == 2903));
             isTest = isTest || ((x == 4953) && (y == 2919));
@@ -1702 +1703 @@
             // 'AT_LEAST' means we reject at least 'rejectFraction' of values, but it could
             // be a higher percentage for smaller numbers of inputs.
-# define AT_LEAST 1
-# define MIN_GOOD_PERCENTILE 3
+# define AT_LEAST 0
+
 # if (AT_LEAST)
             int Ns = MIN(MAX(1, 0.5*rejectFraction * nGoodClip), nGoodClip) + Nlo;
@@ -1713 +1714 @@
             int Npt = Ne - Ns;
 # endif
-            if ((Npt < 1) || (nGood < MIN_GOOD_PERCENTILE)) ESCAPE;
+            if ((Npt < 1) || (nGood < nminpix)) ESCAPE;
 
             // Set the given (suspect) mask bit if nGoodBits[i] > f*nGood in other words