Changeset 28304 for branches/czw_branch/20100519/ppSub/src/ppSubMaskStats.c

Timestamp:

Jun 10, 2010, 6:28:51 PM (16 years ago)

Author:

watersc1

Message:

Skycell Summary and stack Association stuff should be finished. I'll merge and do final tests on monday.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ppSub/src/ppSubMaskStats.c (modified) (2 diffs)

branches/czw_branch/20100519/ppSub/src/ppSubMaskStats.c

@@ -9 +9 @@
 
 
-bool ppSubMaskStats(pmConfig *config, pmFPAview *view, psMetadata *stats) {
+bool ppSubMaskStats(pmConfig *config, pmFPAview *view, psMetadata *stats)
+{
   PS_ASSERT_PTR_NON_NULL(view, false);
   PS_ASSERT_PTR_NON_NULL(config, false);
+
+  pmReadout *readout = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT");
+  if (!stats || !readout || !readout->data_exists) {
+      // Nothing to process
+      return(true);
+  }
 
   bool status;
 
   psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSUB_RECIPE);
-  psU16 staticMaskVal = psMetadataLookupU32(&status, recipe, "MASKSTAT.STATIC");
-  psU16 magicMaskVal = psMetadataLookupU32(&status, recipe, "MASKSTAT.MAGIC");
-  psU16 dynamicMaskVal = psMetadataLookupU32(&status, recipe, "MASKSTAT.DYNAMIC");
-  psU16 advisoryMaskVal = psMetadataLookupU32(&status, recipe, "MASKSTAT.ADVISORY");
+  psImageMaskType staticMaskVal = psMetadataLookupImageMask(&status, recipe, "MASKSTAT.STATIC");
+  psImageMaskType magicMaskVal = psMetadataLookupImageMask(&status, recipe, "MASKSTAT.MAGIC");
+  psImageMaskType dynamicMaskVal = psMetadataLookupImageMask(&status, recipe, "MASKSTAT.DYNAMIC");
+  psImageMaskType advisoryMaskVal = psMetadataLookupImageMask(&status, recipe, "MASKSTAT.ADVISORY");
 
   psS32 Npix_valid = 0;
@@ -27 +34 @@
   psS32 Npix_advisory = 0;
 
-  psWarning("ppSubMaskStats: %d %d %d %d\n",staticMaskVal,magicMaskVal,dynamicMaskVal,advisoryMaskVal);
-  
-  pmReadout *readout = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT");
-  if (!readout || !readout->data_exists) {
-    // Nothing to process
-    return(true);
-  }
   psImage *mask = readout->mask;  // Mask of interest;
   if (!pmSingleImageMaskStats(mask,&Npix_valid,&Npix_static,&Npix_magic,
-                              &Npix_dynamic,&Npix_advisory,
-                              staticMaskVal,magicMaskVal,
-                              dynamicMaskVal,advisoryMaskVal)) {
+                              &Npix_dynamic,&Npix_advisory,
+                              staticMaskVal,magicMaskVal,
+                              dynamicMaskVal,advisoryMaskVal)) {
     psError(PS_ERR_UNKNOWN, false, "Unable to calculate masks for readout.");
     return(false);
   }
   psMetadataAddS32(stats, PS_LIST_TAIL,"MASKFRAC_NPIX", 0,
-                   "Number of valid pixels", Npix_valid);
+                   "Number of valid pixels", Npix_valid);
   psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_STATIC", 0,
-                   "Fraction of pixels statically masked", (float) Npix_static / Npix_valid);
+                   "Fraction of pixels statically masked", (float) Npix_static / Npix_valid);
   psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_DYNAMIC", 0,
-                   "Fraction of pixels dynamically masked", (float) Npix_dynamic / Npix_valid);
+                   "Fraction of pixels dynamically masked", (float) Npix_dynamic / Npix_valid);
   psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_MAGIC", 0,
-                   "Fraction of pixels magically masked", (float) Npix_magic / Npix_valid);
+                   "Fraction of pixels magically masked", (float) Npix_magic / Npix_valid);
   psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_ADVISORY", 0,
-                   "Fraction of pixels masked as an advisory", (float) Npix_advisory / Npix_valid);
+                   "Fraction of pixels masked as an advisory", (float) Npix_advisory / Npix_valid);
   return(true);
 }