ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/applications/staticProps/GofR.hpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/applications/staticProps/GofR.hpp (file contents):
Revision 1994 by tim, Thu Feb 10 18:14:03 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 41 | Line 41
41   #ifndef APPLICATIONS_STATICPROPS_GOFR_HPP
42   #define APPLICATIONS_STATICPROPS_GOFR_HPP
43  
44 < #include "application/staticProps/RadialDistrFunc.hpp"
44 > #include "applications/staticProps/RadialDistrFunc.hpp"
45   namespace oopse {
46  
47 < class GofR : public RadialDistrFunc {
47 >  class GofR : public RadialDistrFunc {
48      
49 <    public:
50 <        GofR(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
49 >  public:
50 >    GofR(SimInfo* info, const std::string& filename, const std::string& sele1,
51 >         const std::string& sele2, double len, int nrbins);
52  
53 +    int getNRBins() {
54 +      return nRBins_;
55 +    }
56  
57 <        void setNRBins(int nbins) {
58 <            assert(nbins > 0);
59 <            nRBins_ = nbins;
56 <            deltaR_ = len_ / nRBins_;
57 <            histogram_.resize(nRBins_);
58 <            avgGofr_.resize(nRBins_);
59 <        }
60 <
61 <        int getNRBins() {
62 <            return nRBins_;
63 <        }
57 >    double getLength() {
58 >      return len_;
59 >    }
60          
61 <    private:
61 >  private:
62  
63 <        virtual void preProcess();
64 <        virtual void initalizeHistogram();
65 <        virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
66 <        virtual void processHistogram();
63 >    virtual void preProcess();
64 >    virtual void initalizeHistogram();
65 >    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
66 >    virtual void processHistogram();
67  
68 <        virtual void writeRdf();
68 >    virtual void writeRdf();
69  
70 <        double len_;
71 <        int nRBins_;
72 <        double deltaR_;
70 >    double len_;
71 >    int nRBins_;
72 >    double deltaR_;
73          
74 <        std::vector<int> histogram_;
75 <        std::vector<double> avgGofr_;
76 <        int npairs_;
81 < };
74 >    std::vector<int> histogram_;
75 >    std::vector<double> avgGofr_;
76 >  };
77  
78   }
79   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines