--- trunk/src/applications/staticProps/GofRAngle.cpp	2005/02/10 22:37:21	311
+++ trunk/src/applications/staticProps/GofRAngle.cpp	2005/02/16 19:36:30	353
@@ -68,8 +68,9 @@ void GofRAngle::processHistogram() {
 
 void GofRAngle::processHistogram() {
 
+    int nPairs = getNPairs();
     double volume = info_->getSnapshotManager()->getCurrentSnapshot()->getVolume();
-    double pairDensity = npairs_ /volume;
+    double pairDensity = nPairs /volume;
     double pairConstant = ( 4.0 * NumericConstant::PI * pairDensity ) / 3.0;
 
     for(int i = 0 ; i < histogram_.size(); ++i){
@@ -100,13 +101,14 @@ void GofRAngle::collectHistogram(StuntDouble* sd1, Stu
     double distance = r12.length();
     int whichRBin = distance / deltaR_;
 
-    
-    double cosAngle = evaluateAngle(sd1, sd2);
-    double halfBin = (nAngleBins_ - 1) * 0.5;
-    int whichThetaBin = halfBin * (cosAngle + 1.0);
-    ++histogram_[whichRBin][whichThetaBin];
-    
-    ++npairs_;
+    if (distance <= len_) {
+        double cosAngle = evaluateAngle(sd1, sd2);
+        double halfBin = (nAngleBins_ - 1) * 0.5;
+        int whichThetaBin = halfBin * (cosAngle + 1.0);
+        ++histogram_[whichRBin][whichThetaBin];
+        
+        ++npairs_;
+    }
 }
 
 void GofRAngle::writeRdf() {