Changeset 27517 for branches/eam_branches/20100225/magic/remove/src/streaksremove.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• magic/remove/src/streaksremove.c (modified) (9 diffs)

branches/eam_branches/20100225/magic/remove/src/streaksremove.c

@@ -12 +12 @@
 static pmConfig *parseArguments(int argc, char **argv);
 static bool readAndCopyToOutput(streakFiles *sf, bool exciseAll);
-static void exciseNonDiffedPixels(streakFiles *sfiles, psImageMaskType newMaskValue);
+static long exciseNonDiffedPixels(streakFiles *sfiles, psImageMaskType newMaskValue);
 static bool diffedPixel(streakFiles *sfiles, int x, int y);
 static void excisePixel(streakFiles *sfiles, unsigned int x, unsigned int y, bool streak, psImageMaskType newMaskValue);
@@ -104 +104 @@
     long totalPixels = 0;
     long totalStreakPixels = 0;
+    long nonDiffedPixels = 0;
 
     // accumulators for the various timers
@@ -153 +154 @@
                     // set non-diffed pixels and variance to NAN, mask to maskStreak (since the pixel
                     // is excised as part of the destreaking process)
-                    exciseNonDiffedPixels(sfiles, sfiles->maskStreak);
+                    nonDiffedPixels += exciseNonDiffedPixels(sfiles, sfiles->maskStreak);
 
                     enw_t +=  psTimerClear("EXCISE_NON_DIFFED");
@@ -215 +216 @@
 
     psF64 streakFraction = (double) totalStreakPixels / totalPixels;
-    psLogMsg("streaksremove", PS_LOG_INFO, "pixels: %ld streak pixels: %ld %4.2f%%\n", totalPixels, totalStreakPixels, streakFraction * 100);
+    psLogMsg("streaksremove", PS_LOG_INFO, "   total pixels:  %8ld\n", totalPixels);
+    psLogMsg("streaksremove", PS_LOG_INFO, "  streak pixels:  %8ld %4.2f%%\n", totalStreakPixels, streakFraction * 100);
     psMetadataAddF32(sfiles->stats, PS_LIST_TAIL, "STREAK_FRACTION", PS_META_REPLACE, "", streakFraction);
+
+    psF64 nonDiffedFraction = (double) nonDiffedPixels / totalPixels;
+    psLogMsg("streaksremove", PS_LOG_INFO, "nondiffed pixels:  %8ld %4.2f%%\n", nonDiffedPixels, nonDiffedFraction * 100);
+    psMetadataAddF32(sfiles->stats, PS_LIST_TAIL, "NONDIFFED_FRACTION", PS_META_REPLACE, "", nonDiffedFraction);
 
     // check the weight and mask files for extra extensions that might be in files
@@ -305 +311 @@
         for (int x = 0; x < sfiles->inImage->numCols; x++) {
             if (psImageGet(pixels, x, y)) {
-                ++streakPixels;
                 if (!checkNonDiffedPixels || diffedPixel(sfiles, x, y)) {
+                    ++streakPixels;
 
                     excisePixel(sfiles, x, y, true, maskStreak);
@@ -795 +801 @@
 }
 
-static void
+static long
 exciseNonDiffedPixels(streakFiles *sfiles, psImageMaskType newMaskValue)
 {
@@ -804 +810 @@
     int numCols = sfiles->inImage->numCols; // for raw images this was calculated from the width of datasec
     int numRows = sfiles->inImage->numRows; // for raw images this was calculated from the height of datasec
+
+    long excisedPixels = 0;
 
 //    printf("%2d x0: %4d y0: %4d xpar: %d ypar: %d\n", sfiles->extnum, cell_x0, cell_y0, xParity, yParity);
@@ -825 +833 @@
                 if (! *pixels ) {
                     excisePixel(sfiles, xCell, yCell, false, newMaskValue);
+                    excisedPixels++;
                 }
             }
@@ -834 +843 @@
                 if (!*pixels) {
                     excisePixel(sfiles, xCell, yCell, false, newMaskValue);
+                    excisedPixels++;
                 }
             }
         }
     }
+    return excisedPixels;
 }