Changeset 26408 for trunk/magic/remove/src

Timestamp:

Dec 15, 2009, 2:10:35 PM (16 years ago)

Author:

bills

Message:

Completion to previous fix. If component is completely excised set the STREAK
bit in all pixels in the mask image

Location:

trunk/magic/remove/src

Files:

• streaksio.c (modified) (3 diffs)
• streaksio.h (modified) (1 diff)
• streaksrelease.c (modified) (2 diffs)
• streaksremove.c (modified) (8 diffs)
• streaksremove.h (modified) (1 diff)

trunk/magic/remove/src/streaksio.c

@@ -1182 +1182 @@
 
 void
-strkGetMaskValues(streakFiles *sfiles, psU32 *maskStreak, psU32 *maskMask)
-{
+strkGetMaskValues(streakFiles *sfiles)
+{
+    if (sfiles->maskStreak) {
+        // already done
+        return;
+    }
     if (sfiles->inMask && sfiles->inMask->header) {
         if (!pmConfigMaskReadHeader(sfiles->config, sfiles->inMask->header)) {
@@ -1196 +1200 @@
         streaksExit("", PS_EXIT_CONFIG_ERROR);
     }
-    *maskStreak = psMetadataLookupU32(&status, masks, "STREAK");
+    sfiles->maskStreak = psMetadataLookupU32(&status, masks, "STREAK");
     if (!status) {
         psError(PM_ERR_CONFIG, false, "failed to lookup mask value for STREAK in recipes\n");
@@ -1212 +1216 @@
         }
     }
-    *maskMask = ~convPoor;
+    sfiles->maskMask = ~convPoor;
 }
 

trunk/magic/remove/src/streaksio.h

@@ -16 +16 @@
 void copyFitsOptions(sFile *out, sFile *rec, sFile *in, psVector *tiles);
 void setupImageRefs(sFile *out, sFile *recoveryOut, sFile *in, int extnum, bool exciseAll);
-void strkGetMaskValues(streakFiles *sfiles, psU32 *maskStreak, psU32 *maskMask);
+void strkGetMaskValues(streakFiles *sfiles);
 void copyExtraExtensions(streakFiles *sfiles);
 

trunk/magic/remove/src/streaksrelease.c

@@ -16 +16 @@
         return PS_EXIT_CONFIG_ERROR;
     }
-
-    // Values to set for masked pixels
-    psU32 maskStreak = 0;           // for the image and weight (usually NAN, MAXINT for integer images)
-    psU32 maskMask = 0;             // value looked up for MASK.STREAK
 
     // Does true work here?
@@ -50 +46 @@
 
         // now that we've read the input files, lookup the mask values that we read
-        if (maskStreak == 0) {
-            strkGetMaskValues(sfiles, &maskStreak, &maskMask);
-        }
-
-        setMaskedToNAN(sfiles, maskMask, true);
+        strkGetMaskValues(sfiles);
+
+        setMaskedToNAN(sfiles, sfiles->maskMask, true);
 
         // write out the destreaked temporary images and the recovery images

trunk/magic/remove/src/streaksremove.c

@@ -34 +34 @@
     }
 
-    // Values to set for masked pixels
-    psU32 maskStreak = 0;           // for the image and weight (usually NAN, MAXINT for integer images)
-    psU32 maskMask = 0;             // value looked up for MASK.STREAK
-
     psString streaksFileName = psMetadataLookupStr(NULL, config->arguments, "STREAKS");
 
@@ -118 +114 @@
 
         // now that we've read the input files, lookup the mask values
-        if (maskStreak == 0) {
-            strkGetMaskValues(sfiles, &maskStreak, &maskMask);
-        }
+        strkGetMaskValues(sfiles);
 
         totalPixels += sfiles->inImage->numRows * sfiles->inImage->numCols;
@@ -142 +136 @@
                     // set non-warped pixels and variance to NAN, mask to maskStreak (since the pixel
                     // is excised as part of the destreaking process)
-                    exciseNonWarpedPixels(sfiles, maskStreak);
+                    exciseNonWarpedPixels(sfiles, sfiles->maskStreak);
 
                     psLogMsg("streaksremove", PS_LOG_INFO, "time to excise non warped pixels: %f\n", psTimerClear("EXCISE_NON_WARPED"));
@@ -149 +143 @@
                 psTimerStart("REMOVE_STREAKS");
 
-                totalStreakPixels += censorPixels(sfiles, pixels, checkNonWarpedPixels, maskStreak);
+                totalStreakPixels += censorPixels(sfiles, pixels, checkNonWarpedPixels, sfiles->maskStreak);
 
                 psLogMsg("streaksremove", PS_LOG_INFO, "time to remove streak pixels: %f\n", psTimerClear("REMOVE_STREAKS"));
@@ -155 +149 @@
                 if (nanForRelease) {
                     // set any pixels that were masked, to NAN (unless they are already NAN)
-                    setMaskedToNAN(sfiles, maskMask, true);
+                    setMaskedToNAN(sfiles, sfiles->maskMask, true);
                 }
 
@@ -173 +167 @@
         }
 
-        censorSources(sfiles, maskStreak);
+        censorSources(sfiles, sfiles->maskStreak);
 
         // write the destreaked "temporary" images and the recovery images
@@ -512 +506 @@
 }
 
+static void 
+setStreakBits(psImage *maskImage, psU32 maskStreak)
+{
+    for (int y=0 ; y < maskImage->numRows; y++) {
+        for (int x=0 ; x < maskImage->numCols; x++) {
+            maskImage->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskStreak;
+        }
+    }
+}
+
 // set the image for the output files to the contents of the corresponding input file.
 static bool
@@ -582 +586 @@
             // Note: we don't excise the mask pixels even if exciseAll is true.
             setupImageRefs(sf->outMask, sf->recMask, sf->inMask, sf->extnum, false);
+            if (exciseAll) {
+                strkGetMaskValues(sf);
+                
+                setStreakBits(sf->inMask->image, sf->maskStreak);
+            }
             if (sf->outChMask) {
                 sf->outChMask->header = (psMetadata *) psMemIncrRefCounter(sf->outMask->header);

trunk/magic/remove/src/streaksremove.h

@@ -75 +75 @@
     double  transparentStreaks;
     psString    program_name;
+    psU32   maskStreak;
+    psU32   maskMask;
 } streakFiles;