Changeset 28132

Timestamp:

May 26, 2010, 5:35:38 PM (16 years ago)

Author:

Paul Price

Message:

Can't do mask stats if there's no stats.

File:

• trunk/ppImage/src/ppImageMaskStats.c (modified) (3 diffs)

trunk/ppImage/src/ppImageMaskStats.c

@@ -6 +6 @@
 
 
-bool ppImageMaskStats(pmConfig *config, pmFPAview *view, psMetadata *stats) {
+bool ppImageMaskStats(pmConfig *config, pmFPAview *view, psMetadata *stats)
+{
   PS_ASSERT_PTR_NON_NULL(view, false);
   PS_ASSERT_PTR_NON_NULL(config, false);
+
+  if (!stats) {
+      return true;
+  }
 
   bool status;
@@ -19 +24 @@
 
   psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PPIMAGE");
-  
+
   psU16 staticMaskVal = psMetadataLookupU32(&status, recipe, "MASKSTAT.STATIC");
   psU16 magicMaskVal = psMetadataLookupU32(&status, recipe, "MASKSTAT.MAGIC");
@@ -60 +65 @@
     return(true);
   }
-  
+
   psImage *mask = readout->mask;  // Mask of interest;
   psWarning("In ppImageMaskStats: %d %ld\n",Npix_valid, (long) mask);
 
   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);
   psWarning("In ppImageMaskStats: %d %f %f %f %f\n",Npix_valid, (float) Npix_static / Npix_valid,
-            (float) Npix_dynamic / Npix_valid, (float) Npix_magic / Npix_valid,
-            (float) Npix_advisory / Npix_valid);
+            (float) Npix_dynamic / Npix_valid, (float) Npix_magic / Npix_valid,
+            (float) Npix_advisory / Npix_valid);
   return(true);
 }