Changeset 15953

Timestamp:

Dec 28, 2007, 12:52:30 PM (18 years ago)

Author:

eugene

Message:

modification to the grow algorithm

Location:

trunk/ppMerge/src

Files:

• ppMergeMask.h (modified) (1 diff)
• ppMergeMaskGrow.c (modified) (4 diffs)
• ppMergeOptions.c (modified) (2 diffs)
• ppMergeOptions.h (modified) (1 diff)

trunk/ppMerge/src/ppMergeMask.h

@@ -37 +37 @@
     );
 
-bool ppMergeMaskGrowReadout (pmReadout *readout, psMaskType maskVal);
+bool ppMergeMaskGrowReadout (pmReadout *readout, psMaskType maskVal, int nPixels);
 
 bool ppMergeMaskReadoutStats(const pmReadout *readout, 

trunk/ppMerge/src/ppMergeMaskGrow.c

@@ -18 +18 @@
 // Generate a mask
 bool ppMergeMaskGrow(ppMergeData *data,  // Data
-                    ppMergeOptions *options, // Options
-                    pmConfig *config    // Configuration
+                     ppMergeOptions *options, // Options
+                     pmConfig *config    // Configuration
     )
 {
@@ -35 +35 @@
             while ((roOut = pmFPAviewNextReadout(view, fpaOut, 1))) {
 
-                ppMergeMaskGrowReadout(roOut, options->combine->maskVal);
-
+                // do this N iterations (XXX add to options)
+                ppMergeMaskGrowReadout(roOut, options->combine->maskVal, options->growPixels);
+                ppMergeMaskGrowReadout(roOut, options->combine->maskVal, options->growPixels);
             }
         }
@@ -46 +47 @@
 }
 
-# define NGROW 2
-
-bool ppMergeMaskGrowReadout (pmReadout *readout, psMaskType maskVal) {
+bool ppMergeMaskGrowReadout (pmReadout *readout, psMaskType maskVal, int nPixels) {
 
     if (!readout->mask) return true;
@@ -62 +61 @@
     for (int iy = 0; iy < Ny; iy++) {
         for (int ix = 0; ix < Nx; ix++) {
-
-            if (oldMask->data.U8[iy][ix] && maskVal) {
-
-                for (int jy = -NGROW; jy <= +NGROW; jy++) {
-                    int ny = iy + jy;
-                    if (ny < 0) continue;
-                    if (ny >= Ny) continue;
-                    for (int jx = -NGROW; jx <= +NGROW; jx++) {
-                        int nx = ix + jx;
-                        if (nx < 0) continue;
-                        if (nx >= Nx) continue;
-                        newMask->data.U8[ny][nx] |= oldMask->data.U8[iy][ix];
+            int nSum = 0;
+            for (int jy = -1; jy <= +1; jy++) {
+                int ny = iy + jy;
+                if (ny < 0) continue;
+                if (ny >= Ny) continue;
+                for (int jx = -1; jx <= +1; jx++) {
+                    if (!jx && !jy) continue;
+                    int nx = ix + jx;
+                    if (nx < 0) continue;
+                    if (nx >= Nx) continue;
+                    if (oldMask->data.U8[ny][nx] & maskVal) {
+                        nSum ++;
                     }
                 }
             }
+            if (nSum >= nPixels) {
+                newMask->data.U8[iy][ix] = maskVal;
+            } else {
+                newMask->data.U8[iy][ix] = oldMask->data.U8[iy][ix];
+            }
         }
     }
-
     psFree (readout->mask);
     readout->mask = newMask;

trunk/ppMerge/src/ppMergeOptions.c

@@ -64 +64 @@
     options->satMask = 0x00;
     options->badMask = 0x00;
+    options->growPixels = 0;
     return options;
 }
@@ -156 +157 @@
     OPTION_PARSE(options->maskBad,           recipe, "MASK.BAD",       F32);
     OPTION_PARSE(options->statsByChip,       recipe, "STATS.BY.CHIP",  Bool);
+    OPTION_PARSE(options->growPixels,        recipe, "MASK.GROW.NPIX", S32);
 
     const char *masks = psMetadataLookupStr(NULL, recipe, "MASKVAL");

trunk/ppMerge/src/ppMergeOptions.h

@@ -43 +43 @@
     psMaskType satMask;                 // Mask value for saturated pixels
     psMaskType badMask;                 // Mask value for bad (low) pixels
+    int growPixels;
 } ppMergeOptions;