Skip to content

Commit 62a64d2

Browse files
STY: rewrite literals as scientific notation where it shortens by >3 chars
Apply pylint's scientific-notation suggestion to literals where the scientific form is at least 4 characters shorter than the underscore alternative. Mostly tiny CODATA / IAU uncertainties (e.g. 0.00000000051e-27 -> 5.1e-37, saving 10 chars) plus a handful of round-magnitude values where scientific is the obvious win: 4_000_000.0 -> 4e6, 3_396_190.0 -> 3.39619e6, 6378137.0 -> 6.378137e6, 0.000000443 -> 4.43e-7, etc. For values where scientific saves 0-3 chars vs underscore (Julian Dates, speed of light, Rydberg constant, day-numbered epochs), the underscore form preserves more visual structure and will be applied later instead. ruff-format collapsed several CODATA(...) calls onto single lines once the literals were short enough to fit; that's most of the line-count delta. All literals parse to identical floats.
1 parent 4bdea27 commit 62a64d2

17 files changed

Lines changed: 85 additions & 139 deletions

File tree

‎astropy/constants/codata2010.py‎

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ class EMCODATA2010(CODATA2010, EMConstant):
3535
_registry = CODATA2010._registry
3636

3737

38-
h = CODATA2010(
39-
"h", "Planck constant", 6.62606957e-34, "J s", 0.00000029e-34, system="si"
40-
)
38+
h = CODATA2010("h", "Planck constant", 6.62606957e-34, "J s", 2.9e-41, system="si")
4139

4240
hbar = CODATA2010(
4341
"hbar",
@@ -50,54 +48,46 @@ class EMCODATA2010(CODATA2010, EMConstant):
5048
)
5149

5250
k_B = CODATA2010(
53-
"k_B", "Boltzmann constant", 1.3806488e-23, "J / (K)", 0.0000013e-23, system="si"
51+
"k_B", "Boltzmann constant", 1.3806488e-23, "J / (K)", 1.3e-29, system="si"
5452
)
5553

5654
c = CODATA2010(
5755
"c", "Speed of light in vacuum", 2.99792458e8, "m / (s)", 0.0, system="si"
5856
)
5957

6058
G = CODATA2010(
61-
"G", "Gravitational constant", 6.67384e-11, "m3 / (kg s2)", 0.00080e-11, system="si"
59+
"G", "Gravitational constant", 6.67384e-11, "m3 / (kg s2)", 8.0e-15, system="si"
6260
)
6361

6462
g0 = CODATA2010(
6563
"g0", "Standard acceleration of gravity", 9.80665, "m / s2", 0.0, system="si"
6664
)
6765

68-
m_p = CODATA2010(
69-
"m_p", "Proton mass", 1.672621777e-27, "kg", 0.000000074e-27, system="si"
70-
)
66+
m_p = CODATA2010("m_p", "Proton mass", 1.672621777e-27, "kg", 7.4e-35, system="si")
7167

72-
m_n = CODATA2010(
73-
"m_n", "Neutron mass", 1.674927351e-27, "kg", 0.000000074e-27, system="si"
74-
)
68+
m_n = CODATA2010("m_n", "Neutron mass", 1.674927351e-27, "kg", 7.4e-35, system="si")
7569

76-
m_e = CODATA2010(
77-
"m_e", "Electron mass", 9.10938291e-31, "kg", 0.00000040e-31, system="si"
78-
)
70+
m_e = CODATA2010("m_e", "Electron mass", 9.10938291e-31, "kg", 4.0e-38, system="si")
7971

80-
u = CODATA2010("u", "Atomic mass", 1.660538921e-27, "kg", 0.000000073e-27, system="si")
72+
u = CODATA2010("u", "Atomic mass", 1.660538921e-27, "kg", 7.3e-35, system="si")
8173

8274
sigma_sb = CODATA2010(
8375
"sigma_sb",
8476
"Stefan-Boltzmann constant",
8577
5.670373e-8,
8678
"W / (K4 m2)",
87-
0.000021e-8,
79+
2.1e-13,
8880
system="si",
8981
)
9082

