Skip to content

Commit 4d23117

Browse files
authored
Merge pull request #2955 from mimurrayy/main
NIST: Fetch statistical weight (g) from NIST ASD
2 parents 1c6b7bf + 05192b1 commit 4d23117

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed

CHANGES.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ nist
269269
- Vectorized ``linename`` option to query multiple spectral lines with one call
270270
of ``Nist.query``. [#2678]
271271
- Fix wavelength keywords, which were changed upstream [#2918]
272-
272+
- Fetch statistical weight (g) from the database [#2955]
273+
273274
oac
274275
^^^
275276

astroquery/nist/core.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ def _args_to_payload(self, *args, **kwargs):
120120
request_payload["term_out"] = "on"
121121
request_payload["enrg_out"] = "on"
122122
request_payload["J_out"] = "on"
123+
request_payload["g_out"] = "on"
123124
request_payload["page_size"] = 15
124125
request_payload["remove_js"] = "on"
125126
request_payload["show_wn"] = 1

docs/nist/nist.rst

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -75,30 +75,30 @@ or 'vac+air'. Here is an example with all these parameters.
7575
... energy_level_unit='eV', output_order='wavelength',
7676
... wavelength_type='vacuum')
7777
>>> print(table)
78-
Observed Ritz Transition Rel. ... Upper level Type TP Line
79-
-------- ----------- ----------- ----- ... ------------------- ---- ----- -----
80-
-- 4020.871 2487.024 (200) ... 14 | | -- T8637 --
81-
-- 4052.18664 2467.803411 -- ... 5d | 2D | 3/2 -- T7771 --
82-
-- 4052.19376 2467.79907 -- ... 5p | 2P* | 3/2 -- T7771 --
83-
-- 4052.22121 2467.78236 -- ... 5s | 2S | 1/2 -- T7771 --
84-
-- 4052.23222 2467.77565 -- ... 5p | 2P* | 1/2 -- T7771 --
85-
-- 4052.248747 2467.765585 -- ... 5f | 2F* | 5/2 -- T7771 --
86-
-- 4052.24892 2467.765479 -- ... 5d | 2D | 5/2 -- T7771 --
87-
-- 4052.26147 2467.75784 -- ... 5p | 2P* | 3/2 -- T7771 --
88-
-- 4052.26174 2467.757676 -- ... 5d | 2D | 3/2 -- T7771 --
89-
-- 4052.26738 2467.75424 -- ... 5g | 2G | 7/2 -- T7771 --
90-
... ... ... ... ... ... ... ... ...
91-
5128.65 5128.662 1949.83 (450) ... 10 | | -- T8637 L7452
92-
-- 5169.282 1934.5047 -- ... 19 | | -- T8637 --
93-
-- 5263.685 1899.8096 -- ... 18 | | -- T8637 --
94-
-- 5379.776 1858.8134 -- ... 17 | | -- T8637 --
95-
-- 5525.19 1809.8925 (150) ... 16 | | -- T8637 --
96-
-- 5711.464 1750.8646 (180) ... 15 | | -- T8637 --
97-
-- 5908.22 1692.5572 (540) ... 9 | | -- T8637 --
98-
-- 5956.845 1678.7409 (210) ... 14 | | -- T8637 --
99-
-- 6291.918 1589.3405 (250) ... 13 | | -- T8637 --
100-
-- 6771.993 1476.6701 (300) ... 12 | | -- T8637 --
101-
-- 6946.756 1439.5208 -- ... 20 | | -- T8637 --
78+
Observed Ritz Transition Rel. Aki ... gi gk Type TP Line
79+
-------- ----------- ----------- ----- --------- ... --------- ---- ----- -----
80+
-- 4020.871 2487.024 (200) 5526.5 ... 72 - 392 -- T8637 --
81+
-- 4052.18664 2467.803411 -- 1238100.0 ... 2 - 4 -- T7771 --
82+
-- 4052.19376 2467.79907 -- 737160.0 ... 2 - 4 -- T7771 --
83+
-- 4052.22121 2467.78236 -- 215030.0 ... 2 - 2 -- T7771 --
84+
-- 4052.23222 2467.77565 -- 737210.0 ... 2 - 2 -- T7771 --
85+
-- 4052.248747 2467.765585 -- 2412100.0 ... 4 - 6 -- T7771 --
86+
-- 4052.24892 2467.765479 -- 1485800.0 ... 4 - 6 -- T7771 --
87+
-- 4052.26147 2467.75784 -- 18846.0 ... 4 - 4 -- T7771 --
88+
-- 4052.26174 2467.757676 -- 247630.0 ... 4 - 4 -- T7771 --
89+
-- 4052.26738 2467.75424 -- 4102300.0 ... 6 - 8 -- T7771 --
90+
... ... ... ... ... ... ... ... ... ...
91+
5128.65 5128.662 1949.83 (450) 36881.0 ... 72 - 200 -- T8637 L7452
92+
-- 5169.282 1934.5047 -- 984.98 ... 98 - 722 -- T8637 --
93+
-- 5263.685 1899.8096 -- 1312.1 ... 98 - 648 -- T8637 --
94+
-- 5379.776 1858.8134 -- 1781.2 ... 98 - 578 -- T8637 --
95+
-- 5525.19 1809.8925 (150) 2470.9 ... 98 - 512 -- T8637 --
96+
-- 5711.464 1750.8646 (180) 3515.8 ... 98 - 450 -- T8637 --
97+
-- 5908.22 1692.5572 (540) 70652.0 ... 72 - 162 -- T8637 --
98+
-- 5956.845 1678.7409 (210) 5156.2 ... 98 - 392 -- T8637 --
99+
-- 6291.918 1589.3405 (250) 7845.7 ... 98 - 338 -- T8637 --
100+
-- 6771.993 1476.6701 (300) 12503.0 ... 98 - 288 -- T8637 --
101+
-- 6946.756 1439.5208 -- 688.58 ... 128 - 800 -- T8637 --
102102
Length = 37 rows
103103

104104

0 commit comments

Comments
 (0)