From 663f9d6ad2b88363944b6114ec06622e384c0286 Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Wed, 29 Apr 2020 23:53:21 -0400 Subject: [PATCH] Fix some spacing issues accidentally introduced in the merge --- galpy/actionAngle/actionAngleAdiabatic.py | 4 ++-- galpy/actionAngle/actionAngleVertical.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/galpy/actionAngle/actionAngleAdiabatic.py b/galpy/actionAngle/actionAngleAdiabatic.py index 83cc5d05d..47586c177 100644 --- a/galpy/actionAngle/actionAngleAdiabatic.py +++ b/galpy/actionAngle/actionAngleAdiabatic.py @@ -70,7 +70,7 @@ def __init__(self,*args,**kwargs): # Setup actionAngleSpherical object for calculations in Python # (if they become necessary) if _dim(self._pot) == 3: - thispot= toPlanarPotential(self._pot) + thispot= toPlanarPotential(self._pot) else: thispot= self._pot self._gamma= 0. @@ -148,7 +148,7 @@ def _evaluate(self,*args,**kwargs): numpy.nan,numpy.nan) #Set up the actionAngleVertical object if _dim(self._pot) == 3: - thisverticalpot= toVerticalPotential(self._pot,R[0]) + thisverticalpot= toVerticalPotential(self._pot,R[0]) aAV= actionAngleVertical(pot=thisverticalpot) Jz= aAV(z[0],vz[0]) else: #2D in-plane diff --git a/galpy/actionAngle/actionAngleVertical.py b/galpy/actionAngle/actionAngleVertical.py index b8973a3c8..52210baa3 100644 --- a/galpy/actionAngle/actionAngleVertical.py +++ b/galpy/actionAngle/actionAngleVertical.py @@ -185,7 +185,7 @@ def _actionsFreqsAngles(self,*args,**kwargs): -evaluatelinearPotentials(self._pot,xi, use_physical=False))), 0.,xmax)[0]/numpy.pi - Omega[ii]= nu.pi/2./integrate.quad(\ + Omega[ii]= numpy.pi/2./integrate.quad(\ lambda t: 2.*t/numpy.sqrt(2.*(E\ -evaluatelinearPotentials(self._pot, xmax-t**2.,