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

Comparing trunk/OOPSE-4/src/applications/staticProps/GofR.hpp (file contents):
Revision 1990 by tim, Wed Feb 9 17:08:22 2005 UTC vs.
Revision 2759 by tim, Wed May 17 21:51:42 2006 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. double len);
49 >  public:
50 >    GofR(SimInfo* info, const std::string& filename, const std::string& sele1,
51 >         const std::string& sele2, RealType len, int nrbins);
52  
53 <    private:
53 >    int getNRBins() {
54 >      return nRBins_;
55 >    }
56  
57 <        virtual void preProcess();
58 <        virtual void initalizeHistogram();
59 <        virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
60 <        virtual void processHistogram();
57 >    RealType getLength() {
58 >      return len_;
59 >    }
60 >        
61 >  private:
62  
63 <        virtual void writeRdf();
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();
69 >
70 >    RealType len_;
71 >    int nRBins_;
72 >    RealType deltaR_;
73          
74 <        std::vector<int> histogram_;
75 <        std::vector<double> avgGofr_;
76 <        int npairs_;
64 < };
74 >    std::vector<int> histogram_;
75 >    std::vector<RealType> avgGofr_;
76 >  };
77  
78   }
79   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines