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 1865 by gezelter, Wed Apr 17 18:24:08 2013 UTC vs.
trunk/src/applications/staticProps/SpatialStatistics.hpp (file contents), Revision 1983 by gezelter, Tue Apr 15 20:36:19 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:
# Line 96 | Line 98 | namespace OpenMD {
98      OutputData* beginOutputData(vector<OutputData*>::iterator& i);
99      OutputData* nextOutputData(vector<OutputData*>::iterator& i);
100      void writeData(ostream& os, OutputData* dat, unsigned int bin);
101 <    void writeStdDev(ostream& os, OutputData* dat, unsigned int bin);
101 >    void writeErrorBars(ostream& os, OutputData* dat, unsigned int bin);
102  
103      Snapshot* currentSnapshot_;    
104      int nProcessed_;
# Line 107 | Line 109 | namespace OpenMD {
109      OutputData* counts_;
110      vector<OutputData*> data_;
111    };
112 <
112 >  
113    class SlabStatistics : public SpatialStatistics {
114    public:
115      SlabStatistics(SimInfo* info, const string& filename, const string& sele, int nbins);
116 +    virtual ~SlabStatistics();
117 +
118      virtual int getBin(Vector3d pos);
119      virtual void processFrame(int frame);
120    protected:
# Line 123 | Line 127 | namespace OpenMD {
127    class ShellStatistics : public SpatialStatistics {
128    public:
129      ShellStatistics(SimInfo* info, const string& filename, const string& sele, int nbins);
130 +    virtual ~ShellStatistics();
131      virtual int getBin(Vector3d pos);
132  
133      void setCoordinateOrigin(Vector3d co) { coordinateOrigin_ = co; }

Diff Legend

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