Skip to content

Commit 3ba1062

Browse files
bsipoczbsipocz
authored
Merge pull request #2512 from ceb8/esa_docs
DOC: ESA Docs Updates
2 parents c9972e0 + 26b723c commit 3ba1062

File tree

3 files changed

+80
-82
lines changed

3 files changed

+80
-82
lines changed

‎docs/esa/iso/iso.rst

Lines changed: 27 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -149,38 +149,8 @@ we can loop on the observations to download the best products (DEFAULT_DATA_SET)
149149
>>> for observation in table:
150150
... ISO.download_data(str(observation['tdt']), retrieval_type="OBSERVATION",
151151
... product_level="DEFAULT_DATA_SET", filename=str(observation['tdt']), verbose=True) # doctest: +SKIP
152-
INFO: http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80000104&product_level=DEFAULT_DATA_SET [astroquery.esa.iso.core]
153-
INFO: Copying file to 80000104.tar... [astroquery.esa.iso.core]
154-
INFO: Wrote http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80000104&product_level=DEFAULT_DATA_SET to 80000104.tar [astroquery.esa.iso.core]
155-
'80000104.tar'
156-
INFO: http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002504&product_level=DEFAULT_DATA_SET [astroquery.esa.iso.core]
157-
INFO: Copying file to 80002504.tar... [astroquery.esa.iso.core]
158-
INFO: Wrote http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002504&product_level=DEFAULT_DATA_SET to 80002504.tar [astroquery.esa.iso.core]
159-
'80002504.tar'
160-
INFO: http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80000938&product_level=DEFAULT_DATA_SET [astroquery.esa.iso.core]
161-
INFO: Copying file to 80000938.tar... [astroquery.esa.iso.core]
162-
INFO: Wrote http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80000938&product_level=DEFAULT_DATA_SET to 80000938.tar [astroquery.esa.iso.core]
163-
'80000938.tar'
164-
INFO: http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80000828&product_level=DEFAULT_DATA_SET [astroquery.esa.iso.core]
165-
INFO: Copying file to 80000828.tar... [astroquery.esa.iso.core]
166-
INFO: Wrote http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80000828&product_level=DEFAULT_DATA_SET to 80000828.tar [astroquery.esa.iso.core]
167-
'80000828.tar'
168-
INFO: http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002304&product_level=DEFAULT_DATA_SET [astroquery.esa.iso.core]
169-
INFO: Copying file to 80002304.tar... [astroquery.esa.iso.core]
170-
INFO: Wrote http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002304&product_level=DEFAULT_DATA_SET to 80002304.tar [astroquery.esa.iso.core]
171-
'80002304.tar'
172-
INFO: http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002450&product_level=DEFAULT_DATA_SET [astroquery.esa.iso.core]
173-
INFO: Copying file to 80002450.tar... [astroquery.esa.iso.core]
174-
INFO: Wrote http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002450&product_level=DEFAULT_DATA_SET to 80002450.tar [astroquery.esa.iso.core]
175-
'80002450.tar'
176-
INFO: http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002247&product_level=DEFAULT_DATA_SET [astroquery.esa.iso.core]
177-
INFO: Copying file to 80002247.tar... [astroquery.esa.iso.core]
178-
INFO: Wrote http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002247&product_level=DEFAULT_DATA_SET to 80002247.tar [astroquery.esa.iso.core]
179-
'80002247.tar'
180-
INFO: http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002014&product_level=DEFAULT_DATA_SET [astroquery.esa.iso.core]
181-
INFO: Copying file to 80002014.tar... [astroquery.esa.iso.core]
182-
INFO: Wrote http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=OBSERVATION&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80002014&product_level=DEFAULT_DATA_SET to 80002014.tar [astroquery.esa.iso.core]
183-
'80002014.tar'
152+
INFO: http://nida.esac.esa.int/...
153+
184154

185155
-------------------------------
186156
2. Getting ISO postcards
@@ -193,6 +163,7 @@ we can loop on the observations to download the best products (DEFAULT_DATA_SET)
193163
>>> from IPython.core.display import HTML
194164
>>>
195165
>>> ISO.get_postcard('80001538', filename="postcard") # doctest: +IGNORE_OUTPUT
166+
Downloading URL http://nida.esac.esa.int/nida-sl-tap/data?retrieval_type=POSTCARD&DATA_RETRIEVAL_ORIGIN=astroquery&tdt=80001538 to /Users...
196167
>>> Image(filename = "postcard.png", width=400, height=100)
197168
<IPython.core.display.Image object>
198169

