Merge pull request #1883 from peastman/revert

Revert changes that caused segfault

wrappers/python/src/swig_doxygen/swigInputConfig.py

@@ -112,7 +112,6 @@ SKIP_METHODS = [('State', 'getPositions'),
                 ('LocalCoordinatesSite',  'getOriginWeights', 0),
                 ('LocalCoordinatesSite',  'getXWeights', 0),
                 ('LocalCoordinatesSite',  'getYWeights', 0),
-                ('CompoundIntegrator', 'getIntegrator'),
 ]
 
 # The build script assumes method args that are non-const references are
@@ -149,6 +148,7 @@ STEAL_OWNERSHIP = {("Platform", "registerPlatform") : [0],
                    ("CustomManyParticleForce", "addTabulatedFunction") : [1],
                    ("CustomCVForce", "addTabulatedFunction") : [1],
                    ("CustomCVForce", "addCollectiveVariable") : [1],
+                   ("CompoundIntegrator", "addIntegrator") : [0],
 }
 
 

wrappers/python/src/swig_doxygen/swig_lib/python/extend.i

@@ -205,13 +205,6 @@ Parameters:
   %}
 }
 
-%extend OpenMM::CompoundIntegrator {
-  %pythoncode %{
-    def getIntegrator(self, index):
-        return self._integrators[index]
-  %}
-}
-
 %extend OpenMM::System {
   %pythoncode %{
     def __getstate__(self):

wrappers/python/src/swig_doxygen/swig_lib/python/pythoncode.i

@@ -28,14 +28,6 @@ from simtk.openmm.vec3 import Vec3
     self._integrator = args[1]
 %}
 
-%pythonappend OpenMM::CompoundIntegrator::CompoundIntegrator %{
-    self._integrators = []
-%}
-
-%pythonprepend OpenMM::CompoundIntegrator::addIntegrator %{
-    self._integrators.append(integrator)
-%}
-
 %pythonprepend OpenMM::AmoebaAngleForce::addAngle %{
     try:
         length = args[3]