--- trunk/SHAPES/GridBuilder.cpp	2004/06/18 19:01:40	1279
+++ trunk/SHAPES/GridBuilder.cpp	2004/06/18 19:40:31	1280
@@ -4,104 +4,105 @@ GridBuilder::GridBuilder(RigidBody* rb, int bandWidth)
 
 
 GridBuilder::GridBuilder(RigidBody* rb, int bandWidth) {
-	rbMol = rb;
-	bandwidth = bandWidth;
-	thetaStep = PI / bandwidth;
-	thetaMin = thetaStep / 2.0;
-	phiStep = thetaStep * 2.0;
+  rbMol = rb;
+  bandwidth = bandWidth;
+  thetaStep = PI / bandwidth;
+  thetaMin = thetaStep / 2.0;
+  phiStep = thetaStep * 2.0;
 	
-	//zero out the rot mats
-	for (i=0; i<3; i++) {
-		for (j=0; j<3; j++) {
-			rotX[i][j] = 0.0;
-			rotZ[i][j] = 0.0;
-			rbMatrix[i][j] = 0.0;
-		}
-	}
+  //zero out the rot mats
+  for (i=0; i<3; i++) {
+    for (j=0; j<3; j++) {
+      rotX[i][j] = 0.0;
+      rotZ[i][j] = 0.0;
+      rbMatrix[i][j] = 0.0;
+    }
+  }
 }
 
 GridBuilder::~GridBuilder() {
 }
 
 void GridBuilder::launchProbe(int forceField, vector<double> sigmaGrid, vector<double> sGrid,
-	vector<double> epsGrid){
-	double startDist;
-	double minDist = 10.0; //minimum start distance
+                              vector<double> epsGrid){
+  double startDist;
+  double minDist = 10.0; //minimum start distance
 	
-	//first determine the start distance - we always start at least minDist away
-	startDist = rbMol->findMaxExtent() + minDist;
-	if (startDist < minDist)
-		startDist = minDist;
+  forcefield = forceField;
+    
+  //first determine the start distance - we always start at least minDist away
+  startDist = rbMol->findMaxExtent() + minDist;
+  if (startDist < minDist)
+    startDist = minDist;
 	
-	initBody();
-	for (i=0; i<bandwidth; i++){		
-		for (j=0; j<bandwidth; j++){
-			releaseProbe(startDist);
+  initBody();
+  for (i=0; i<bandwidth; i++){		
+    for (j=0; j<bandwidth; j++){
+      releaseProbe(startDist);
 
-			sigmaGrid.push_back(sigDist);
-			sGrid.push_back(sDist);
-			epsGrid.push_back(epsVal);
+      sigmaGrid.push_back(sigDist);
+      sGrid.push_back(sDist);
+      epsGrid.push_back(epsVal);
 			
-			stepPhi(phiStep);
-		}
-		stepTheta(thetaStep);
-	}
-		
+      stepPhi(phiStep);
+    }
+    stepTheta(thetaStep);
+  }		
 }
 
 void GridBuilder::initBody(){
-	//set up the rigid body in the starting configuration
-	stepTheta(thetaMin);
+  //set up the rigid body in the starting configuration
+  stepTheta(thetaMin);
 }
 
 void GridBuilder::releaseProbe(double farPos){
-	int tooClose;
-	double tempPotEnergy;
-	double interpRange;
-	double interpFrac;
+  int tooClose;
+  double tempPotEnergy;
+  double interpRange;
+  double interpFrac;
 	
-	probeCoor = farPos;
-	potProgress.clear();
-	distProgress.clear();
-	tooClose = 0;
-	epsVal = 0;
-	rhoStep = 0.1; //the distance the probe atom moves between steps
+  probeCoor = farPos;
+  potProgress.clear();
+  distProgress.clear();
+  tooClose = 0;
+  epsVal = 0;
+  rhoStep = 0.1; //the distance the probe atom moves between steps
 	
 	
-	while (!tooClose){
-		calcEnergy();
-		potProgress.push_back(potEnergy);
-		distProgress.push_back(probeCoor);
+  while (!tooClose){
+    calcEnergy();
+    potProgress.push_back(potEnergy);
+    distProgress.push_back(probeCoor);
 		
-		//if we've reached a new minimum, save the value and position
-		if (potEnergy < epsVal){
-			epsVal = potEnergy;
-			sDist = probeCoor;
-		}
+    //if we've reached a new minimum, save the value and position
+    if (potEnergy < epsVal){
+      epsVal = potEnergy;
+      sDist = probeCoor;
+    }
 		
-		//test if the probe reached the origin - if so, stop stepping closer
-		if (probeCoor < 0){
-			sigDist = 0.0;
-			tooClose = 1;
-		}
+    //test if the probe reached the origin - if so, stop stepping closer
+    if (probeCoor < 0){
+      sigDist = 0.0;
+      tooClose = 1;
+    }
 		
-		//test if the probe beyond the contact point - if not, take a step closer
-		if (potEnergy < 0){
-			sigDist = probeCoor;
-			tempPotEnergy = potEnergy;
-			probeCoor -= rhoStep;
-		}
-		else {
-			//do a linear interpolation to obtain the sigDist 
-			interpRange = potEnergy - tempPotEnergy;
-			interpFrac = potEnergy / interpRange;
-			interpFrac = interpFrac * rhoStep;
-			sigDist = probeCoor + interpFrac;
+    //test if the probe beyond the contact point - if not, take a step closer
+    if (potEnergy < 0){
+      sigDist = probeCoor;
+      tempPotEnergy = potEnergy;
+      probeCoor -= rhoStep;
+    }
+    else {
+      //do a linear interpolation to obtain the sigDist 
+      interpRange = potEnergy - tempPotEnergy;
+      interpFrac = potEnergy / interpRange;
+      interpFrac = interpFrac * rhoStep;
+      sigDist = probeCoor + interpFrac;
 			
-			//end the loop
-			tooClose = 1;
-		}
-	}
+      //end the loop
+      tooClose = 1;
+    }
+  }
 }
 
 void GridBuilder::calcEnergy(){
@@ -109,37 +110,35 @@ void GridBuilder::stepTheta(double increment){
 }
 
 void GridBuilder::stepTheta(double increment){
-	//zero out the euler angles
-	for (i=0; i<3; i++)
-		angles[i] = 0.0;
+  //zero out the euler angles
+  for (i=0; i<3; i++)
+    angles[i] = 0.0;
 	
-	//the second euler angle is for rotation about the x-axis (we use the zxz convention)
-	angles[1] = increment;
+  //the second euler angle is for rotation about the x-axis (we use the zxz convention)
+  angles[1] = increment;
 	
-	//obtain the rotation matrix through the rigid body class
-	rbMol->doEulerToRotMat(angles, rotX);
+  //obtain the rotation matrix through the rigid body class
+  rbMol->doEulerToRotMat(angles, rotX);
 	
-	//rotate the rigid body
-	rbMol->getA(rbMatrix);
-	matMul3(rotX, rbMatrix, rotatedMat);
-	rbMol->setA(rotatedMat);
-	
+  //rotate the rigid body
+  rbMol->getA(rbMatrix);
+  matMul3(rotX, rbMatrix, rotatedMat);
+  rbMol->setA(rotatedMat);	
 }
 
 void GridBuilder::stepPhi(double increment){
-	//zero out the euler angles
-	for (i=0; i<3; i++)
-		angles[i] = 0.0;
+  //zero out the euler angles
+  for (i=0; i<3; i++)
+    angles[i] = 0.0;
 	
-	//the phi euler angle is for rotation about the z-axis (we use the zxz convention)
-	angles[0] = increment;
+  //the phi euler angle is for rotation about the z-axis (we use the zxz convention)
+  angles[0] = increment;
 	
-	//obtain the rotation matrix through the rigid body class
-	rbMol->doEulerToRotMat(angles, rotZ);
+  //obtain the rotation matrix through the rigid body class
+  rbMol->doEulerToRotMat(angles, rotZ);
 	
-	//rotate the rigid body
-	rbMol->getA(rbMatrix);
-	matMul3(rotZ, rbMatrix, rotatedMat);
-	rbMol->setA(rotatedMat);
-	
+  //rotate the rigid body
+  rbMol->getA(rbMatrix);
+  matMul3(rotZ, rbMatrix, rotatedMat);
+  rbMol->setA(rotatedMat);	
 }