Skip to content

Commit 9f63fe9

Browse files
committed
Fix esasky docs: rearrange output order
1 parent fa816c7 commit 9f63fe9

File tree

1 file changed

+49
-44
lines changed

1 file changed

+49
-44
lines changed

docs/esasky/esasky.rst

Lines changed: 49 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ If you know the names of all the available catalogs you can use :meth:`~astroque
3232
>>> from astroquery.esasky import ESASky
3333
>>> catalog_list = ESASky.list_catalogs()
3434
>>> print(catalog_list)
35-
['LAMOST_LRS', 'LAMOST_MRS', 'AllWise', 'Spitzer', 'AKARI-IRC-SC', 'TwoMASS', 'INTEGRAL', 'CHANDRA-SC2',
36-
'XMM-EPIC-STACK', 'XMM-EPIC', 'XMM-OM', 'XMM-SLEW', 'Tycho-2', 'Gaia-DR3', 'Hipparcos-2', 'HSC',
37-
'Herschel-HPPSC-070', 'Herschel-HPPSC-100', 'Herschel-HPPSC-160', 'Herschel-SPSC-250', 'Herschel-SPSC-350',
38-
'Herschel-SPSC-500', 'Planck-PGCC', 'Planck-PCCS2E-HFI', 'Planck-PCCS2-HFI', 'Planck-PCCS2-LFI', 'Planck-PSZ2',
39-
'Icecube', 'Fermi_4FGL-DR2', 'Fermi_3FHL', 'Fermi_4LAC-DR2', '2WHSP', '2RXS', 'OU_Blazars',
40-
'eROSITA-eFEDS-hard', 'eROSITA-eFEDS-main', 'eROSITA-etaCha-hard', 'eROSITA-etaCha-main']
35+
['TYCHO-2', '2RXS', 'INTEGRAL', 'GAIA-DR3', 'XMM-EPIC', 'OU_BLAZARS', 'XMM-SLEW', 'HIPPARCOS-2',
36+
'HERSCHEL-SPSC-500', 'AKARI-IRC-SC', 'HERSCHEL-HPPSC-070', 'HERSCHEL-HPPSC-100', 'HERSCHEL-HPPSC-160',
37+
'HERSCHEL-SPSC-250', 'HERSCHEL-SPSC-350', 'PLANCK-PCCS2E-HFI', 'PLANCK-PGCC', 'PLANCK-PCCS2-HFI',
38+
'PLANCK-PCCS2-LFI', 'PLANCK-PSZ2', 'CHANDRA-SC2', 'ALLWISE', 'TWOMASS', 'EROSITA-EFEDS-MAIN',
39+
'EROSITA-EFEDS-HARD', 'XMM-OM', 'XMM-EPIC-STACK', 'FERMI_4FGL-DR2', 'FERMI_3FHL', 'EROSITA-ETACHA-MAIN',
40+
'SWIFT-2SXPS', 'ICECUBE', 'FERMI_4LAC-DR2', 'EROSITA-ETACHA-HARD', 'HSC', 'PLATO ASPIC1.1', '2WHSP',
41+
'GAIA-FPR', 'EROSITA-ERASS-MAIN', 'EROSITA-ERASS-HARD', 'GLADE+', 'LAMOST_MRS', 'LAMOST_LRS']
4142

4243
Get the available maps mission names
4344
------------------------------------
@@ -48,8 +49,8 @@ If you know the names of all the available maps missions you can use :meth:`~ast
4849

4950
>>> maps_list = ESASky.list_maps()
5051
>>> print(maps_list)
51-
['INTEGRAL', 'XMM', 'Chandra', 'SUZAKU', 'XMM-OM-OPTICAL', 'XMM-OM-UV', 'HST-UV', 'HST-OPTICAL', 'HST-IR',
52-
'ISO-IR', 'Herschel', 'AKARI', 'JWST-MID-IR', 'JWST-NEAR-IR', 'Spitzer', 'ALMA', 'eROSITA']
52+
['ALMA', 'ISO-IR', 'SPITZER', 'AKARI', 'HST-IR', 'HST-UV', 'HST-OPTICAL', 'EROSITA', 'INTEGRAL',
53+
'SUZAKU', 'HERSCHEL', 'JWST-MID-IR', 'JWST-NEAR-IR', 'XMM', 'XMM-OM-UV', 'XMM-OM-OPTICAL', 'CHANDRA']
5354

