Changeset 28130

Timestamp:

May 26, 2010, 5:33:46 PM (16 years ago)

Author:

Paul Price

Message:

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

File:

• trunk/pswarp/src/pswarpMaskStats.c (modified) (2 diffs)

trunk/pswarp/src/pswarpMaskStats.c

@@ -2 +2 @@
 #include <ppStats.h>
 
-bool pswarpMaskStats(const pmReadout *readout, psMetadata *stats, const pmConfig *config) {
+bool pswarpMaskStats(const pmReadout *readout, psMetadata *stats, const pmConfig *config)
+{
   PS_ASSERT_PTR_NON_NULL(readout, false);
   PS_ASSERT_PTR_NON_NULL(config, false);
+
+  if (!stats || !readout || !readout->data_exists) {
+    // Nothing to process
+    return(true);
+  }
 
   bool status;
@@ -19 +25 @@
   psS32 Npix_advisory = 0;
 
-  if (!readout || !readout->data_exists) {
-    // Nothing to process
-    return(true);
-  }
-  psWarning("pswarpMaskStats: %d %d %d %d\n",staticMaskVal,magicMaskVal,dynamicMaskVal,advisoryMaskVal);
   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);
 }