--- branches/development/src/nonbonded/SC.cpp 2011/04/30 02:54:02 1554 +++ branches/development/src/nonbonded/SC.cpp 2011/05/27 16:45:44 1571 @@ -306,7 +306,7 @@ namespace OpenMD { if (!initialized_) initialize(); - SCInteractionData mixer = MixingMap[ *(idat.atypes) ]; + SCInteractionData mixer = MixingMap[ idat.atypes ]; RealType rcij = mixer.rCut; @@ -338,10 +338,10 @@ namespace OpenMD { if (!initialized_) initialize(); - SCAtomData data1 = SCMap[idat.atypes->first]; - SCAtomData data2 = SCMap[idat.atypes->second]; + SCAtomData data1 = SCMap[idat.atypes.first]; + SCAtomData data2 = SCMap[idat.atypes.second]; - SCInteractionData mixer = MixingMap[*(idat.atypes)]; + SCInteractionData mixer = MixingMap[idat.atypes]; RealType rcij = mixer.rCut;