--- trunk/src/primitives/GhostTorsion.cpp	2005/01/25 17:45:23	273
+++ trunk/src/primitives/GhostTorsion.cpp	2005/11/16 23:10:02	749
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -43,11 +43,11 @@ namespace oopse {
 
 namespace oopse {
 
-GhostTorsion::GhostTorsion(Atom *atom1, Atom *atom2,  DirectionalAtom* ghostAtom,
-                 TorsionType *tt) : Torsion(atom1, atom2, ghostAtom, ghostAtom, tt) {}
+  GhostTorsion::GhostTorsion(Atom *atom1, Atom *atom2,  DirectionalAtom* ghostAtom,
+			     TorsionType *tt) : Torsion(atom1, atom2, ghostAtom, ghostAtom, tt) {}
 
-void GhostTorsion::calcForce() {
-    DirectionalAtom* ghostAtom = static_cast<DirectionalAtom*>(atom2_);    
+  void GhostTorsion::calcForce(double& angle) {
+    DirectionalAtom* ghostAtom = static_cast<DirectionalAtom*>(atom3_);    
 
     Vector3d pos1 = atom1_->getPos();
     Vector3d pos2 = atom2_->getPos();
@@ -71,16 +71,13 @@ void GhostTorsion::calcForce() {
     
     //  Calculate the sin and cos
     double cos_phi = dot(A, B) ;
-    double sin_phi = dot(C, B);
 
-    double dVdPhi;
-    torsionType_->calcForce(cos_phi, sin_phi, potential_, dVdPhi);
+    double dVdcosPhi;
+    torsionType_->calcForce(cos_phi, potential_, dVdcosPhi);
 
     Vector3d dcosdA = (cos_phi * A - B) /rA;
     Vector3d dcosdB = (cos_phi * B - A) /rB;
 
-    double dVdcosPhi = -dVdPhi / sin_phi;
-
     Vector3d f1 = dVdcosPhi * cross(r32, dcosdA);
     Vector3d f2 = dVdcosPhi * ( cross(r43, dcosdB) - cross(r21, dcosdA));
     Vector3d f3 = dVdcosPhi * cross(dcosdB, r32);
@@ -92,7 +89,9 @@ void GhostTorsion::calcForce() {
 
     f3.negate();
     ghostAtom->addTrq(cross(r43, f3));    
-}
 
+    angle = acos(cos_phi) /M_PI * 180.0;
+  }
+
 }