Changeset 36710

Timestamp:

Apr 30, 2014, 7:04:03 PM (12 years ago)

Author:

mhuber

Message:

adding option for minimum inputs per pixel in stack, default is 1

Location:

trunk

Files:

• ippconfig/gpc1/ppStack.config (modified) (1 diff)
• ippconfig/recipes/ppStack.config (modified) (1 diff)
• ppStack/src/ppStackReadout.c (modified) (4 diffs)
• psModules/src/imcombine/pmStack.c (modified) (4 diffs)
• psModules/src/imcombine/pmStack.h (modified) (1 diff)

trunk/ippconfig/gpc1/ppStack.config

@@ -167 +167 @@
     PSF.TARGET.AS.MAX  BOOL  TRUE
     PSF.TARGET.AS.MAX.EPSILON F32 0.1
-    THRESHOLD.MASK  F32     0.01             # Threshold for mask deconvolution (0..1)
+    THRESHOLD.MASK  F32     0.3             # Threshold for mask deconvolution (0..1)
     COMBINE.ITER    F32     0.5             # Number of rejection iterations per input
-    COMBINE.REJ     F32     2.5             # Rejection threshold in combination (sigma)
+    COMBINE.REJ     F32     3.5             # Rejection threshold in combination (sigma)
     COMBINE.SYS     F32     0.1             # Relative systematic error in combination
     COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
     IMAGE.REJ       F32     0.1             # Rejected pixel fraction threshold for rejecting entire image
+    NMINPIX         S32     10              # Minimum input per pixel -- testing 
+    MASK.VAL        STR     SUSPECT,MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels
 END
 

trunk/ippconfig/recipes/ppStack.config

@@ -32 +32 @@
 TARGET.FRAC     F32     0.1             # Minimum flux fraction for target PSF
 TARGET.MINMAG   F32     3.0             # Minimum magnitude difference to tolerate in stamp
+NMINPIX         S32     1               # Minimum input per pixel -- testing 
 
 BACKGROUND.MODEL    BOOL   FALSE        # Construct a stacked version of the warp stage background

trunk/ppStack/src/ppStackReadout.c

@@ -116 +116 @@
     bool useVariance = psMetadataLookupBool(&mdok, recipe, "VARIANCE"); // Use variance for rejection?
     bool safe = psMetadataLookupBool(&mdok, recipe, "SAFE"); // Be safe when combining small numbers of pixels
+   
+    int nminpix = psMetadataLookupS32(&mdok, recipe, "NMINPIX"); // Minimum input per pixel to combine with
 
     psMetadata *ppsub = psMetadataLookupMetadata(NULL, config->recipes, "PPSUB"); // PPSUB recipe
@@ -161 +163 @@
 
     if (!pmStackCombine(outRO, NULL, stack, maskBad, maskSuspect, maskBlank, kernelSize, iter,
-                        combineRej, combineSys, combineDiscard, useVariance, safe, false)) {
+                        combineRej, combineSys, combineDiscard, useVariance, safe, nminpix, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts with rejection.");
         psFree(stack);
@@ -218 +220 @@
     bool useVariance = psMetadataLookupBool(&mdok, recipe, "VARIANCE"); // Use variance for rejection?
     bool safe = psMetadataLookupBool(&mdok, recipe, "SAFE"); // Be safe when combining small numbers of pixels
+
+    int nminpix = psMetadataLookupS32(&mdok, recipe, "NMINPIX"); // Minimum input per pixel to combine with
 
     psString maskBadStr = psMetadataLookupStr(NULL, recipe, "MASK.VAL"); // Name of bits to mask for bad
@@ -275 +279 @@
 
     if (!pmStackCombine(outRO, expRO, stack, maskBad, maskSuspect, maskBlank, 0, iter, combineRej,
-                        combineSys, combineDiscard, useVariance, safe, rejected)) {
+                        combineSys, combineDiscard, useVariance, safe, nminpix, rejected)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts.");
         psFree(stack);

trunk/psModules/src/imcombine/pmStack.c

@@ -835 +835 @@
                           psImageMaskType goodMask, // Value for good pixels
                           bool safe,           // Safe combination?
+                          int nminpix,         // Minimum number of input per pixel
                           float invTotalWeight    // Inverse of total weight for all inputs
                           )
@@ -854 +855 @@
     CHECKPIX(x, y, "bad vs good : %x %x %x\n", maskValue, badMask, blankMask);
 
-    switch (num) {
+    //MEH -- hackish adding of lower limit for input per pixel 
+    int numN = num;
+    if (num < nminpix) {
+        CHECKPIX(x, y, "Nmin (%d) inputs (%d) to combine, pixel %d,%d is manually set bad\n", nminpix, numN, x, y);
+        numN = 0;
+    }
+    switch (numN) {
       case 0: {
           // Nothing to combine: it's bad
@@ -1518 +1525 @@
     bool useVariance, 
     bool safe, 
+    int nminpix,
     bool rejection)
 {
@@ -1692 +1700 @@
             psImageMaskType goodMask = 0; // OR of mask bits in all good input pixels
             combineExtract(&num, &suspect, &badMask, &goodMask, buffer, combinedImage, combinedMask, combinedVariance, input, weights, exps, addVariance, reject, x, y, badMaskBits, suspectMaskBits);
-            combinePixels(combinedImage, combinedMask, combinedVariance, exp, expnum, expweight, num, buffer, x, y, blankMaskBits, badMask, goodMask, safe, totalExpWeight);
+            combinePixels(combinedImage, combinedMask, combinedVariance, exp, expnum, expweight, num, buffer, x, y, blankMaskBits, badMask, goodMask, safe, nminpix, totalExpWeight);
 
             if (iter > 0) {

trunk/psModules/src/imcombine/pmStack.h

@@ -61 +61 @@
                     bool useVariance,   ///< Use variance values for rejection?
                     bool safe,          ///< Play safe with small numbers of input pixels (mask if N <= 2)?
+                    int nminpix,        ///< Minimum number input per pixel to combine
                     bool rejectInspect  ///< Reject pixels instead of marking them for inspection?
     );