Changeset 35533

Timestamp:

May 8, 2013, 1:38:20 PM (13 years ago)

Author:

bills

Message:

compute number of additional pixels masked by the auxilary mask and save it
in the statistic MASKFRAC_MAGIC

Location:

trunk/ppImage/src

Files:

• ppImage.h (modified) (1 diff)
• ppImageAuxiliaryMask.c (modified) (7 diffs)
• ppImageLoop.c (modified) (1 diff)

trunk/ppImage/src/ppImage.h

@@ -315 +315 @@
 void ppImageRandomGaussianFree(void);
 
-bool ppImageAuxiliaryMask(pmConfig *config, const pmFPAview *view, const ppImageOptions *options);
+bool ppImageAuxiliaryMask(pmConfig *config, const pmFPAview *view, const ppImageOptions *options, psMetadata *stats);
 
 #endif

trunk/ppImage/src/ppImageAuxiliaryMask.c

@@ -53 +53 @@
 
 // In this function, we augment the mask with the more conservative auxiliary mask
-bool ppImageAuxiliaryMask(pmConfig *config, const pmFPAview *view, const ppImageOptions *options)
+bool ppImageAuxiliaryMask(pmConfig *config, const pmFPAview *view, const ppImageOptions *options, psMetadata *stats)
 {
     psAssert(config, "Need configuration");
@@ -60 +60 @@
 
     if (!options->doAuxMask) {
+        psLogMsg ("ppImage", PS_LOG_INFO, "Auxiliary mask not enabled.");
         return true;
     }
@@ -139 +140 @@
          return false;
     }
+    psLogMsg ("ppImage", PS_LOG_INFO, "Auxiliary mask file: %s", auxMaskFileName);
 
     psFree(results);
@@ -160 +162 @@
             return false;
         }
+        psLogMsg ("ppImage", PS_LOG_INFO, "Auxiliary video mask file: %s", options->auxVideoMask);
         pmConfigRunFilenameAddRead(config, "PPIMAGE.AUXVIDEOMASK", options->auxVideoMask);
         recordFileInHeader(chip, "DETREND.AUXVIDEOMASK", "auxiliary video mask", options->auxVideoMask);
@@ -179 +182 @@
     psImageMaskType maskDetector = pmConfigMaskGet("DETECTOR", config);
 
+    psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PPIMAGE");
+    psAssert(recipe, "Need recipe!");
+    psImageMaskType staticMaskVal = psMetadataLookupImageMask(&status, recipe, "MASKSTAT.STATIC");
+    psAssert(staticMaskVal, "Need staticMaskVal!");
+
     int numCols = mask->numCols, numRows = mask->numRows; // Size of image
+    unsigned long numMasked = 0;
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
@@ -185 +194 @@
             // XXX: support other types and get the mask value from the header
             if (auxMask->data.F32[y][x] == 0) {
-                mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskDetector;
+                if ((mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & staticMaskVal) == 0) {
+                    // pixel was not previously included in the static mask so mask it
+                    ++numMasked;
+                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= maskDetector;
+                }
                 // I don't need to do this.
                 // The background subtraction code runs after us and will do it there
@@ -193 +206 @@
     }
 
+    float maskedFrac = (float) numMasked / (numRows * numCols);
+    psLogMsg ("ppImage", PS_LOG_INFO, "Auxiliary masks masked %ld aditional pixels. Masked fraction: %f", numMasked, maskedFrac);
+    if (stats) {
+        psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_MAGIC", PS_META_REPLACE,
+                   "Fraction of pixels masked by auxiliary masks", maskedFrac);
+    }
+
     psFree(auxMask);
 

trunk/ppImage/src/ppImageLoop.c

@@ -189 +189 @@
         }
 
-        if (!ppImageAuxiliaryMask(config, view, options)) {
+        if (!ppImageAuxiliaryMask(config, view, options, stats)) {
             ESCAPE("Unable to apply auxiliary mask");
         }