--- trunk/src/applications/staticProps/GofAngle2.cpp	2006/05/17 21:51:42	963
+++ trunk/src/applications/staticProps/GofAngle2.cpp	2006/10/18 21:58:48	1078
@@ -93,7 +93,8 @@ namespace oopse {
     Vector3d pos1 = sd1->getPos();
     Vector3d pos2 = sd2->getPos();
     Vector3d r12 = pos1 - pos2;
-    currentSnapshot_->wrapVector(r12);
+    if (usePeriodicBoundaryConditions_) 
+      currentSnapshot_->wrapVector(r12);
     Vector3d dipole1 = sd1->getElectroFrame().getColumn(2);
     Vector3d dipole2 = sd2->getElectroFrame().getColumn(2);
     
@@ -107,9 +108,9 @@ namespace oopse {
 
     RealType halfBin = (nAngleBins_ - 1) * 0.5;
     int angleBin1 = halfBin * (cosAngle1 + 1.0);
-    int angleBin2 = halfBin * (cosAngle1 + 1.0);
+    int angleBin2 = halfBin * (cosAngle2 + 1.0);
 
-    ++histogram_[angleBin1][angleBin1];    
+    ++histogram_[angleBin1][angleBin2];    
     ++npairs_;
   }