Index: trunk/ppStats/src/ppStats.h
===================================================================
--- trunk/ppStats/src/ppStats.h	(revision 13993)
+++ trunk/ppStats/src/ppStats.h	(revision 13999)
@@ -11,9 +11,10 @@
     pmFPAview *view;                    // View to analyse
     // Stuff to output
-    psStats *stats;                     // Statistics to calculate
-    bool doStats;                       // Do statistics?
+    psStats *stats;                     // pixel Statistics to calculate
+    bool doStats;                       // Do pixel statistics?
     bool fileLevel;                     // Output file level?
     psList *headers;                    // Headers to read
     psList *concepts;                   // Concepts to read
+    psList *analysis;                   // Analysis entries to read
     psList *summary;                    // Summary statistics to calculate
     // Options for input data
@@ -35,4 +36,19 @@
     );
 
+psExit ppStatsChip(psMetadata *fpaResults, // Metadata holding the fpa results
+		   pmChip *chip,     // Chip for which to get statistics
+		   psFits *fits,     // FITS file handle
+		   pmFPAview *view,  // View for analysis
+		   ppStatsData *data,// The data
+		   const pmConfig *config // Configuration
+    );
+
+psExit ppStatsCell(psMetadata *chipResults, // Metadata holding the chip results
+		   pmCell *cell,     // Cell for which to get statistics
+		   psFits *fits,     // FITS file handle
+		   ppStatsData *data,// The data
+		   const pmConfig *config // Configuration
+    );
+
 /// Supplement the statistics with the fringe solution
 bool ppStatsFringe(psMetadata *stats,     ///< Statistics metadata to supplement
@@ -42,4 +58,20 @@
     );
 
+
+// measure only the pixel-related statistics (stats, summary)
+psMetadata *ppStatsPixels(psMetadata *out,
+			  pmFPA *fpa,         // FPA for which to get statistics
+			  pmFPAview *view,    // View for analysis
+			  psMaskType maskVal, // Value to mask
+			  pmConfig *config    // Configuration
+    );
+
+// measure only the non-pixel-related statistics (headers, concepts)
+psMetadata *ppStatsMetadata(psMetadata *out,
+			    pmFPA *fpa,         // FPA for which to get statistics
+			    pmFPAview *view,    // View for analysis
+			    psMaskType maskVal, // Value to mask
+			    pmConfig *config    // Configuration
+    );
 
 /// Loop over the input image and do all the hard work