Index: branches/2dbias/psLib/src/math/psStats.h
===================================================================
--- branches/2dbias/psLib/src/math/psStats.h	(revision 42650)
+++ branches/2dbias/psLib/src/math/psStats.h	(revision 42719)
@@ -27,24 +27,26 @@
  *  @see psStats, psVectorStats, psImageStats
  */
-typedef enum {
-    PS_STAT_NONE            = 0x000000, ///< Empty set
-    PS_STAT_MIN             = 0x000001, ///< Maximum
-    PS_STAT_MAX             = 0x000002, ///< Minumum
-    PS_STAT_SAMPLE_MEAN     = 0x000004, ///< Sample Mean
-    PS_STAT_SAMPLE_MEDIAN   = 0x000008, ///< Sample Median
-    PS_STAT_SAMPLE_STDEV    = 0x000010, ///< Sample Standard Deviation
-    PS_STAT_SAMPLE_QUARTILE = 0x000020, ///< Sample Quartile
-    PS_STAT_SAMPLE_SKEWNESS = 0x000040, ///< Sample Skewness (third moment)
-    PS_STAT_SAMPLE_KURTOSIS = 0x000080, ///< Sample Kurtosis (fourth moment)
-    PS_STAT_ROBUST_MEDIAN   = 0x000100, ///< Robust Median
-    PS_STAT_ROBUST_STDEV    = 0x000200, ///< Robust Standarad Deviation
-    PS_STAT_ROBUST_QUARTILE = 0x000400, ///< Robust Quartile
-    PS_STAT_ROBUST_SPARE1   = 0x000800, ///< Spare 1
-    PS_STAT_FITTED_MEAN     = 0x001000, ///< Fitted Mean
-    PS_STAT_FITTED_STDEV    = 0x002000, ///< Fitted Standard Deviation
-    PS_STAT_CLIPPED_MEAN    = 0x040000, ///< Clipped Mean
-    PS_STAT_CLIPPED_STDEV   = 0x080000, ///< Clipped Standard Deviation
-    PS_STAT_USE_RANGE       = 0x100000, ///< Range
-    PS_STAT_USE_BINSIZE     = 0x200000, ///< Binsize
+typedef enum
+{
+  PS_STAT_NONE = 0x000000,            ///< Empty set
+  PS_STAT_MIN = 0x000001,             ///< Maximum
+  PS_STAT_MAX = 0x000002,             ///< Minumum
+  PS_STAT_SAMPLE_MEAN = 0x000004,     ///< Sample Mean
+  PS_STAT_SAMPLE_MEDIAN = 0x000008,   ///< Sample Median
+  PS_STAT_SAMPLE_STDEV = 0x000010,    ///< Sample Standard Deviation
+  PS_STAT_SAMPLE_QUARTILE = 0x000020, ///< Sample Quartile
+  PS_STAT_SAMPLE_SKEWNESS = 0x000040, ///< Sample Skewness (third moment)
+  PS_STAT_SAMPLE_KURTOSIS = 0x000080, ///< Sample Kurtosis (fourth moment)
+  PS_STAT_ROBUST_MEDIAN = 0x000100,   ///< Robust Median
+  PS_STAT_ROBUST_STDEV = 0x000200,    ///< Robust Standarad Deviation
+  PS_STAT_ROBUST_QUARTILE = 0x000400, ///< Robust Quartile
+  PS_STAT_ROBUST_SPARE1 = 0x000800,   ///< Spare 1
+  PS_STAT_FITTED_MEAN = 0x001000,     ///< Fitted Mean
+  PS_STAT_FITTED_STDEV = 0x002000,    ///< Fitted Standard Deviation
+  PS_STAT_CLIPPED_MEDIAN = 0x020000,  ///< Clipped Median
+  PS_STAT_CLIPPED_MEAN = 0x040000,    ///< Clipped Mean
+  PS_STAT_CLIPPED_STDEV = 0x080000,   ///< Clipped Standard Deviation
+  PS_STAT_USE_RANGE = 0x100000,       ///< Range
+  PS_STAT_USE_BINSIZE = 0x200000,     ///< Binsize
 } psStatsOptions;
 
@@ -54,34 +56,34 @@
 typedef struct
 {
-    double sampleMean;                 ///< formal mean of sample
-    double sampleMedian;               ///< formal median of sample
-    double sampleStdev;                ///< standard deviation of sample
-    double sampleUQ;                   ///< upper quartile of sample
-    double sampleLQ;                   ///< lower quartile of sample
-    double sampleSkewness;             ///< skewness (third moment) of sample
-    double sampleKurtosis;             ///< kurtosis (fourth moment) of sample
-    double robustMedian;               ///< robust median of array
-    double robustStdev;                ///< robust standard deviation of array
-    double robustUQ;                   ///< robust upper quartile
-    double robustLQ;                   ///< robust lower quartile
-    long robustN50;                    ///< Number of points in Gaussian fit; XXX: This is currently unused.
-    double fittedMean;                 ///< robust mean of data
-    double fittedStdev;                ///< robust standard deviation of data
-    long fittedNfit;                   ///< Number of points in Gaussian fit; XXX: This is currently unused
-    double clippedMean;                ///< Nsigma clipped mean
-    double clippedStdev;               ///< standard deviation after clipping
-    long clippedNvalues;               ///< Number of data points used for clipped mean.
-    double clipSigma;                  ///< Nsigma used for clipping; user input
-    int clipIter;                      ///< Number of clipping iterations; user input
-    double min;                        ///< minimum data value in array
-    double max;                        ///< maximum data value in array
-    double binsize;                    ///< binsize for robust fit (input/ouput)
-    long nSubsample;                   ///< maxinum number of measurements (input)
-    psStatsOptions options;            ///< bitmask of values requested
-    psStatsOptions results;            ///< bitmask of values calculated
-    psVector *tmpData;		       ///< temporary vector so repeated calls do not have to realloc
-    psVector *tmpMask;		       ///< temporary vector so repeated calls do not have to realloc
-}
-psStats;
+  double sampleMean;      ///< formal mean of sample
+  double sampleMedian;    ///< formal median of sample
+  double sampleStdev;     ///< standard deviation of sample
+  double sampleUQ;        ///< upper quartile of sample
+  double sampleLQ;        ///< lower quartile of sample
+  double sampleSkewness;  ///< skewness (third moment) of sample
+  double sampleKurtosis;  ///< kurtosis (fourth moment) of sample
+  double robustMedian;    ///< robust median of array
+  double robustStdev;     ///< robust standard deviation of array
+  double robustUQ;        ///< robust upper quartile
+  double robustLQ;        ///< robust lower quartile
+  long robustN50;         ///< Number of points in Gaussian fit; XXX: This is currently unused.
+  double fittedMean;      ///< robust mean of data
+  double fittedStdev;     ///< robust standard deviation of data
+  long fittedNfit;        ///< Number of points in Gaussian fit; XXX: This is currently unused
+  double clippedMean;     ///< Nsigma clipped mean
+  double clippedMedian;   ///< Nsigma clipped median
+  double clippedStdev;    ///< standard deviation after clipping
+  long clippedNvalues;    ///< Number of data points used for clipped mean.
+  double clipSigma;       ///< Nsigma used for clipping; user input
+  int clipIter;           ///< Number of clipping iterations; user input
+  double min;             ///< minimum data value in array
+  double max;             ///< maximum data value in array
+  double binsize;         ///< binsize for robust fit (input/ouput)
+  long nSubsample;        ///< maxinum number of measurements (input)
+  psStatsOptions options; ///< bitmask of values requested
+  psStatsOptions results; ///< bitmask of values calculated
+  psVector *tmpData;      ///< temporary vector so repeated calls do not have to realloc
+  psVector *tmpMask;      ///< temporary vector so repeated calls do not have to realloc
+} psStats;
 
 /** Performs statistical calculations on a vector.
@@ -90,8 +92,8 @@
  */
 bool psVectorStats(
-    psStats* stats,	       ///< stats structure defines stats to be calculated and how
-    const psVector* in,			///< Vector to be analysed.
-    const psVector* errors,		///< Errors.
-    const psVector* mask, ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL
+    psStats *stats,          ///< stats structure defines stats to be calculated and how
+    const psVector *in,      ///< Vector to be analysed.
+    const psVector *errors,  ///< Errors.
+    const psVector *mask,    ///< Ignore elements where (maskVector & maskVal) != 0: must be INT or NULL
     psVectorMaskType maskVal ///< Only mask elements with one of these bits set in maskVector
 );