@@ -213,21 +184,24 @@ This will download the ISO postcard for the observation '80001538' and it will s
213184
.. doctest-remote-data::
214185

215186
>>> from astroquery.esa.iso import ISO
216-
>>> ISO.get_tables() # doctest: +IGNORE_OUTPUT
187+
>>> ISO.get_tables()
217188
INFO: Retrieving tables... [astroquery.utils.tap.core]
218189
INFO: Parsing tables... [astroquery.utils.tap.core]
219190
INFO: Done. [astroquery.utils.tap.core]
220-
['hpdp.cam_sato', 'hpdp.cambendo', 'hpdp.chopc2i', 'hpdp.chopc2ii', 'hpdp.compkon',
221-
'hpdp.evolkon','hpdp.extrakon', 'hpdp.kon3p6i', 'hpdp.kon3p6ii', 'hpdp.konkoly',
222-
'hpdp.lwsasti', 'hpdp.lwsastii', 'hpdp.misckon', 'hpdp.p32_c200', 'hpdp.p32virgo',
223-
'hpdp.scanskon', 'hpdp.sloansws', 'hpdp.solarkon','hpdp.sws01hrd', 'hpdp.ysokon',
224-
'tap_config.coord_sys', 'tap_schema.columns', 'tap_schema.key_columns','tap_schema.keys',
225-
'tap_schema.schemas', 'tap_schema.tables', 'ida.aph', 'ida.cam_expert', 'ida.cam_measurement',
226-
'ida.dqr', 'ida.dqrflags', 'ida.iasd_line', 'ida.lws_expert', 'ida.lws_extras', 'ida.lws_lsan',
227-
'ida.lws_measurement','ida.obs_pointing', 'ida.observers', 'ida.pht_expert', 'ida.postcards',
228-
'ida.proposals', 'ida.publication_authors', 'ida.sws_common', 'ida.sws_expert', 'ida.usredata',
229-
'ida.usredata_files', 'ida.object_type', 'ida.observations', 'ida.publications', 'ida.publications_observations',
230-
'ivoa.obscore', 'ivoa.siap', 'ivoa.ssap']
191+
['hpdp.cam_sato', 'hpdp.cambendo', 'hpdp.chopc2i', 'hpdp.chopc2ii',
192+
'hpdp.compkon', 'hpdp.evolkon', 'hpdp.extrakon', 'hpdp.kon3p6i',
193+
'hpdp.kon3p6ii', 'hpdp.konkoly', 'hpdp.lwsasti', 'hpdp.lwsastii',
194+
'hpdp.misckon', 'hpdp.p32_c200', 'hpdp.p32virgo', 'hpdp.scanskon',
195+
'hpdp.sloansws', 'hpdp.solarkon', 'hpdp.sws01hrd', 'hpdp.ysokon',
196+
'tap_config.coord_sys', 'tap_schema.columns', 'tap_schema.key_columns',
197+
'tap_schema.keys', 'tap_schema.schemas', 'tap_schema.tables', 'ida.aph',
198+
'ida.cam_expert', 'ida.cam_measurement', 'ida.dqr', 'ida.dqrflags',
199+
'ida.iasd_line', 'ida.lws_expert', 'ida.lws_extras', 'ida.lws_lsan',
200+
'ida.lws_measurement', 'ida.obs_pointing', 'ida.observers',
201+
'ida.pht_expert', 'ida.postcards', 'ida.proposals', 'ida.publication_authors',
202+
'ida.sws_common', 'ida.sws_expert', 'ida.usredata', 'ida.usredata_files',
203+
'ida.object_type', 'ida.observations', 'ida.publications',
204+
'ida.publications_observations', 'ivoa.obscore', 'ivoa.siap', 'ivoa.ssap']
231205

232206
This will show the available tables in ISO TAP service in the ISO Data Archive.
233207

