--- branches/development/src/applications/staticProps/SpatialStatistics.hpp	2013/04/17 18:24:08	1865
+++ trunk/src/applications/staticProps/SpatialStatistics.hpp	2014/11/01 14:12:16	2033
@@ -61,6 +61,7 @@ namespace OpenMD {
   enum OutputDataType {
     odtReal,
     odtVector3,
+    odtArray2d,
     odtUnknownDataType
   };
 
@@ -77,12 +78,14 @@ namespace OpenMD {
     OutputDataType dataType;
     OutputDataHandling dataHandling;
     vector<BaseAccumulator*> accumulator;
+    vector<vector<BaseAccumulator*> > accumulatorArray2d;
   };
-    
+
   class SpatialStatistics : public StaticAnalyser {
     
   public:
-    SpatialStatistics(SimInfo* info, const string& filename, const string& sele, int nbins);    
+    SpatialStatistics(SimInfo* info, const string& filename,
+                      const string& sele, int nbins);    
     ~SpatialStatistics();
 
     void addOutputData(OutputData* dat) {data_.push_back(dat);}
@@ -96,7 +99,7 @@ namespace OpenMD {
     OutputData* beginOutputData(vector<OutputData*>::iterator& i);
     OutputData* nextOutputData(vector<OutputData*>::iterator& i);
     void writeData(ostream& os, OutputData* dat, unsigned int bin);
-    void writeStdDev(ostream& os, OutputData* dat, unsigned int bin);
+    void writeErrorBars(ostream& os, OutputData* dat, unsigned int bin);
 
     Snapshot* currentSnapshot_;    
     int nProcessed_;
@@ -107,10 +110,13 @@ namespace OpenMD {
     OutputData* counts_;
     vector<OutputData*> data_;
   };
-
+  
   class SlabStatistics : public SpatialStatistics {
   public: 
-    SlabStatistics(SimInfo* info, const string& filename, const string& sele, int nbins);
+    SlabStatistics(SimInfo* info, const string& filename,
+                   const string& sele, int nbins);
+    virtual ~SlabStatistics();
+
     virtual int getBin(Vector3d pos);
     virtual void processFrame(int frame);
   protected:
@@ -122,7 +128,9 @@ namespace OpenMD {
 
   class ShellStatistics : public SpatialStatistics {
   public: 
-    ShellStatistics(SimInfo* info, const string& filename, const string& sele, int nbins);
+    ShellStatistics(SimInfo* info, const string& filename, const string& sele,
+                    int nbins);
+    virtual ~ShellStatistics();
     virtual int getBin(Vector3d pos);
 
     void setCoordinateOrigin(Vector3d co) { coordinateOrigin_ = co; }