91-
e = EMCODATA2010(
92-
"e", "Electron charge", 1.602176565e-19, "C", 0.000000035e-19, system="si"
93-
)
83+
e = EMCODATA2010("e", "Electron charge", 1.602176565e-19, "C", 3.5e-27, system="si")
9484

9585
eps0 = EMCODATA2010(
9686
"eps0", "Electric constant", 8.854187817e-12, "F/m", 0.0, system="si"
9787
)
9888

9989
N_A = CODATA2010(
100-
"N_A", "Avogadro's number", 6.02214129e23, "1 / (mol)", 0.00000027e23, system="si"
90+
"N_A", "Avogadro's number", 6.02214129e23, "1 / (mol)", 2.7e16, system="si"
10191
)
10292

10393
R = CODATA2010("R", "Gas constant", 8.3144621, "J / (K mol)", 0.0000075, system="si")
@@ -106,20 +96,16 @@ class EMCODATA2010(CODATA2010, EMConstant):
10696
"Ryd", "Rydberg constant", 10973731.568539, "1 / (m)", 0.000055, system="si"
10797
)
10898

109-
a0 = CODATA2010(
110-
"a0", "Bohr radius", 0.52917721092e-10, "m", 0.00000000017e-10, system="si"
111-
)
99+
a0 = CODATA2010("a0", "Bohr radius", 5.2917721092e-11, "m", 1.7e-20, system="si")
112100

113-
muB = CODATA2010(
114-
"muB", "Bohr magneton", 927.400968e-26, "J/T", 0.00002e-26, system="si"
115-
)
101+
muB = CODATA2010("muB", "Bohr magneton", 9.27400968e-24, "J/T", 2.0e-31, system="si")
116102

117103
alpha = CODATA2010(
118104
"alpha",
119105
"Fine-structure constant",
120106
7.2973525698e-3,
121107
"",
122-
0.0000000024e-3,
108+
2.4e-12,
123109
system="si",
124110
)
125111

@@ -130,9 +116,9 @@ class EMCODATA2010(CODATA2010, EMConstant):
130116
sigma_T = CODATA2010(
131117
"sigma_T",
132118
"Thomson scattering cross-section",
133-
0.6652458734e-28,
119+
6.652458734e-29,
134120
"m2",
135-
0.0000000013e-28,
121+
1.3e-37,
136122
system="si",
137123
)
138124

@@ -141,7 +127,7 @@ class EMCODATA2010(CODATA2010, EMConstant):
141127
"Wien wavelength displacement law constant",
142128
2.8977721e-3,
143129
"m K",
144-
0.0000026e-3,
130+
2.6e-9,
145131
"CODATA 2010",
146132
system="si",
147133
)

‎astropy/constants/codata2014.py‎

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,19 @@ class EMCODATA2014(CODATA2014, EMConstant):
2121
_registry = CODATA2014._registry
2222

2323

24-
h = CODATA2014(
25-
"h", "Planck constant", 6.626070040e-34, "J s", 0.000000081e-34, system="si"
26-
)
24+
h = CODATA2014("h", "Planck constant", 6.626070040e-34, "J s", 8.1e-42, system="si")
2725

2826
hbar = CODATA2014(
2927
"hbar",
3028
"Reduced Planck constant",
3129
1.054571800e-34,
3230
"J s",
33-
0.000000013e-34,
31+
1.3e-42,
3432
system="si",
3533
)
3634

3735
k_B = CODATA2014(
38-
"k_B", "Boltzmann constant", 1.38064852e-23, "J / (K)", 0.00000079e-23, system="si"
36+
"k_B", "Boltzmann constant", 1.38064852e-23, "J / (K)", 7.9e-30, system="si"
3937
)
4038

