ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/staticProps/SpatialStatistics.hpp
(Generate patch)

Comparing:
branches/development/src/applications/staticProps/SpatialStatistics.hpp (file contents), Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC vs.
trunk/src/applications/staticProps/SpatialStatistics.hpp (file contents), Revision 2033 by gezelter, Sat Nov 1 14:12:16 2014 UTC

# Line 61 | Line 61 | namespace OpenMD {
61    enum OutputDataType {
62      odtReal,
63      odtVector3,
64 +    odtArray2d,
65      odtUnknownDataType
66    };
67  
# Line 77 | Line 78 | namespace OpenMD {
78      OutputDataType dataType;
79      OutputDataHandling dataHandling;
80      vector<BaseAccumulator*> accumulator;
81 +    vector<vector<BaseAccumulator*> > accumulatorArray2d;
82    };
83 <    
83 >
84    class SpatialStatistics : public StaticAnalyser {
85      
86    public:
87 <    SpatialStatistics(SimInfo* info, const string& filename, const string& sele, int nbins);    
87 >    SpatialStatistics(SimInfo* info, const string& filename,
88 >                      const string& sele, int nbins);    
89      ~SpatialStatistics();
90  
91      void addOutputData(OutputData* dat) {data_.push_back(dat);}
# Line 96 | Line 99 | namespace OpenMD {
99      OutputData* beginOutputData(vector<OutputData*>::iterator& i);
100      OutputData* nextOutputData(vector<OutputData*>::iterator& i);
101      void writeData(ostream& os, OutputData* dat, unsigned int bin);
102 <    void writeStdDev(ostream& os, OutputData* dat, unsigned int bin);
102 >    void writeErrorBars(ostream& os, OutputData* dat, unsigned int bin);
103  
104      Snapshot* currentSnapshot_;    
105      int nProcessed_;
# Line 107 | Line 110 | namespace OpenMD {
110      OutputData* counts_;
111      vector<OutputData*> data_;
112    };
113 <
113 >  
114    class SlabStatistics : public SpatialStatistics {
115    public:
116 <    SlabStatistics(SimInfo* info, const string& filename, const string& sele, int nbins);
116 >    SlabStatistics(SimInfo* info, const string& filename,
117 >                   const string& sele, int nbins);
118      virtual ~SlabStatistics();
119  
120      virtual int getBin(Vector3d pos);
# Line 124 | Line 128 | namespace OpenMD {
128  
129    class ShellStatistics : public SpatialStatistics {
130    public:
131 <    ShellStatistics(SimInfo* info, const string& filename, const string& sele, int nbins);
131 >    ShellStatistics(SimInfo* info, const string& filename, const string& sele,
132 >                    int nbins);
133      virtual ~ShellStatistics();
134      virtual int getBin(Vector3d pos);
135  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines