--- trunk/src/applications/staticProps/GofAngle2.hpp	2005/02/10 18:14:03	310
+++ trunk/src/applications/staticProps/GofAngle2.hpp	2005/04/15 22:04:00	507
@@ -41,42 +41,32 @@
 #ifndef APPLICATIONS_STATICPROPS_GOFANGLE2_HPP
 #define APPLICATIONS_STATICPROPS_GOFANGLE2_HPP
 
-#include "application/staticProps/RadialDistrFunc.hpp"
+#include "applications/staticProps/RadialDistrFunc.hpp"
 namespace oopse {
 
-class GofRAngle2 : public RadialDistrFunc {
+  class GofAngle2 : public RadialDistrFunc {
     
-    public:
-        GofRAngle2(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
+  public:
+    GofAngle2(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, int nangleBins);
    
-        void setNAngleBins(int nbins) {
-            assert(nbins >0);
-            nAngleBins_ = nbins;
-            deltaCosAngle_ = 2.0 / nAngleBins_;
-            for (int i = 0 ; i < nAngleBins_; ++i) {
-                histogram_[i].resize(nAngleBins_);
-                avgGofr_[i].resize(nAngleBins_);
-            }
-        }
+    int getNAngleBins() {return nAngleBins_;}
         
-        int getNAngleBins() {return nAngleBins_;}
-        
-    private:
+  private:
 
-        virtual void preProcess();
-        virtual void initalizeHistogram();
-        virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
-        virtual void processHistogram();
+    virtual void preProcess();
+    virtual void initalizeHistogram();
+    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2);
+    virtual void processHistogram();
 
-        virtual void writeRdf();
+    virtual void writeRdf();
 
-        double deltaCosAngle_;
-        int nAngleBins_;
+    double deltaCosAngle_;
+    int nAngleBins_;
         
-        std::vector<std::vector<int> > histogram_;
-        std::vector<std::vector<int> > avgGofr_;
-        int npairs_;
-};
+    std::vector<std::vector<int> > histogram_;
+    std::vector<std::vector<int> > avgGofr_;
+    int npairs_;
+  };
 
 }
 #endif