@@ -238,15 +212,18 @@ This will show the available tables in ISO TAP service in the ISO Data Archive.
238212
.. doctest-remote-data::
239213

240214
>>> from astroquery.esa.iso import ISO
241-
>>> ISO.get_columns('ida.observations') # doctest: +IGNORE_OUTPUT
215+
>>> ISO.get_columns('ida.observations')
242216
INFO: Retrieving tables... [astroquery.utils.tap.core]
243217
INFO: Parsing tables... [astroquery.utils.tap.core]
244218
INFO: Done. [astroquery.utils.tap.core]
245-
['aotname', 'bp_valid', 'cal_flag', 'cam_par_flag', 'caveat', 'cdec', 'comment', 'cra', 'croll',
246-
'dec', 'default_vo_product', 'display', 'dist_status', 'ehalind', 'end_time', 'fov', 'hpdp_available',
247-
'instid', 'instrument_mode', 'num_publications', 'object_type', 'obsid', 'obsno', 'obsno_char', 'osn',
248-
'ott', 'prodqlty', 'propid', 'qltyver', 'ra', 'ra_deg', 'revno', 's_region', 's_region_fov', 'speed',
249-
'start_time', 'target', 'targetno', 'tdt', 'tdt_char', 'type', 'usredata_available', 'utc_end', 'utc_start', 'wavelengths']
219+
['aotname', 'bp_valid', 'cal_flag', 'cam_par_flag', 'caveat', 'cdec',
220+
'comment', 'cra', 'croll', 'dec', 'default_vo_product', 'display',
221+
'dist_status', 'ehalind', 'end_time', 'fov', 'hpdp_available',
222+
'instid', 'instrument_mode', 'num_publications', 'object_type', 'obsid',
223+
'obsno', 'obsno_char', 'osn', 'ott', 'prodqlty', 'propid', 'qltyver',
224+
'ra', 'ra_deg', 'revno', 's_region', 's_region_fov', 'speed',
225+
'start_time', 'target', 'targetno', 'tdt', 'tdt_char', 'type',
226+
'usredata_available', 'utc_end', 'utc_start', 'wavelengths']
250227

251228

252229
This will show the column details of the table 'ida.observations' in ISO TAP service

‎docs/esa/jwst/jwst.rst

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -417,29 +417,46 @@ Query without saving results in a file:
417417
... "FROM jwst.main ORDER BY instrument_name, observationuri")
418418
>>>
419419
>>> print(job) # doctest: +IGNORE_OUTPUT
420-
<Table length=100>
421-
name dtype
422-
---------------- ------
423-
instrument_name object
424-
proposal_id object
425-
calibrationlevel int32
426-
dataproducttype object
427-
Jobid: None
428-
Phase: COMPLETED
429-
Owner: None
430-
Output file: 1655977738493O-result.vot.gz
431-
Results: None
420+
<Table length=100>
421+
name dtype
422+
---------------- ------
423+
instrument_name object
424+
proposal_id object
425+
calibrationlevel int32
426+
dataproducttype object
427+
Jobid: None
428+
Phase: COMPLETED
429+
Owner: None
430+
Output file: 1661441953031O-result.vot.gz
431+
Results: None
432432
>>> result = job.get_results()
433433
>>> result # doctest: +IGNORE_OUTPUT
434-
<Table length=100>
435-
instrument_name proposal_id calibrationlevel dataproducttype
436-
object object int32 object
437-
--------------- ----------- ---------------- ---------------
438-
FGS 01014 3 image
439-
FGS 01014 3 image
440-
FGS 01014 3 image
441-
FGS 01014 3 image
442-
... ... ... ...
434+
<Table length=100>
435+
instrument_name proposal_id calibrationlevel dataproducttype
436+
object object int32 object
437+
--------------- ----------- ---------------- ---------------
438+
FGS 1014 3 image
439+
FGS 1014 3 image
440+
FGS 1014 3 image
441+
FGS 1014 3 image
442+
FGS 1014 3 image
443+
FGS 1014 2 image
444+
FGS 1014 1 image
445+
FGS 1014 1 image
446+
FGS 1014 2 image
447+
FGS 1014 2 image
448+
... ... ... ...
449+
FGS 1017 2 image
450+
FGS 1017 1 image
451+
FGS 1017 2 image
452+
FGS 1017 1 image
453+
FGS 1017 2 image
454+
FGS 1017 1 image
455+
FGS 1017 2 image
456+
FGS 1017 1 image
457+
FGS 1017 2 image
458+
FGS 1017 1 image
459+
FGS 1017 2 image
443460

