Index: trunk/ppSub/src/Makefile.am
===================================================================
--- trunk/ppSub/src/Makefile.am	(revision 28006)
+++ trunk/ppSub/src/Makefile.am	(revision 28043)
@@ -41,4 +41,5 @@
 	ppSubMakePSF.c			\
 	ppSubMatchPSFs.c		\
+	ppSubMaskStats.c                \
 	ppSubReadoutInverse.c		\
 	ppSubReadoutJpeg.c		\
Index: trunk/ppSub/src/ppSub.h
===================================================================
--- trunk/ppSub/src/ppSub.h	(revision 28006)
+++ trunk/ppSub/src/ppSub.h	(revision 28043)
@@ -74,4 +74,7 @@
 bool ppSubSetMasks(pmConfig *config     ///< Configuration
     );
+
+// Calculate mask statistics
+bool ppSubMaskStats(pmConfig *config, pmFPAview *view, psMetadata *stats);
 
 /// Generate the PSF-matching kernel and convolve the images as needed.  Most of this function involves
Index: trunk/ppSub/src/ppSubLoop.c
===================================================================
--- trunk/ppSub/src/ppSubLoop.c	(revision 28006)
+++ trunk/ppSub/src/ppSubLoop.c	(revision 28043)
@@ -144,5 +144,13 @@
         return false;
     }
-
+    // Do Mask Stats
+    {
+      pmFPAview *view = ppSubViewReadout(); // View to readout
+      if (!ppSubMaskStats(config, view,data->stats)) {
+	psError(psErrorCodeLast(), false, "Unable to generate mask statistics");
+	return(false);
+      }
+    }
+    
     // generate the binned image used to write the jpeg
     if (!ppSubReadoutJpeg(config)) {
Index: trunk/ppSub/src/ppSubMaskStats.c
===================================================================
--- trunk/ppSub/src/ppSubMaskStats.c	(revision 28043)
+++ trunk/ppSub/src/ppSubMaskStats.c	(revision 28043)
@@ -0,0 +1,55 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <pslib.h>
+#include <psmodules.h>
+
+#include "ppSub.h"
+
+
+bool ppSubMaskStats(pmConfig *config, pmFPAview *view, psMetadata *stats) {
+  PS_ASSERT_PTR_NON_NULL(view, false);
+  PS_ASSERT_PTR_NON_NULL(config, false);
+
+  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");
+
+  psS32 Npix_valid = 0;
+  psS32 Npix_static = 0;
+  psS32 Npix_magic = 0;
+  psS32 Npix_dynamic = 0;
+  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)) {
+    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);
+  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);
+}
Index: trunk/ppSub/src/ppSubVersion.c
===================================================================
--- trunk/ppSub/src/ppSubVersion.c	(revision 28006)
+++ trunk/ppSub/src/ppSubVersion.c	(revision 28043)
@@ -86,4 +86,6 @@
     psString source  = ppSubSource();  // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "PPSUB_V", PS_META_REPLACE, NULL, PPSUB_VERSION);
+    
     psStringPrepend(&version, "ppSub version: ");
     psStringPrepend(&source, "ppSub source: ");