4139
c = CODATA2014(
@@ -44,46 +42,38 @@ class EMCODATA2014(CODATA2014, EMConstant):
4442

4543

4644
G = CODATA2014(
47-
"G", "Gravitational constant", 6.67408e-11, "m3 / (kg s2)", 0.00031e-11, system="si"
45+
"G", "Gravitational constant", 6.67408e-11, "m3 / (kg s2)", 3.1e-15, system="si"
4846
)
4947

5048
g0 = CODATA2014(
5149
"g0", "Standard acceleration of gravity", 9.80665, "m / s2", 0.0, system="si"
5250
)
5351

54-
m_p = CODATA2014(
55-
"m_p", "Proton mass", 1.672621898e-27, "kg", 0.000000021e-27, system="si"
56-
)
52+
m_p = CODATA2014("m_p", "Proton mass", 1.672621898e-27, "kg", 2.1e-35, system="si")
5753

58-
m_n = CODATA2014(
59-
"m_n", "Neutron mass", 1.674927471e-27, "kg", 0.000000021e-27, system="si"
60-
)
54+
m_n = CODATA2014("m_n", "Neutron mass", 1.674927471e-27, "kg", 2.1e-35, system="si")
6155

62-
m_e = CODATA2014(
63-
"m_e", "Electron mass", 9.10938356e-31, "kg", 0.00000011e-31, system="si"
64-
)
56+
m_e = CODATA2014("m_e", "Electron mass", 9.10938356e-31, "kg", 1.1e-38, system="si")
6557

66-
u = CODATA2014("u", "Atomic mass", 1.660539040e-27, "kg", 0.000000020e-27, system="si")
58+
u = CODATA2014("u", "Atomic mass", 1.660539040e-27, "kg", 2.0e-35, system="si")
6759

6860
sigma_sb = CODATA2014(
6961
"sigma_sb",
7062
"Stefan-Boltzmann constant",
7163
5.670367e-8,
7264
"W / (K4 m2)",
73-
0.000013e-8,
65+
1.3e-13,
7466
system="si",
7567
)
7668

77-
e = EMCODATA2014(
78-
"e", "Electron charge", 1.6021766208e-19, "C", 0.0000000098e-19, system="si"
79-
)
69+
e = EMCODATA2014("e", "Electron charge", 1.6021766208e-19, "C", 9.8e-28, system="si")
8070

8171
eps0 = EMCODATA2014(
8272
"eps0", "Electric constant", 8.854187817e-12, "F/m", 0.0, system="si"
8373
)
8474

8575
N_A = CODATA2014(
86-
"N_A", "Avogadro's number", 6.022140857e23, "1 / (mol)", 0.000000074e23, system="si"
76+
"N_A", "Avogadro's number", 6.022140857e23, "1 / (mol)", 7.4e15, system="si"
8777
)
8878

8979
R = CODATA2014("R", "Gas constant", 8.3144598, "J / (K mol)", 0.0000048, system="si")
@@ -92,20 +82,16 @@ class EMCODATA2014(CODATA2014, EMConstant):
9282
"Ryd", "Rydberg constant", 10973731.568508, "1 / (m)", 0.000065, system="si"
9383
)
9484

95-
a0 = CODATA2014(
96-
"a0", "Bohr radius", 0.52917721067e-10, "m", 0.00000000012e-10, system="si"
97-
)
85+
a0 = CODATA2014("a0", "Bohr radius", 5.2917721067e-11, "m", 1.2e-20, system="si")
9886

99-
muB = CODATA2014(
100-
"muB", "Bohr magneton", 927.4009994e-26, "J/T", 0.00002e-26, system="si"
101-
)
87+
muB = CODATA2014("muB", "Bohr magneton", 9.274009994e-24, "J/T", 2.0e-31, system="si")
10288

10389
alpha = CODATA2014(
10490
"alpha",
10591
"Fine-structure constant",
10692
7.2973525664e-3,
10793
"",
108-
0.0000000017e-3,
94+
1.7e-12,
10995
system="si",
11096
)
11197

@@ -116,9 +102,9 @@ class EMCODATA2014(CODATA2014, EMConstant):
116102
sigma_T = CODATA2014(
117103
"sigma_T",
118104
"Thomson scattering cross-section",
119-
0.66524587158e-28,
105+
6.6524587158e-29,
120106
"m2",
121-
0.00000000091e-28,
107+
9.1e-38,
122108
system="si",
123109
)
124110

