Skip to content

Commit

Permalink
Ruff formatting changes (mainly trailing commas in lists of arguments)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jobovy
jobovy committed Mar 5, 2024
1 parent de514c9 commit c87f1b2
Show file tree
Hide file tree
Showing 42 changed files with 762 additions and 927 deletions.
24 changes: 12 additions & 12 deletions galpy/actionAngle/actionAngleAdiabaticGrid.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def __init__(
nEr=31,
nLz=31,
numcores=1,
**kwargs
**kwargs,
):
"""
Initialize an actionAngleAdiabaticGrid object
Expand Down Expand Up @@ -103,7 +103,7 @@ def __init__(
numpy.ones(len(thisRs)), # these two r dummies
numpy.zeros(len(thisRs)),
numpy.sqrt(2.0 * this * thisEzZmaxs),
**kwargs
**kwargs,
)[2]
jz = numpy.reshape(jz, (nR, nEz))
jzEzzmax[0:nR] = jz[:, nEz - 1]
Expand All @@ -118,7 +118,7 @@ def __init__(
0.0,
numpy.sqrt(2.0 * this[x] * thisEzZmaxs[x]),
_justjz=True,
**kwargs
**kwargs,
)[2]
),
range(nR * nEz),
Expand All @@ -137,7 +137,7 @@ def __init__(
0.0,
numpy.sqrt(2.0 * y[jj] * self._EzZmaxs[ii]),
_justjz=True,
**kwargs
**kwargs,
)[2][0]
if jj == nEz - 1:
jzEzzmax[ii] = jz[ii, jj]
Expand Down Expand Up @@ -204,7 +204,7 @@ def __init__(
thisLzs / thisRL,
numpy.zeros(len(thisRL)),
numpy.zeros(len(thisRL)),
**kwargs
**kwargs,
)[0]
jr[:, 0:-1] = numpy.reshape(mjr, (nLz, nEr - 1))
jrERRa[0:nLz] = jr[:, 0]
Expand All @@ -227,7 +227,7 @@ def __init__(
0.0,
0.0,
_justjr=True,
**kwargs
**kwargs,
)[0]
),
range((nEr - 1) * nLz),
Expand Down Expand Up @@ -256,7 +256,7 @@ def __init__(
0.0,
0.0,
_justjr=True,
**kwargs
**kwargs,
)[0][0]
except UnboundError: # pragma: no cover
raise
Expand Down Expand Up @@ -338,7 +338,7 @@ def _evaluate(self, *args, **kwargs):
numpy.zeros(numpy.sum(indx)),
numpy.sqrt(2.0 * Ez[indx]),
_justjz=True,
**kwargs
**kwargs,
)[2]
else:
if (
Expand All @@ -360,7 +360,7 @@ def _evaluate(self, *args, **kwargs):
0.0,
numpy.sqrt(2.0 * Ez),
_justjz=True,
**kwargs
**kwargs,
)[2]
else:
jz = (
Expand Down Expand Up @@ -405,7 +405,7 @@ def _evaluate(self, *args, **kwargs):
numpy.zeros(len(thisRL)),
numpy.zeros(len(thisRL)),
_justjr=True,
**kwargs
**kwargs,
)[0]
else:
if (ER - thisERRa) / (thisERRL - thisERRa) > 1.0 and (
Expand Down Expand Up @@ -445,7 +445,7 @@ def _evaluate(self, *args, **kwargs):
0.0,
0.0,
_justjr=True,
**kwargs
**kwargs,
)[0]
else:
jr = (
Expand Down Expand Up @@ -498,7 +498,7 @@ def Jz(self, *args, **kwargs):
0.0,
numpy.sqrt(2.0 * Ez),
_justjz=True,
**kwargs
**kwargs,
)[2]
else:
jz = (
Expand Down
12 changes: 6 additions & 6 deletions galpy/actionAngle/actionAngleIsochroneApprox.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ def plot(self, *args, **kwargs):
vmax=2.0 * numpy.pi,
crange=[0.0, 2.0 * numpy.pi],
colorbar=True,
**kwargs
**kwargs,
)
elif type == "lz":
if downsample:
Expand All @@ -572,7 +572,7 @@ def plot(self, *args, **kwargs):
vmax=2.0 * numpy.pi,
crange=[0.0, 2.0 * numpy.pi],
colorbar=True,
**kwargs
**kwargs,
)
elif type == "jz":
if downsample:
Expand All @@ -597,7 +597,7 @@ def plot(self, *args, **kwargs):
vmax=2.0 * numpy.pi,
crange=[0.0, 2.0 * numpy.pi],
colorbar=True,
**kwargs
**kwargs,
)
else:
if deperiod:
Expand Down Expand Up @@ -658,7 +658,7 @@ def plot(self, *args, **kwargs):
vmax=vmax,
crange=crange,
colorbar=True,
**kwargs
**kwargs,
)
elif type == "araphi":
if downsample:
Expand All @@ -685,7 +685,7 @@ def plot(self, *args, **kwargs):
vmax=vmax,
crange=crange,
colorbar=True,
**kwargs
**kwargs,
)
elif type == "azaphi":
if downsample:
Expand All @@ -712,7 +712,7 @@ def plot(self, *args, **kwargs):
vmax=vmax,
crange=crange,
colorbar=True,
**kwargs
**kwargs,
)
return None

Expand Down
44 changes: 22 additions & 22 deletions galpy/actionAngle/actionAngleSpherical.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ def _actionsFreqsAngles(self, *args, **kwargs):
E[ii],
L[ii],
fixed_quad,
**kwargs
**kwargs,
)
)
# Angles
Expand All @@ -357,7 +357,7 @@ def _actionsFreqsAngles(self, *args, **kwargs):
L[ii],
vr[ii],
fixed_quad,
**kwargs
**kwargs,
)
)
az.append(
Expand All @@ -377,7 +377,7 @@ def _actionsFreqsAngles(self, *args, **kwargs):
vtheta[ii],
phi[ii],
fixed_quad,
**kwargs
**kwargs,
)
)
Op = numpy.array(Op)
Expand Down Expand Up @@ -535,7 +535,7 @@ def _calc_jr(self, rperi, rap, E, L, fixed_quad, **kwargs):
rap,
args=(E, L, self._2dpot),
n=10,
**kwargs
**kwargs,
)[0]
/ numpy.pi
)
Expand All @@ -547,7 +547,7 @@ def _calc_jr(self, rperi, rap, E, L, fixed_quad, **kwargs):
rperi,
rap,
args=(E, L, self._2dpot),
**kwargs
**kwargs,
)
)
)[0] / numpy.pi
Expand All @@ -561,7 +561,7 @@ def _calc_or(self, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
0.0,
numpy.sqrt(Rmean - rperi),
args=(E, L, self._2dpot, rperi),
**kwargs
**kwargs,
)
)[0]
elif Rmean > rperi and fixed_quad:
Expand All @@ -571,7 +571,7 @@ def _calc_or(self, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
numpy.sqrt(Rmean - rperi),
args=(E, L, self._2dpot, rperi),
n=10,
**kwargs
**kwargs,
)[0]
if Rmean < rap and not fixed_quad:
Tr += numpy.array(
Expand All @@ -580,7 +580,7 @@ def _calc_or(self, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
0.0,
numpy.sqrt(rap - Rmean),
args=(E, L, self._2dpot, rap),
**kwargs
**kwargs,
)
)[0]
elif Rmean < rap and fixed_quad:
Expand All @@ -590,7 +590,7 @@ def _calc_or(self, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
numpy.sqrt(rap - Rmean),
args=(E, L, self._2dpot, rap),
n=10,
**kwargs
**kwargs,
)[0]
Tr = 2.0 * Tr
return 2.0 * numpy.pi / Tr
Expand All @@ -605,7 +605,7 @@ def _calc_op(self, Or, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
0.0,
numpy.sqrt(Rmean - rperi),
args=(E, L, self._2dpot, rperi),
**kwargs
**kwargs,
)
)[0]
elif Rmean > rperi and fixed_quad:
Expand All @@ -615,7 +615,7 @@ def _calc_op(self, Or, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
numpy.sqrt(Rmean - rperi),
args=(E, L, self._2dpot, rperi),
n=10,
**kwargs
**kwargs,
)[0]
if Rmean < rap and not fixed_quad:
I += numpy.array(
Expand All @@ -624,7 +624,7 @@ def _calc_op(self, Or, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
0.0,
numpy.sqrt(rap - Rmean),
args=(E, L, self._2dpot, rap),
**kwargs
**kwargs,
)
)[0]
elif Rmean < rap and fixed_quad:
Expand All @@ -634,7 +634,7 @@ def _calc_op(self, Or, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
numpy.sqrt(rap - Rmean),
args=(E, L, self._2dpot, rap),
n=10,
**kwargs
**kwargs,
)[0]
I *= 2 * L
return I * Or / 2.0 / numpy.pi
Expand Down Expand Up @@ -663,7 +663,7 @@ def _calc_angler(self, Or, r, Rmean, rperi, rap, E, L, vr, fixed_quad, **kwargs)
0.0,
numpy.sqrt(r - rperi),
args=(E, L, self._2dpot, rperi),
**kwargs
**kwargs,
)[0]
)
elif r > rperi and fixed_quad:
Expand All @@ -675,7 +675,7 @@ def _calc_angler(self, Or, r, Rmean, rperi, rap, E, L, vr, fixed_quad, **kwargs)
numpy.sqrt(r - rperi),
args=(E, L, self._2dpot, rperi),
n=10,
**kwargs
**kwargs,
)[0]
)
else:
Expand All @@ -691,7 +691,7 @@ def _calc_angler(self, Or, r, Rmean, rperi, rap, E, L, vr, fixed_quad, **kwargs)
0.0,
numpy.sqrt(rap - r),
args=(E, L, self._2dpot, rap),
**kwargs
**kwargs,
)[0]
)
elif r < rap and fixed_quad:
Expand All @@ -703,7 +703,7 @@ def _calc_angler(self, Or, r, Rmean, rperi, rap, E, L, vr, fixed_quad, **kwargs)
numpy.sqrt(rap - r),
args=(E, L, self._2dpot, rap),
n=10,
**kwargs
**kwargs,
)[0]
)
else:
Expand Down Expand Up @@ -731,7 +731,7 @@ def _calc_anglez(
vtheta,
phi,
fixed_quad,
**kwargs
**kwargs,
):
# First calculate psi
i = numpy.arccos(Lz / L)
Expand All @@ -755,7 +755,7 @@ def _calc_anglez(
0.0,
numpy.sqrt(r - rperi),
args=(E, L, self._2dpot, rperi),
**kwargs
**kwargs,
)[0]
)
elif fixed_quad:
Expand All @@ -767,7 +767,7 @@ def _calc_anglez(
numpy.sqrt(r - rperi),
args=(E, L, self._2dpot, rperi),
n=10,
**kwargs
**kwargs,
)[0]
)
if vr < 0.0:
Expand All @@ -781,7 +781,7 @@ def _calc_anglez(
0.0,
numpy.sqrt(rap - r),
args=(E, L, self._2dpot, rap),
**kwargs
**kwargs,
)[0]
)
elif fixed_quad:
Expand All @@ -793,7 +793,7 @@ def _calc_anglez(
numpy.sqrt(rap - r),
args=(E, L, self._2dpot, rap),
n=10,
**kwargs
**kwargs,
)[0]
)
if vr < 0.0:
Expand Down
8 changes: 4 additions & 4 deletions galpy/actionAngle/actionAngleStaeckel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ def JR(self, **kwargs):
self._pot,
),
n=order,
**kwargs
**kwargs,
)[0]
)
else:
Expand All @@ -793,7 +793,7 @@ def JR(self, **kwargs):
self._potu0v0,
self._pot,
),
**kwargs
**kwargs,
)[0]
)
return self._JR
Expand Down Expand Up @@ -847,7 +847,7 @@ def Jz(self, **kwargs):
self._pot,
),
n=order,
**kwargs
**kwargs,
)[0]
)
else:
Expand All @@ -872,7 +872,7 @@ def Jz(self, **kwargs):
self._potupi2,
self._pot,
),
**kwargs
**kwargs,
)[0]
)
return self._JZ
Expand Down
Loading

0 comments on commit c87f1b2

Please sign in to comment.