--- trunk/src/applications/staticProps/GofR.cpp	2005/02/10 14:15:52	309
+++ trunk/src/applications/staticProps/GofR.cpp	2006/05/17 21:51:42	963
@@ -46,81 +46,87 @@ namespace oopse {
 
 namespace oopse {
 
-GofR::GofR(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, double len)
-    : RadialDistrFunc(info, filename, sele1, sele2, len){
+  GofR::GofR(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, RealType len, int nrbins)
+    : RadialDistrFunc(info, filename, sele1, sele2), len_(len), nRBins_(nrbins){
 
-    histogram_.resize(nbins_);
-    avgGofr_.resize(nbins_);
-}
+      deltaR_ = len_ /nRBins_;
+    
+      histogram_.resize(nRBins_);
+      avgGofr_.resize(nRBins_);
 
+      setOutputName(getPrefix(filename) + ".gofr");
+    }
 
-void GofR::preProcess() {
-    avgGofr_.resize(nbins_);
+
+  void GofR::preProcess() {
     std::fill(avgGofr_.begin(), avgGofr_.end(), 0.0);    
-}
+  }
 
-void GofR::initalizeHistogram() {
-    npairs_ = 0;
+  void GofR::initalizeHistogram() {
     std::fill(histogram_.begin(), histogram_.end(), 0);
-}
+  }
 
 
-void GofR::processHistogram() {
+  void GofR::processHistogram() {
 
-    double volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume();
-    double pairDensity = npairs_ /volume;
-    double pairConstant = ( 4.0 * PI * pairDensity ) / 3.0;
+    int nPairs = getNPairs();
+    RealType volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume();
+    RealType pairDensity = nPairs /volume * 2.0;
+    RealType pairConstant = ( 4.0 * NumericConstant::PI * pairDensity ) / 3.0;
 
     for(int i = 0 ; i < histogram_.size(); ++i){
 
-        double rLower = i * deltaR_;
-        double rUpper = rLower + deltaR_;
-        double volSlice = ( rUpper * rUpper * rUpper ) - ( rLower * rLower * rLower );
-        double nIdeal = volSlice * pairConstant;
+      RealType rLower = i * deltaR_;
+      RealType rUpper = rLower + deltaR_;
+      RealType volSlice = ( rUpper * rUpper * rUpper ) - ( rLower * rLower * rLower );
+      RealType nIdeal = volSlice * pairConstant;
 
-        avgGofr_[i] += histogram_[i] / nIdeal;    
+      avgGofr_[i] += histogram_[i] / nIdeal;    
     }
 
-}
+  }
 
-void GofR::collectHistogram(StuntDouble* sd1, StuntDouble* sd2) {
+  void GofR::collectHistogram(StuntDouble* sd1, StuntDouble* sd2) {
 
     if (sd1 == sd2) {
-        return;
+      return;
     }
     
     Vector3d pos1 = sd1->getPos();
     Vector3d pos2 = sd2->getPos();
-    Vector3d r12 = pos1 - pos2;
+    Vector3d r12 = pos2 - pos1;
     currentSnapshot_->wrapVector(r12);
 
-    double distance = r12.length();
+    RealType distance = r12.length();
 
-    int whichBin = distance / deltaR_;
-    histogram_[whichBin] ++;
-    npairs_++;
-}
+    if (distance < len_) {
+      int whichBin = distance / deltaR_;
+      histogram_[whichBin] += 2;
+    }
+  }
 
 
-void GofR::writeRdf() {
+  void GofR::writeRdf() {
     std::ofstream rdfStream(outputFilename_.c_str());
     if (rdfStream.is_open()) {
-        rdfStream << "#radial distribution function\n";
-        rdfStream << "#selection1: (" << selectionScript1_ << ")\t";
-        rdfStream << "selection2: (" << selectionScript2_ << ")\n";
-        rdfStream << "#r\tcorrValue\n";
-        for (int i = 0; i < avgGofr_.size(); ++i) {
-            double r = deltaR_ * (i + 0.5);
-            rdfStream << r << "\t" << avgGofr_[i]/nProcessed_ << "\n";
-        }
+      rdfStream << "#radial distribution function\n";
+      rdfStream << "#selection1: (" << selectionScript1_ << ")\t";
+      rdfStream << "selection2: (" << selectionScript2_ << ")\n";
+      rdfStream << "#r\tcorrValue\n";
+      for (int i = 0; i < avgGofr_.size(); ++i) {
+	RealType r = deltaR_ * (i + 0.5);
+	rdfStream << r << "\t" << avgGofr_[i]/nProcessed_ << "\n";
+      }
         
     } else {
 
-
+      sprintf(painCave.errMsg, "GofR: unable to open %s\n", outputFilename_.c_str());
+      painCave.isFatal = 1;
+      simError();  
     }
 
     rdfStream.close();
-}
+  }
 
 }