444461

445462
Query saving results in a file:

‎docs/esa/xmm_newton/xmm_newton.rst

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,23 @@ stored in the file 'results10.csv'. The result of this query can be printed by d
117117

118118
.. doctest-remote-data::
119119

120-
>>> from astroquery.esa.xmm_newton import XMMNewton # doctest: +IGNORE_OUTPUT
121-
>>> XMMNewton.get_tables() # doctest: +IGNORE_OUTPUT
120+
>>> from astroquery.esa.xmm_newton import XMMNewton
121+
>>> XMMNewton.get_tables()
122122
INFO: Retrieving tables... [astroquery.utils.tap.core]
123123
INFO: Parsing tables... [astroquery.utils.tap.core]
124124
INFO: Done. [astroquery.utils.tap.core]
125-
['tap_schema.columns', 'tap_schema.key_columns', 'tap_schema.keys', 'tap_schema.schemas',
126-
'tap_schema.tables', 'xsa.dual', 'xsa.v_all_observations', 'xsa.v_epic_source',
127-
'xsa.v_epic_source_cat', 'xsa.v_epic_xmm_stack_cat', 'xsa.v_exposure', 'xsa.v_instrument_mode',
128-
'xsa.v_om_source', 'xsa.v_om_source_cat', 'xsa.v_proposal', 'xsa.v_proposal_observation_info',
129-
'xsa.v_publication', 'xsa.v_publication_observation', 'xsa.v_publication_slew_observation',
130-
'xsa.v_public_observations', 'xsa.v_rgs_source', 'xsa.v_slew_exposure', 'xsa.v_slew_observation',
131-
'xsa.v_slew_source', 'xsa.v_slew_source_cat', 'xsa.v_target_type', 'xsa.v_uls_exposure_image',
132-
'xsa.v_uls_slew_exposure_image']
125+
['tap_config.coord_sys', 'tap_config.properties', 'tap_schema.columns',
126+
'tap_schema.key_columns', 'tap_schema.keys', 'tap_schema.schemas',
127+
'tap_schema.tables', 'xsa.dual', 'xsa.v_all_observations', 'xsa.v_epic_source',
128+
'xsa.v_epic_source_cat', 'xsa.v_epic_xmm_stack_cat', 'xsa.v_exposure',
129+
'xsa.v_instrument_mode', 'xsa.v_om_source', 'xsa.v_om_source_cat',
130+
'xsa.v_proposal', 'xsa.v_proposal_observation_info', 'xsa.v_publication',
131+
'xsa.v_publication_observation', 'xsa.v_publication_slew_observation',
132+
'xsa.v_public_observations', 'xsa.v_public_observations_new_odf_ingestion',
133+
'xsa.v_public_observations_new_pps_ingestion', 'xsa.v_rgs_source',
134+
'xsa.v_slew_exposure', 'xsa.v_slew_observation', 'xsa.v_slew_source',
135+
'xsa.v_slew_source_cat', 'xsa.v_target_type', 'xsa.v_uls_exposure_image',
136+
'xsa.v_uls_slew_exposure_image']
133137

134138
This will show the available tables in XSA TAP service in the XMM-Newton Science Archive.
135139

@@ -140,7 +144,7 @@ This will show the available tables in XSA TAP service in the XMM-Newton Science
140144
.. doctest-remote-data::
141145

142146
>>> from astroquery.esa.xmm_newton import XMMNewton
143-
>>> XMMNewton.get_columns('xsa.v_all_observations') # doctest: +IGNORE_OUTPUT
147+
>>> XMMNewton.get_columns('xsa.v_all_observations')
144148
INFO: Retrieving tables... [astroquery.utils.tap.core]
145149
INFO: Parsing tables... [astroquery.utils.tap.core]
146150
INFO: Done. [astroquery.utils.tap.core]

0 commit comments

Comments
 (0)