Merge pull request #1935 from jchodera/fix-forcefield

Remove optimization to ForceField's LennardJonesGenerator that was causing issues with CHARMM conversion

wrappers/python/simtk/openmm/app/forcefield.py

@@ -2439,11 +2439,6 @@ class LennardJonesGenerator(object):
         # Create the exceptions.
 
         bondIndices = _findBondsForExclusions(data, sys)
-        if self.lj14scale == 1:
-            # Just exclude the 1-2 and 1-3 interactions.
-
-            self.force.createExclusionsFromBonds(bondIndices, 2)
-        else:
         forceCopy = deepcopy(self.force)
         forceCopy.createExclusionsFromBonds(bondIndices, 2)
         self.force.createExclusionsFromBonds(bondIndices, 3)