Changeset 35563 for trunk/pswarp/src/pswarpMaskStats.c

Timestamp:

May 9, 2013, 12:26:48 PM (13 years ago)

Author:

eugene

Message:

major upgrades to pswarp to enable skycell warp -> chip

File:

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

trunk/pswarp/src/pswarpMaskStats.c

@@ -1 +1 @@
 #include "pswarp.h"
-#include <ppStats.h>
 
 bool pswarpMaskStats(const pmReadout *readout, psMetadata *stats, const pmConfig *config)
@@ -31 +30 @@
                               dynamicMaskVal,advisoryMaskVal)) {
     psError(PS_ERR_UNKNOWN, false, "Unable to calculate masks for readout.");
-    return(false);
+    return false;
   }
-  psMetadataAddS32(stats, PS_LIST_TAIL,"MASKFRAC_NPIX", 0,
-                   "Number of valid pixels", Npix_valid);
-  psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_STATIC", 0,
-                   "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);
-  psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_MAGIC", 0,
-                   "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);
-  return(true);
+
+  // XXX with multiple inputs (eg, output stacks -> exposure), these only represent the last input
+  psMetadataAddS32(stats, PS_LIST_TAIL,"MASKFRAC_NPIX",     PS_META_REPLACE, "Number of valid pixels", Npix_valid);
+  psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_STATIC",   PS_META_REPLACE, "Fraction of pixels statically masked", (float) Npix_static / Npix_valid);
+  psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_DYNAMIC",  PS_META_REPLACE, "Fraction of pixels dynamically masked", (float) Npix_dynamic / Npix_valid);
+  psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_MAGIC",    PS_META_REPLACE, "Fraction of pixels magically masked", (float) Npix_magic / Npix_valid);
+  psMetadataAddF32(stats,PS_LIST_TAIL, "MASKFRAC_ADVISORY", PS_META_REPLACE, "Fraction of pixels masked as an advisory", (float) Npix_advisory / Npix_valid);
+  return true;
 }