@@ -103,16 +105,16 @@
  */
 #ifdef DOXYGEN
-psStats* psStatsAlloc(
-    psStatsOptions options              ///< Statistics to calculate
+psStats *psStatsAlloc(
+    psStatsOptions options ///< Statistics to calculate
 );
 #else // ifdef DOXYGEN
-psStats* p_psStatsAlloc(
-    const char *file,                   ///< File of caller
-    unsigned int lineno,                ///< Line number of caller
-    const char *func,                   ///< Function name of caller
-    psStatsOptions options              ///< Statistics to calculate
-) PS_ATTR_MALLOC;
+psStats *p_psStatsAlloc(
+    const char *file,      ///< File of caller
+    unsigned int lineno,   ///< Line number of caller
+    const char *func,      ///< Function name of caller
+    psStatsOptions options ///< Statistics to calculate
+    ) PS_ATTR_MALLOC;
 #define psStatsAlloc(options) \
-      p_psStatsAlloc(__FILE__, __LINE__, __func__, options)
+  p_psStatsAlloc(__FILE__, __LINE__, __func__, options)
 #endif // ifdef DOXYGEN
 
@@ -124,5 +126,5 @@
  */
 bool psMemCheckStats(
-    psPtr ptr                          ///< the pointer whose type to check
+    psPtr ptr ///< the pointer whose type to check
 );