Re-arrange some functions within planarForce, planarDissipativeForce, and planarPotential to better use inheritance and have a clearer structure

Author: jobovy

galpy/potential/planarDissipativeForce.py

@@ -61,17 +61,6 @@ def Rforce(self, R, phi=0.0, t=0.0, v=None):
         """
         return self._Rforce_nodecorator(R, phi=phi, t=t, v=v)
 
-    def _Rforce_nodecorator(self, R, phi=0.0, t=0.0, v=None):
-        # Separate, so it can be used during orbit integration
-        try:
-            return self._amp * self._Rforce(R, phi=phi, t=t, v=v)
-        except AttributeError:  # pragma: no cover
-            from .Potential import PotentialError
-
-            raise PotentialError(
-                "'_Rforce' function not implemented for this planarDissipativeForce"
-            )
-
     @potential_physical_input
     @physical_conversion("force", pop=True)
     def phitorque(self, R, phi=0.0, t=0.0, v=None):
@@ -101,19 +90,6 @@ def phitorque(self, R, phi=0.0, t=0.0, v=None):
         """
         return self._phitorque_nodecorator(R, phi=phi, t=t, v=v)
 
-    def _phitorque_nodecorator(self, R, phi=0.0, t=0.0, v=None):
-        # Separate, so it can be used during orbit integration
-        try:
-            return self._amp * self._phitorque(R, phi=phi, t=t, v=v)
-        except AttributeError:  # pragma: no cover
-            if self.isNonAxi:
-                from .Potential import PotentialError
-
-                raise PotentialError(
-                    "'_phitorque' function not implemented for this DissipativeForce"
-                )
-            return 0.0
-
 
 class planarDissipativeForceFromFullDissipativeForce(planarDissipativeForce):
     """Class that represents a planar dissipative force derived from a 3D dissipative force"""

galpy/potential/planarForce.py

@@ -197,3 +197,27 @@ def turn_physical_on(self, ro=None, vo=None):
             if not vo is None:
                 self._vo = vo
         return None
+
+    def _Rforce_nodecorator(self, R, phi=0.0, t=0.0, **kwargs):
+        # Separate, so it can be used during orbit integration
+        try:
+            return self._amp * self._Rforce(R, phi=phi, t=t, **kwargs)
+        except AttributeError:  # pragma: no cover
+            from .Potential import PotentialError
+
+            raise PotentialError(
+                "'_Rforce' function not implemented for this planarDissipativeForce"
+            )
+
+    def _phitorque_nodecorator(self, R, phi=0.0, t=0.0, **kwargs):
+        # Separate, so it can be used during orbit integration
+        try:
+            return self._amp * self._phitorque(R, phi=phi, t=t, **kwargs)
+        except AttributeError:  # pragma: no cover
+            if self.isNonAxi:
+                from .Potential import PotentialError
+
+                raise PotentialError(
+                    "'_phitorque' function not implemented for this DissipativeForce"
+                )
+            return 0.0

galpy/potential/planarPotential.py

@@ -113,15 +113,6 @@ def Rforce(self, R, phi=0.0, t=0.0):
         """
         return self._Rforce_nodecorator(R, phi=phi, t=t)
 
-    def _Rforce_nodecorator(self, R, phi=0.0, t=0.0):
-        # Separate, so it can be used during orbit integration
-        try:
-            return self._amp * self._Rforce(R, phi=phi, t=t)
-        except AttributeError:  # pragma: no cover
-            raise PotentialError(
-                "'_Rforce' function not implemented for this potential"
-            )
-
     @potential_physical_input
     @physical_conversion("energy", pop=True)
     def phitorque(self, R, phi=0.0, t=0.0):
@@ -149,15 +140,6 @@ def phitorque(self, R, phi=0.0, t=0.0):
         """
         return self._phitorque_nodecorator(R, phi=phi, t=t)
 
-    def _phitorque_nodecorator(self, R, phi=0.0, t=0.0):
-        # Separate, so it can be used during orbit integration
-        try:
-            return self._amp * self._phitorque(R, phi=phi, t=t)
-        except AttributeError:  # pragma: no cover
-            raise PotentialError(
-                "'_phitorque' function not implemented for this potential"
-            )
-
     @potential_physical_input
     @physical_conversion("forcederivative", pop=True)
     def R2deriv(self, R, phi=0.0, t=0.0):