Index: trunk/psModules/src/config/pmVersion.c
===================================================================
--- trunk/psModules/src/config/pmVersion.c	(revision 28013)
+++ trunk/psModules/src/config/pmVersion.c	(revision 28043)
@@ -64,4 +64,6 @@
     psString source = psModulesSource();   // Software source
 
+    psMetadataAddStr(header, PS_LIST_TAIL, "MODULE_V", PS_META_REPLACE, NULL, PSMODULES_VERSION);
+    
     psStringPrepend(&version, "psModules version: ");
     psStringPrepend(&source, "psModules source: ");
Index: trunk/psModules/src/detrend/Makefile.am
===================================================================
--- trunk/psModules/src/detrend/Makefile.am	(revision 28013)
+++ trunk/psModules/src/detrend/Makefile.am	(revision 28043)
@@ -8,4 +8,5 @@
 	pmFringeStats.c \
 	pmMaskBadPixels.c \
+	pmMaskStats.c \
 	pmNonLinear.c \
 	pmBias.c \
@@ -27,4 +28,5 @@
 	pmFringeStats.h \
 	pmMaskBadPixels.h \
+	pmMaskStats.h \
 	pmNonLinear.h \
 	pmBias.h \
Index: trunk/psModules/src/detrend/pmMaskStats.c
===================================================================
--- trunk/psModules/src/detrend/pmMaskStats.c	(revision 28043)
+++ trunk/psModules/src/detrend/pmMaskStats.c	(revision 28043)
@@ -0,0 +1,121 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <assert.h>
+
+#include <pslib.h>
+#include <psmodules.h>
+#include "pmHDU.h"
+#include "pmFPA.h"
+#include "pmFPAview.h"
+#include "pmFPAfile.h"
+#include "pmFPAfileIO.h"
+#include "pmFPAAstrometry.h"
+
+
+# define ESCAPE { \
+    psError(PS_ERR_UNKNOWN, false, "I/O failure in pmMaskStats");	\
+    psFree (view);							\
+    return false;							\
+  }
+
+  
+
+
+bool pmFPAMaskStats(pmFPA *fpa, pmConfig *config) {
+  PS_ASSERT_PTR_NON_NULL(fpa, false);
+  PS_ASSERT_PTR_NON_NULL(config, false);
+
+  bool status;
+  
+  psU16 staticMaskVal = psMetadataLookupU32(&status, config->recipes, "MASKSTAT.STATIC");
+  psU16 magicMaskVal = psMetadataLookupU32(&status, config->recipes, "MASKSTAT.MAGIC");
+  psU16 dynamicMaskVal = psMetadataLookupU32(&status, config->recipes, "MASKSTAT.DYNAMIC");
+  psU16 advisoryMaskVal = psMetadataLookupU32(&status, config->recipes, "MASKSTAT.ADVISORY");
+
+  psS32 Npix_valid = 0;
+  psS32 Npix_static = 0;
+  psS32 Npix_magic = 0;
+  psS32 Npix_dynamic = 0;
+  psS32 Npix_advisory = 0;
+
+  pmChip *chip;
+  pmCell *cell;
+  pmReadout *readout;
+  pmFPAview *view = pmFPAviewAlloc(0);
+  while ((chip = pmFPAviewNextChip(view, fpa, 1)) != NULL) {
+    if (!chip->process || !chip->file_exists) { continue; }
+    if (!chip->fromFPA) { continue; }
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE;
+
+    while ((cell = pmFPAviewNextCell(view, fpa, 1)) != NULL) {
+      if (!cell->process || !cell->file_exists) {continue; }
+      while ((readout = pmFPAviewNextReadout(view, fpa, 1)) != NULL) {
+	if (!readout->data_exists) {continue; }
+
+	psImage *mask = readout->mask;
+	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(readout->analysis, PS_LIST_TAIL,"MASKFRAC_NPIX", 0,
+			 "Number of valid pixels", Npix_valid);
+	psMetadataAddF32(readout->analysis,PS_LIST_TAIL, "MASKFRAC_STATIC", 0,
+			 "Fraction of pixels statically masked", (float) Npix_static / Npix_valid);
+	psMetadataAddF32(readout->analysis,PS_LIST_TAIL, "MASKFRAC_DYNAMIC", 0,
+			 "Fraction of pixels dynamically masked", (float) Npix_dynamic / Npix_valid);
+	psMetadataAddF32(readout->analysis,PS_LIST_TAIL, "MASKFRAC_MAGIC", 0,
+			 "Fraction of pixels magically masked", (float) Npix_magic / Npix_valid);
+	psMetadataAddF32(readout->analysis,PS_LIST_TAIL, "MASKFRAC_ADVISORY", 0,
+			 "Fraction of pixels masked as an advisory", (float) Npix_advisory / Npix_valid);
+      }
+    }
+  }
+  return(true);
+}
+
+
+
+bool pmSingleImageMaskStats(psImage *mask,
+			    psS32 *Npix_valid, psS32 *Npix_static, psS32 *Npix_magic,
+			    psS32 *Npix_dynamic, psS32 *Npix_advisory,
+			    psU16 staticMaskVal, psU16 magicMaskVal,
+			    psU16 dynamicMaskVal, psU16 advisoryMaskVal) {
+  PS_ASSERT_IMAGE_NON_NULL(mask, false);
+  *Npix_valid = 0;
+  *Npix_static = 0;
+  *Npix_magic = 0;
+  *Npix_dynamic = 0;
+  *Npix_advisory = 0;
+
+  psImageMaskType **maskData = mask->data.PS_TYPE_IMAGE_MASK_DATA;
+  psWarning("HERE: %ld %d %d\n",(long) maskData, mask->numRows,mask->numCols);
+  for (int i = 0; i < mask->numRows - 1; i++) {
+    for (int j = 0; j < mask->numCols - 1; j++) {
+      *Npix_valid += 1;
+      if (maskData[i][j] & staticMaskVal) {
+	*Npix_static += 1;
+	continue;
+      }
+      if (maskData[i][j] & dynamicMaskVal) {
+	*Npix_dynamic += 1;
+	continue;
+      }
+      if (maskData[i][j] & magicMaskVal) {
+	*Npix_magic += 1;
+	continue;
+      }
+      if (maskData[i][j] & advisoryMaskVal) {
+	*Npix_advisory += 1;
+	continue;
+      }
+    }
+  }
+  return(true);
+}
+
Index: trunk/psModules/src/detrend/pmMaskStats.h
===================================================================
--- trunk/psModules/src/detrend/pmMaskStats.h	(revision 28043)
+++ trunk/psModules/src/detrend/pmMaskStats.h	(revision 28043)
@@ -0,0 +1,14 @@
+#ifndef PM_MASK_STATS_H
+#define PM_MASK_STATS_H
+
+bool pmFPAMaskStats(pmFPA *fpa, pmConfig *config);
+bool pmSingleImageMaskStats(psImage *mask,
+			    psS32 *Npix_valid, psS32 *Npix_static, psS32 *Npix_magic,
+			    psS32 *Npix_dynamic, psS32 *Npix_advisory,
+			    psU16 staticMaskVal, psU16 magicMaskVal,
+			    psU16 dynamicMaskVal, psU16 advisoryMaskVal);
+
+
+//bool pmMaskStats(pmFPA *fpa, pmConfig *config, psMetadata *results);
+
+#endif
Index: trunk/psModules/src/psmodules.h
===================================================================
--- trunk/psModules/src/psmodules.h	(revision 28013)
+++ trunk/psModules/src/psmodules.h	(revision 28043)
@@ -73,4 +73,5 @@
 #include <pmFringeStats.h>
 #include <pmMaskBadPixels.h>
+#include <pmMaskStats.h>
 #include <pmNonLinear.h>
 #include <pmOverscan.h>