Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ nist
- Vectorized ``linename`` option to query multiple spectral lines with one call
of ``Nist.query``. [#2678]
- Fix wavelength keywords, which were changed upstream [#2918]

- Fetch statistical weight (g) from the database [#2955]

oac
^^^

Expand Down
1 change: 1 addition & 0 deletions astroquery/nist/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ def _args_to_payload(self, *args, **kwargs):
request_payload["term_out"] = "on"
request_payload["enrg_out"] = "on"
request_payload["J_out"] = "on"
request_payload["g_out"] = "on"
request_payload["page_size"] = 15
request_payload["remove_js"] = "on"
request_payload["show_wn"] = 1
Expand Down
48 changes: 24 additions & 24 deletions docs/nist/nist.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,30 +75,30 @@ or 'vac+air'. Here is an example with all these parameters.
... energy_level_unit='eV', output_order='wavelength',
... wavelength_type='vacuum')
>>> print(table)
Observed Ritz Transition Rel. ... Upper level Type TP Line
-------- ----------- ----------- ----- ... ------------------- ---- ----- -----
-- 4020.871 2487.024 (200) ... 14 | | -- T8637 --
-- 4052.18664 2467.803411 -- ... 5d | 2D | 3/2 -- T7771 --
-- 4052.19376 2467.79907 -- ... 5p | 2P* | 3/2 -- T7771 --
-- 4052.22121 2467.78236 -- ... 5s | 2S | 1/2 -- T7771 --
-- 4052.23222 2467.77565 -- ... 5p | 2P* | 1/2 -- T7771 --
-- 4052.248747 2467.765585 -- ... 5f | 2F* | 5/2 -- T7771 --
-- 4052.24892 2467.765479 -- ... 5d | 2D | 5/2 -- T7771 --
-- 4052.26147 2467.75784 -- ... 5p | 2P* | 3/2 -- T7771 --
-- 4052.26174 2467.757676 -- ... 5d | 2D | 3/2 -- T7771 --
-- 4052.26738 2467.75424 -- ... 5g | 2G | 7/2 -- T7771 --
... ... ... ... ... ... ... ... ...
5128.65 5128.662 1949.83 (450) ... 10 | | -- T8637 L7452
-- 5169.282 1934.5047 -- ... 19 | | -- T8637 --
-- 5263.685 1899.8096 -- ... 18 | | -- T8637 --
-- 5379.776 1858.8134 -- ... 17 | | -- T8637 --
-- 5525.19 1809.8925 (150) ... 16 | | -- T8637 --
-- 5711.464 1750.8646 (180) ... 15 | | -- T8637 --
-- 5908.22 1692.5572 (540) ... 9 | | -- T8637 --
-- 5956.845 1678.7409 (210) ... 14 | | -- T8637 --
-- 6291.918 1589.3405 (250) ... 13 | | -- T8637 --
-- 6771.993 1476.6701 (300) ... 12 | | -- T8637 --
-- 6946.756 1439.5208 -- ... 20 | | -- T8637 --
Observed Ritz Transition Rel. Aki ... gi gk Type TP Line
-------- ----------- ----------- ----- --------- ... --------- ---- ----- -----
-- 4020.871 2487.024 (200) 5526.5 ... 72 - 392 -- T8637 --
-- 4052.18664 2467.803411 -- 1238100.0 ... 2 - 4 -- T7771 --
-- 4052.19376 2467.79907 -- 737160.0 ... 2 - 4 -- T7771 --
-- 4052.22121 2467.78236 -- 215030.0 ... 2 - 2 -- T7771 --
-- 4052.23222 2467.77565 -- 737210.0 ... 2 - 2 -- T7771 --
-- 4052.248747 2467.765585 -- 2412100.0 ... 4 - 6 -- T7771 --
-- 4052.24892 2467.765479 -- 1485800.0 ... 4 - 6 -- T7771 --
-- 4052.26147 2467.75784 -- 18846.0 ... 4 - 4 -- T7771 --
-- 4052.26174 2467.757676 -- 247630.0 ... 4 - 4 -- T7771 --
-- 4052.26738 2467.75424 -- 4102300.0 ... 6 - 8 -- T7771 --
... ... ... ... ... ... ... ... ... ...
5128.65 5128.662 1949.83 (450) 36881.0 ... 72 - 200 -- T8637 L7452
-- 5169.282 1934.5047 -- 984.98 ... 98 - 722 -- T8637 --
-- 5263.685 1899.8096 -- 1312.1 ... 98 - 648 -- T8637 --
-- 5379.776 1858.8134 -- 1781.2 ... 98 - 578 -- T8637 --
-- 5525.19 1809.8925 (150) 2470.9 ... 98 - 512 -- T8637 --
-- 5711.464 1750.8646 (180) 3515.8 ... 98 - 450 -- T8637 --
-- 5908.22 1692.5572 (540) 70652.0 ... 72 - 162 -- T8637 --
-- 5956.845 1678.7409 (210) 5156.2 ... 98 - 392 -- T8637 --
-- 6291.918 1589.3405 (250) 7845.7 ... 98 - 338 -- T8637 --
-- 6771.993 1476.6701 (300) 12503.0 ... 98 - 288 -- T8637 --
-- 6946.756 1439.5208 -- 688.58 ... 128 - 800 -- T8637 --
Length = 37 rows


Expand Down