--- trunk/src/applications/staticProps/GofXyz.cpp	2005/04/15 22:04:00	507
+++ trunk/src/applications/staticProps/GofXyz.cpp	2006/10/18 21:58:48	1078
@@ -46,7 +46,7 @@ namespace oopse {
 #include "primitives/Molecule.hpp"
 namespace oopse {
 
-  GofXyz::GofXyz(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, const std::string& sele3, double len, int nrbins)
+  GofXyz::GofXyz(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2, const std::string& sele3, RealType len, int nrbins)
     : RadialDistrFunc(info, filename, sele1, sele2), evaluator3_(info), seleMan3_(info), len_(len), halfLen_(len/2), nRBins_(nrbins) {
       setOutputName(getPrefix(filename) + ".gxyz");
 
@@ -106,7 +106,8 @@ namespace oopse {
       Vector3d r3 =sd3->getPos();
       Vector3d r1 = sd1->getPos();
       Vector3d v1 =  r3 - r1;
-      info_->getSnapshotManager()->getCurrentSnapshot()->wrapVector(v1);
+      if (usePeriodicBoundaryConditions_)
+        info_->getSnapshotManager()->getCurrentSnapshot()->wrapVector(v1);
       Vector3d zaxis = sd1->getElectroFrame().getColumn(2);
       Vector3d xaxis = cross(v1, zaxis);
       Vector3d yaxis = cross(zaxis, xaxis);
@@ -130,7 +131,8 @@ namespace oopse {
     Vector3d pos1 = sd1->getPos();
     Vector3d pos2 = sd2->getPos();
     Vector3d r12 = pos2 - pos1;
-    currentSnapshot_->wrapVector(r12);
+    if (usePeriodicBoundaryConditions_)
+      currentSnapshot_->wrapVector(r12);
 
     std::map<int, RotMat3x3d>::iterator i = rotMats_.find(sd1->getGlobalIndex());
     assert(i != rotMats_.end());