@@ -127,7 +113,7 @@ class EMCODATA2014(CODATA2014, EMConstant):
127113
"Wien wavelength displacement law constant",
128114
2.8977729e-3,
129115
"m K",
130-
0.0000017e-3,
116+
1.7e-9,
131117
system="si",
132118
)
133119

‎astropy/constants/codata2018.py‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,20 @@ class EMCODATA2018(CODATA2018, EMConstant):
3636

3737

3838
G = CODATA2018(
39-
"G", "Gravitational constant", 6.67430e-11, "m3 / (kg s2)", 0.00015e-11, system="si"
39+
"G", "Gravitational constant", 6.67430e-11, "m3 / (kg s2)", 1.5e-15, system="si"
4040
)
4141

4242
g0 = CODATA2018(
4343
"g0", "Standard acceleration of gravity", 9.80665, "m / s2", 0.0, system="si"
4444
)
4545

46-
m_p = CODATA2018(
47-
"m_p", "Proton mass", 1.67262192369e-27, "kg", 0.00000000051e-27, system="si"
48-
)
46+
m_p = CODATA2018("m_p", "Proton mass", 1.67262192369e-27, "kg", 5.1e-37, system="si")
4947

50-
m_n = CODATA2018(
51-
"m_n", "Neutron mass", 1.67492749804e-27, "kg", 0.00000000095e-27, system="si"
52-
)
48+
m_n = CODATA2018("m_n", "Neutron mass", 1.67492749804e-27, "kg", 9.5e-37, system="si")
5349

54-
m_e = CODATA2018(
55-
"m_e", "Electron mass", 9.1093837015e-31, "kg", 0.0000000028e-31, system="si"
56-
)
50+
m_e = CODATA2018("m_e", "Electron mass", 9.1093837015e-31, "kg", 2.8e-40, system="si")
5751

58-
u = CODATA2018(
59-
"u", "Atomic mass", 1.66053906660e-27, "kg", 0.00000000050e-27, system="si"
60-
)
52+
u = CODATA2018("u", "Atomic mass", 1.66053906660e-27, "kg", 5.0e-37, system="si")
6153

6254
sigma_sb = CODATA2018(
6355
"sigma_sb",
@@ -75,7 +67,7 @@ class EMCODATA2018(CODATA2018, EMConstant):
7567
"Vacuum electric permittivity",
7668
8.8541878128e-12,
7769
"F/m",
78-
0.0000000013e-12,
70+
1.3e-21,
7971
system="si",
8072
)
8173

@@ -91,20 +83,16 @@ class EMCODATA2018(CODATA2018, EMConstant):
9183
"Ryd", "Rydberg constant", 10973731.568160, "1 / (m)", 0.000021, system="si"
9284
)
9385

94-
a0 = CODATA2018(
95-
"a0", "Bohr radius", 5.29177210903e-11, "m", 0.00000000080e-11, system="si"
96-
)
86+
a0 = CODATA2018("a0", "Bohr radius", 5.29177210903e-11, "m", 8.0e-21, system="si")
9787

98-
muB = CODATA2018(
99-
"muB", "Bohr magneton", 9.2740100783e-24, "J/T", 0.0000000028e-24, system="si"
100-
)
88+
muB = CODATA2018("muB", "Bohr magneton", 9.2740100783e-24, "J/T", 2.8e-33, system="si")
10189

10290
alpha = CODATA2018(
10391
"alpha",
10492
"Fine-structure constant",
10593
7.2973525693e-3,
10694
"",
107-
0.0000000011e-3,
95+
1.1e-12,
10896
system="si",
10997
)
11098

@@ -115,7 +103,7 @@ class EMCODATA2018(CODATA2018, EMConstant):
115103
"Vacuum magnetic permeability",
116104
1.25663706212e-6,
117105
"N/A2",
118-
0.00000000019e-6,
106+
1.9e-16,
119107
system="si",
120108
)
121109

@@ -124,7 +112,7 @@ class EMCODATA2018(CODATA2018, EMConstant):
124112
"Thomson scattering cross-section",
125113
6.6524587321e-29,
126114
"m2",
127-
0.0000000060e-29,
115+
6.0e-38,
128116
system="si",
129117
)
130118

0 commit comments

Comments
 (0)