5455
Get the available spectra mission names
5556
---------------------------------------
@@ -60,8 +61,8 @@ If you know the names of all the available spectra you can use :meth:`~astroquer
6061

6162
>>> spectra_list = ESASky.list_spectra()
6263
>>> print(spectra_list)
63-
['XMM-NEWTON', 'Chandra', 'IUE', 'HST-UV', 'HST-OPTICAL', 'JWST-MID-IR', 'JWST-NEAR-IR', 'HST-IR', 'ISO-IR',
64-
'Herschel', 'LAMOST_LRS', 'LAMOST_MRS', 'CHEOPS']
64+
['HERSCHEL', 'CHANDRA', 'IUE', 'ISO-IR', 'CHEOPS', 'XMM-NEWTON', 'JWST-MID-IR', 'JWST-NEAR-IR',
65+
'HST-OPTICAL', 'HST-UV', 'HST-IR', 'LAMOST_MRS', 'LAMOST_LRS']
6566

6667
Get the available SSO mission names
6768
-----------------------------------
@@ -73,7 +74,7 @@ If you know the names of all the available missions with SSO cross match data, y
7374

7475
>>> sso_list = ESASky.list_sso()
7576
>>> print(sso_list)
76-
['Herschel', 'HST', 'XMM', 'XMM-OM']
77+
['XMM-OM', 'HST', 'HERSCHEL', 'XMM']
7778

7879

7980
Query an object
@@ -115,16 +116,18 @@ To see the result:
115116
.. doctest-remote-data::
116117

117118
>>> print(result)
118-
TableList with 9 tables:
119-
'0:ALLWISE' with 25 column(s) and 1 row(s)
120-
'1:TWOMASS' with 14 column(s) and 3 row(s)
121-
'2:CHANDRA-SC2' with 41 column(s) and 9 row(s)
122-
'3:XMM-EPIC-STACK' with 347 column(s) and 1 row(s)
123-
'4:XMM-EPIC' with 223 column(s) and 12 row(s)
124-
'5:XMM-OM' with 122 column(s) and 5 row(s)
125-
'6:HSC' with 27 column(s) and 230 row(s)
126-
'7:HERSCHEL-HPPSC-070' with 21 column(s) and 1 row(s)
127-
'8:HERSCHEL-HPPSC-100' with 21 column(s) and 1 row(s)
119+
TableList with 11 tables:
120+
'0:XMM-EPIC' with 223 column(s) and 15 row(s)
121+
'1:HERSCHEL-HPPSC-070' with 21 column(s) and 1 row(s)
122+
'2:HERSCHEL-HPPSC-100' with 21 column(s) and 1 row(s)
123+
'3:CHANDRA-SC2' with 41 column(s) and 9 row(s)
124+
'4:ALLWISE' with 25 column(s) and 1 row(s)
125+
'5:TWOMASS' with 14 column(s) and 3 row(s)
126+
'6:XMM-OM' with 122 column(s) and 7 row(s)
127+
'7:XMM-EPIC-STACK' with 161 column(s) and 15 row(s)
128+
'8:SWIFT-2SXPS' with 232 column(s) and 1 row(s)
129+
'9:HSC' with 27 column(s) and 230 row(s)
130+
'10:GLADE+' with 40 column(s) and 1 row(s)
128131

129132
All the results are returned as a `~astroquery.utils.TableList` object. This is a container for `~astropy.table.Table`
130133
objects. It is basically an extension to `~collections.OrderedDict` for storing a `~astropy.table.Table` against its
@@ -195,27 +198,29 @@ To see the result:
195198
.. doctest-remote-data::
196199

197200
>>> print(result)
198-
TableList with 20 tables:
199-
'0:LAMOST_LRS' with 43 column(s) and 37 row(s)
200-
'1:ALLWISE' with 25 column(s) and 1762 row(s)
201-
'2:SPITZER' with 146 column(s) and 1082 row(s)
202-
'3:AKARI-IRC-SC' with 29 column(s) and 1 row(s)
203-
'4:TWOMASS' with 14 column(s) and 188 row(s)
204-
'5:CHANDRA-SC2' with 41 column(s) and 430 row(s)
205-
'6:XMM-EPIC-STACK' with 347 column(s) and 225 row(s)
206-
'7:XMM-EPIC' with 223 column(s) and 941 row(s)
207-
'8:XMM-OM' with 122 column(s) and 4849 row(s)
208-
'9:XMM-SLEW' with 106 column(s) and 2 row(s)
209-
'10:GAIA-DR3' with 153 column(s) and 932 row(s)
210-
'11:HSC' with 27 column(s) and 10000 row(s)
211-
'12:HERSCHEL-HPPSC-070' with 21 column(s) and 93 row(s)
212-
'13:HERSCHEL-HPPSC-100' with 21 column(s) and 122 row(s)
213-
'14:HERSCHEL-HPPSC-160' with 21 column(s) and 93 row(s)
214-
'15:HERSCHEL-SPSC-250' with 36 column(s) and 59 row(s)
215-
'16:HERSCHEL-SPSC-350' with 36 column(s) and 24 row(s)
216-
'17:HERSCHEL-SPSC-500' with 36 column(s) and 7 row(s)
217-
'18:PLANCK-PCCS2-HFI' with 9 column(s) and 8 row(s)
218-
'19:2RXS' with 306 column(s) and 2 row(s)
201+
TableList with 22 tables:
202+
'0:2RXS' with 306 column(s) and 2 row(s)
203+
'1:GAIA-DR3' with 153 column(s) and 932 row(s)
204+
'2:XMM-EPIC' with 223 column(s) and 1467 row(s)
205+
'3:XMM-SLEW' with 106 column(s) and 2 row(s)
206+
'4:HERSCHEL-SPSC-500' with 36 column(s) and 7 row(s)
207+
'5:AKARI-IRC-SC' with 29 column(s) and 1 row(s)
208+
'6:HERSCHEL-HPPSC-070' with 21 column(s) and 93 row(s)
209+
'7:HERSCHEL-HPPSC-100' with 21 column(s) and 122 row(s)
210+
'8:HERSCHEL-HPPSC-160' with 21 column(s) and 93 row(s)
211+
'9:HERSCHEL-SPSC-250' with 36 column(s) and 59 row(s)
212+
'10:HERSCHEL-SPSC-350' with 36 column(s) and 24 row(s)
213+
'11:PLANCK-PCCS2-HFI' with 9 column(s) and 8 row(s)
214+
'12:CHANDRA-SC2' with 41 column(s) and 430 row(s)
215+
'13:ALLWISE' with 25 column(s) and 1762 row(s)
216+
'14:TWOMASS' with 14 column(s) and 188 row(s)
217+
'15:XMM-OM' with 122 column(s) and 7026 row(s)
218+
'16:XMM-EPIC-STACK' with 161 column(s) and 4185 row(s)
219+
'17:SWIFT-2SXPS' with 232 column(s) and 120 row(s)
220+
'18:HSC' with 27 column(s) and 10000 row(s)
221+
'19:PLATO ASPIC1.1' with 70 column(s) and 3 row(s)
222+
'20:GLADE+' with 40 column(s) and 51 row(s)
223+
'21:LAMOST_LRS' with 40 column(s) and 47 row(s)
219224

220225
You can use, :meth:`~astroquery.esasky.ESASkyClass.query_region_maps` and
221226
:meth:`~astroquery.esasky.ESASkyClass.query_region_maps` with the same parameters. To execute the same command as above
@@ -427,7 +432,7 @@ You can see the available missions with:
427432

428433
>>> from astroquery.esasky import ESASky
429434
>>> ESASky.list_sso()
430-
['Herschel', 'HST', 'XMM', 'XMM-OM']
435+
['XMM-OM', 'HST', 'HERSCHEL', 'XMM']
431436

432437
Other parameters and the return value are structured in the same manner as the other query methods.
433438

@@ -451,8 +456,8 @@ Or download everything on an SSO by something like this:
451456

452457
>>> from astroquery.esasky import ESASky
453458
>>> images=ESASky.get_images_sso(sso_name="2017 RN65")
454-
INFO: Starting download of HERSCHEL data. (1 files) [astroquery.esasky.core]
455459
INFO: Starting download of HST data. (1 files) [astroquery.esasky.core]
460+
INFO: Starting download of HERSCHEL data. (1 files) [astroquery.esasky.core]
456461
INFO: Starting download of XMM data. (1 files) [astroquery.esasky.core]
457462
...
458463

0 commit comments

Comments
 (0)