Skip to content

Commit f227cb7

Browse files
jobovyjobovy
committed
Ruff formatting changes (mainly trailing commas in lists of arguments)
1 parent af95e01 commit f227cb7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+762
-927
lines changed

‎galpy/actionAngle/actionAngleAdiabaticGrid.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def __init__(
3737
nEr=31,
3838
nLz=31,
3939
numcores=1,
40-
**kwargs
40+
**kwargs,
4141
):
4242
"""
4343
Initialize an actionAngleAdiabaticGrid object
@@ -103,7 +103,7 @@ def __init__(
103103
numpy.ones(len(thisRs)), # these two r dummies
104104
numpy.zeros(len(thisRs)),
105105
numpy.sqrt(2.0 * this * thisEzZmaxs),
106-
**kwargs
106+
**kwargs,
107107
)[2]
108108
jz = numpy.reshape(jz, (nR, nEz))
109109
jzEzzmax[0:nR] = jz[:, nEz - 1]
@@ -118,7 +118,7 @@ def __init__(
118118
0.0,
119119
numpy.sqrt(2.0 * this[x] * thisEzZmaxs[x]),
120120
_justjz=True,
121-
**kwargs
121+
**kwargs,
122122
)[2]
123123
),
124124
range(nR * nEz),
@@ -137,7 +137,7 @@ def __init__(
137137
0.0,
138138
numpy.sqrt(2.0 * y[jj] * self._EzZmaxs[ii]),
139139
_justjz=True,
140-
**kwargs
140+
**kwargs,
141141
)[2][0]
142142
if jj == nEz - 1:
143143
jzEzzmax[ii] = jz[ii, jj]
@@ -204,7 +204,7 @@ def __init__(
204204
thisLzs / thisRL,
205205
numpy.zeros(len(thisRL)),
206206
numpy.zeros(len(thisRL)),
207-
**kwargs
207+
**kwargs,
208208
)[0]
209209
jr[:, 0:-1] = numpy.reshape(mjr, (nLz, nEr - 1))
210210
jrERRa[0:nLz] = jr[:, 0]
@@ -227,7 +227,7 @@ def __init__(
227227
0.0,
228228
0.0,
229229
_justjr=True,
230-
**kwargs
230+
**kwargs,
231231
)[0]
232232
),
233233
range((nEr - 1) * nLz),
@@ -256,7 +256,7 @@ def __init__(
256256
0.0,
257257
0.0,
258258
_justjr=True,
259-
**kwargs
259+
**kwargs,
260260
)[0][0]
261261
except UnboundError: # pragma: no cover
262262
raise
@@ -338,7 +338,7 @@ def _evaluate(self, *args, **kwargs):
338338
numpy.zeros(numpy.sum(indx)),
339339
numpy.sqrt(2.0 * Ez[indx]),
340340
_justjz=True,
341-
**kwargs
341+
**kwargs,
342342
)[2]
343343
else:
344344
if (
@@ -360,7 +360,7 @@ def _evaluate(self, *args, **kwargs):
360360
0.0,
361361
numpy.sqrt(2.0 * Ez),
362362
_justjz=True,
363-
**kwargs
363+
**kwargs,
364364
)[2]
365365
else:
366366
jz = (
@@ -405,7 +405,7 @@ def _evaluate(self, *args, **kwargs):
405405
numpy.zeros(len(thisRL)),
406406
numpy.zeros(len(thisRL)),
407407
_justjr=True,
408-
**kwargs
408+
**kwargs,
409409
)[0]
410410
else:
411411
if (ER - thisERRa) / (thisERRL - thisERRa) > 1.0 and (
@@ -445,7 +445,7 @@ def _evaluate(self, *args, **kwargs):
445445
0.0,
446446
0.0,
447447
_justjr=True,
448-
**kwargs
448+
**kwargs,
449449
)[0]
450450
else:
451451
jr = (
@@ -498,7 +498,7 @@ def Jz(self, *args, **kwargs):
498498
0.0,
499499
numpy.sqrt(2.0 * Ez),
500500
_justjz=True,
501-
**kwargs
501+
**kwargs,
502502
)[2]
503503
else:
504504
jz = (

‎galpy/actionAngle/actionAngleIsochroneApprox.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ def plot(self, *args, **kwargs):
547547
vmax=2.0 * numpy.pi,
548548
crange=[0.0, 2.0 * numpy.pi],
549549
colorbar=True,
550-
**kwargs
550+
**kwargs,
551551
)
552552
elif type == "lz":
553553
if downsample:
@@ -572,7 +572,7 @@ def plot(self, *args, **kwargs):
572572
vmax=2.0 * numpy.pi,
573573
crange=[0.0, 2.0 * numpy.pi],
574574
colorbar=True,
575-
**kwargs
575+
**kwargs,
576576
)
577577
elif type == "jz":
578578
if downsample:
@@ -597,7 +597,7 @@ def plot(self, *args, **kwargs):
597597
vmax=2.0 * numpy.pi,
598598
crange=[0.0, 2.0 * numpy.pi],
599599
colorbar=True,
600-
**kwargs
600+
**kwargs,
601601
)
602602
else:
603603
if deperiod:
@@ -658,7 +658,7 @@ def plot(self, *args, **kwargs):
658658
vmax=vmax,
659659
crange=crange,
660660
colorbar=True,
661-
**kwargs
661+
**kwargs,
662662
)
663663
elif type == "araphi":
664664
if downsample:
@@ -685,7 +685,7 @@ def plot(self, *args, **kwargs):
685685
vmax=vmax,
686686
crange=crange,
687687
colorbar=True,
688-
**kwargs
688+
**kwargs,
689689
)
690690
elif type == "azaphi":
691691
if downsample:
@@ -712,7 +712,7 @@ def plot(self, *args, **kwargs):
712712
vmax=vmax,
713713
crange=crange,
714714
colorbar=True,
715-
**kwargs
715+
**kwargs,
716716
)
717717
return None
718718

‎galpy/actionAngle/actionAngleSpherical.py

+22-22
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def _actionsFreqsAngles(self, *args, **kwargs):
342342
E[ii],
343343
L[ii],
344344
fixed_quad,
345-
**kwargs
345+
**kwargs,
346346
)
347347
)
348348
# Angles
@@ -357,7 +357,7 @@ def _actionsFreqsAngles(self, *args, **kwargs):
357357
L[ii],
358358
vr[ii],
359359
fixed_quad,
360-
**kwargs
360+
**kwargs,
361361
)
362362
)
363363
az.append(
@@ -377,7 +377,7 @@ def _actionsFreqsAngles(self, *args, **kwargs):
377377
vtheta[ii],
378378
phi[ii],
379379
fixed_quad,
380-
**kwargs
380+
**kwargs,
381381
)
382382
)
383383
Op = numpy.array(Op)
@@ -535,7 +535,7 @@ def _calc_jr(self, rperi, rap, E, L, fixed_quad, **kwargs):
535535
rap,
536536
args=(E, L, self._2dpot),
537537
n=10,
538-
**kwargs
538+
**kwargs,
539539
)[0]
540540
/ numpy.pi
541541
)
@@ -547,7 +547,7 @@ def _calc_jr(self, rperi, rap, E, L, fixed_quad, **kwargs):
547547
rperi,
548548
rap,
549549
args=(E, L, self._2dpot),
550-
**kwargs
550+
**kwargs,
551551
)
552552
)
553553
)[0] / numpy.pi
@@ -561,7 +561,7 @@ def _calc_or(self, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
561561
0.0,
562562
numpy.sqrt(Rmean - rperi),
563563
args=(E, L, self._2dpot, rperi),
564-
**kwargs
564+
**kwargs,
565565
)
566566
)[0]
567567
elif Rmean > rperi and fixed_quad:
@@ -571,7 +571,7 @@ def _calc_or(self, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
571571
numpy.sqrt(Rmean - rperi),
572572
args=(E, L, self._2dpot, rperi),
573573
n=10,
574-
**kwargs
574+
**kwargs,
575575
)[0]
576576
if Rmean < rap and not fixed_quad:
577577
Tr += numpy.array(
@@ -580,7 +580,7 @@ def _calc_or(self, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
580580
0.0,
581581
numpy.sqrt(rap - Rmean),
582582
args=(E, L, self._2dpot, rap),
583-
**kwargs
583+
**kwargs,
584584
)
585585
)[0]
586586
elif Rmean < rap and fixed_quad:
@@ -590,7 +590,7 @@ def _calc_or(self, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
590590
numpy.sqrt(rap - Rmean),
591591
args=(E, L, self._2dpot, rap),
592592
n=10,
593-
**kwargs
593+
**kwargs,
594594
)[0]
595595
Tr = 2.0 * Tr
596596
return 2.0 * numpy.pi / Tr
@@ -605,7 +605,7 @@ def _calc_op(self, Or, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
605605
0.0,
606606
numpy.sqrt(Rmean - rperi),
607607
args=(E, L, self._2dpot, rperi),
608-
**kwargs
608+
**kwargs,
609609
)
610610
)[0]
611611
elif Rmean > rperi and fixed_quad:
@@ -615,7 +615,7 @@ def _calc_op(self, Or, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
615615
numpy.sqrt(Rmean - rperi),
616616
args=(E, L, self._2dpot, rperi),
617617
n=10,
618-
**kwargs
618+
**kwargs,
619619
)[0]
620620
if Rmean < rap and not fixed_quad:
621621
I += numpy.array(
@@ -624,7 +624,7 @@ def _calc_op(self, Or, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
624624
0.0,
625625
numpy.sqrt(rap - Rmean),
626626
args=(E, L, self._2dpot, rap),
627-
**kwargs
627+
**kwargs,
628628
)
629629
)[0]
630630
elif Rmean < rap and fixed_quad:
@@ -634,7 +634,7 @@ def _calc_op(self, Or, Rmean, rperi, rap, E, L, fixed_quad, **kwargs):
634634
numpy.sqrt(rap - Rmean),
635635
args=(E, L, self._2dpot, rap),
636636
n=10,
637-
**kwargs
637+
**kwargs,
638638
)[0]
639639
I *= 2 * L
640640
return I * Or / 2.0 / numpy.pi
@@ -663,7 +663,7 @@ def _calc_angler(self, Or, r, Rmean, rperi, rap, E, L, vr, fixed_quad, **kwargs)
663663
0.0,
664664
numpy.sqrt(r - rperi),
665665
args=(E, L, self._2dpot, rperi),
666-
**kwargs
666+
**kwargs,
667667
)[0]
668668
)
669669
elif r > rperi and fixed_quad:
@@ -675,7 +675,7 @@ def _calc_angler(self, Or, r, Rmean, rperi, rap, E, L, vr, fixed_quad, **kwargs)
675675
numpy.sqrt(r - rperi),
676676
args=(E, L, self._2dpot, rperi),
677677
n=10,
678-
**kwargs
678+
**kwargs,
679679
)[0]
680680
)
681681
else:
@@ -691,7 +691,7 @@ def _calc_angler(self, Or, r, Rmean, rperi, rap, E, L, vr, fixed_quad, **kwargs)
691691
0.0,
692692
numpy.sqrt(rap - r),
693693
args=(E, L, self._2dpot, rap),
694-
**kwargs
694+
**kwargs,
695695
)[0]
696696
)
697697
elif r < rap and fixed_quad:
@@ -703,7 +703,7 @@ def _calc_angler(self, Or, r, Rmean, rperi, rap, E, L, vr, fixed_quad, **kwargs)
703703
numpy.sqrt(rap - r),
704704
args=(E, L, self._2dpot, rap),
705705
n=10,
706-
**kwargs
706+
**kwargs,
707707
)[0]
708708
)
709709
else:
@@ -731,7 +731,7 @@ def _calc_anglez(
731731
vtheta,
732732
phi,
733733
fixed_quad,
734-
**kwargs
734+
**kwargs,
735735
):
736736
# First calculate psi
737737
i = numpy.arccos(Lz / L)
@@ -755,7 +755,7 @@ def _calc_anglez(
755755
0.0,
756756
numpy.sqrt(r - rperi),
757757
args=(E, L, self._2dpot, rperi),
758-
**kwargs
758+
**kwargs,
759759
)[0]
760760
)
761761
elif fixed_quad:
@@ -767,7 +767,7 @@ def _calc_anglez(
767767
numpy.sqrt(r - rperi),
768768
args=(E, L, self._2dpot, rperi),
769769
n=10,
770-
**kwargs
770+
**kwargs,
771771
)[0]
772772
)
773773
if vr < 0.0:
@@ -781,7 +781,7 @@ def _calc_anglez(
781781
0.0,
782782
numpy.sqrt(rap - r),
783783
args=(E, L, self._2dpot, rap),
784-
**kwargs
784+
**kwargs,
785785
)[0]
786786
)
787787
elif fixed_quad:
@@ -793,7 +793,7 @@ def _calc_anglez(
793793
numpy.sqrt(rap - r),
794794
args=(E, L, self._2dpot, rap),
795795
n=10,
796-
**kwargs
796+
**kwargs,
797797
)[0]
798798
)
799799
if vr < 0.0:

‎galpy/actionAngle/actionAngleStaeckel.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ def JR(self, **kwargs):
768768
self._pot,
769769
),
770770
n=order,
771-
**kwargs
771+
**kwargs,
772772
)[0]
773773
)
774774
else:
@@ -793,7 +793,7 @@ def JR(self, **kwargs):
793793
self._potu0v0,
794794
self._pot,
795795
),
796-
**kwargs
796+
**kwargs,
797797
)[0]
798798
)
799799
return self._JR
@@ -847,7 +847,7 @@ def Jz(self, **kwargs):
847847
self._pot,
848848
),
849849
n=order,
850-
**kwargs
850+
**kwargs,
851851
)[0]
852852
)
853853
else:
@@ -872,7 +872,7 @@ def Jz(self, **kwargs):
872872
self._potupi2,
873873
self._pot,
874874
),
875-
**kwargs
875+
**kwargs,
876876
)[0]
877877
)
878878
return self._JZ

0 commit comments

Comments
 (0)