Changeset 18591 for trunk/ppSub/src/ppSubLoop.c

Timestamp:

Jul 16, 2008, 5:36:56 PM (18 years ago)

Author:

Paul Price

Message:

First attempt to switch over to new mask setup.

File:

• trunk/ppSub/src/ppSubLoop.c (modified) (3 diffs)

trunk/ppSub/src/ppSubLoop.c

@@ -14 +14 @@
 bool ppSubLoop(pmConfig *config)
 {
-    // Value to mask
-    psMaskType maskBlank = pmConfigMaskGet(psMetadataLookupStr(NULL, config->arguments, "MASK.BLANK"), config) |
-        pmConfigMaskGet(psMetadataLookupStr(NULL, config->arguments, "MASK.BAD"),
-                     config); // Mask for subtracted image
-
     bool mdok;                          // Status of MD lookup
     const char *statsName = psMetadataLookupStr(&mdok, config->arguments, "STATS"); // Filename for statistics
@@ -34 +29 @@
         }
         psFree(resolved);
+    }
+
+    if (!pmConfigMaskSetBits(NULL, NULL, config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to determine mask value.");
+        return false;
     }
 
@@ -147 +147 @@
                     return false;
                 }
-                ppStatsFPA(stats, output->fpa, view, maskBlank, config);
+                ppStatsFPA(stats, output->fpa, view, pmConfigMaskGet("BLANK", config), config);
             }