--- branches/development/src/nonbonded/Sticky.cpp	2011/01/05 14:49:05	1536
+++ branches/development/src/nonbonded/Sticky.cpp	2011/04/27 18:38:15	1549
@@ -190,9 +190,8 @@ namespace OpenMD {
    
     if (!initialized_) initialize();
     
-    pair<AtomType*, AtomType*> key = make_pair(idat.atype1, idat.atype2);
     map<pair<AtomType*, AtomType*>, StickyInteractionData>::iterator it;
-    it = MixingMap.find(key);
+    it = MixingMap.find(idat.atypes);
     if (it != MixingMap.end()) {
 
       StickyInteractionData mixer = (*it).second;
@@ -343,7 +342,7 @@ namespace OpenMD {
           dspdr = 0.0;
         }
         
-        idat.vpair[2] += 0.5*(v0*s*w + v0p*sp*wp);
+        idat.vpair += 0.5*(v0*s*w + v0p*sp*wp);
         idat.pot[2] += 0.5*(v0*s*w + v0p*sp*wp)*idat.sw;
         
         // do the torques first since they are easy:
@@ -378,11 +377,10 @@ namespace OpenMD {
     return;      
   }
 
-  RealType Sticky::getSuggestedCutoffRadius(AtomType* at1, AtomType* at2) {
+  RealType Sticky::getSuggestedCutoffRadius(pair<AtomType*, AtomType*> atypes) {
     if (!initialized_) initialize();   
-    pair<AtomType*, AtomType*> key = make_pair(at1, at2); 
     map<pair<AtomType*, AtomType*>, StickyInteractionData>::iterator it;
-    it = MixingMap.find(key);
+    it = MixingMap.find(atypes);
     if (it == MixingMap.end()) 
       return 0.0;
     else  {