Skip to content

Commit 503fe7b

Browse files
snbiancosnbianco
committed
changelog, update docs output
1 parent fdc4ddf commit 503fe7b

File tree

2 files changed

+26
-65
lines changed

2 files changed

+26
-65
lines changed

‎CHANGES.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ mast
6767
- Added ``resolve_all`` parameter to ``MastClass.resolve_object`` to resolve object names and return
6868
coordinates for all available resolvers. [#3292]
6969

70+
- Fix bug in ``utils.remove_duplicate_products`` that does not retain the order of the products in an input table. [#3314]
71+
72+
- Added ``return_uri_map`` parameter to ``Observations.get_cloud_uris`` to return a mapping of the input data product URIs
73+
to the returned cloud URIs. [#3314]
74+
7075

7176
Infrastructure, Utility and Other Changes and Additions
7277
-------------------------------------------------------

‎docs/mast/mast_obsquery.rst

Lines changed: 21 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -223,64 +223,20 @@ The product fields are documented `here <https://mast.stsci.edu/api/v0/_products
223223

224224
>>> from astroquery.mast import Observations
225225
...
226-
>>> obs_table = Observations.query_object("M8",radius=".02 deg")
226+
>>> obs_table = Observations.query_criteria(objectname="M8", obs_collection=["K2", "IUE"])
227227
>>> data_products_by_obs = Observations.get_product_list(obs_table[0:2])
228228
>>> print(data_products_by_obs) # doctest: +IGNORE_OUTPUT
229-
obsID obs_collection dataproduct_type ... size parent_obsid
230-
----------- -------------- ---------------- ... ------- ------------
231-
19000016510 SPITZER_SHA image ... 316800 19000016510
232-
19000016510 SPITZER_SHA image ... 316800 19000016510
233-
19000016510 SPITZER_SHA image ... 316800 19000016510
234-
19000016510 SPITZER_SHA image ... 316800 19000016510
235-
19000016510 SPITZER_SHA image ... 316800 19000016510
236-
19000016510 SPITZER_SHA image ... 316800 19000016510
237-
19000016510 SPITZER_SHA image ... 316800 19000016510
238-
19000016510 SPITZER_SHA image ... 316800 19000016510
239-
19000016510 SPITZER_SHA image ... 316800 19000016510
240-
19000016510 SPITZER_SHA image ... 316800 19000016510
241-
... ... ... ... ... ...
242-
19000016510 SPITZER_SHA image ... 57600 19000016510
243-
19000016510 SPITZER_SHA image ... 57600 19000016510
244-
19000016510 SPITZER_SHA image ... 57600 19000016510
245-
19000016510 SPITZER_SHA image ... 57600 19000016510
246-
19000016510 SPITZER_SHA image ... 57600 19000016510
247-
19000016510 SPITZER_SHA image ... 57600 19000016510
248-
19000016510 SPITZER_SHA image ... 57600 19000016510
249-
19000016510 SPITZER_SHA image ... 57600 19000016510
250-
19000016510 SPITZER_SHA image ... 57600 19000016510
251-
19000016510 SPITZER_SHA image ... 57600 19000016510
252-
19000016510 SPITZER_SHA image ... 8648640 19000016510
253-
Length = 1153 rows
254-
...
229+
obsID obs_collection dataproduct_type ... dataRights calib_level filters
230+
------ -------------- ---------------- ... ---------- ----------- -------
231+
664784 K2 timeseries ... PUBLIC 2 KEPLER
232+
664785 K2 timeseries ... PUBLIC 2 KEPLER
255233
>>> obsids = obs_table[0:2]['obsid']
256234
>>> data_products_by_id = Observations.get_product_list(obsids)
257235
>>> print(data_products_by_id) # doctest: +IGNORE_OUTPUT
258-
obsID obs_collection dataproduct_type ... size parent_obsid
259-
----------- -------------- ---------------- ... ------- ------------
260-
19000016510 SPITZER_SHA image ... 316800 19000016510
261-
19000016510 SPITZER_SHA image ... 316800 19000016510
262-
19000016510 SPITZER_SHA image ... 316800 19000016510
263-
19000016510 SPITZER_SHA image ... 316800 19000016510
264-
19000016510 SPITZER_SHA image ... 316800 19000016510
265-
19000016510 SPITZER_SHA image ... 316800 19000016510
266-
19000016510 SPITZER_SHA image ... 316800 19000016510
267-
19000016510 SPITZER_SHA image ... 316800 19000016510
268-
19000016510 SPITZER_SHA image ... 316800 19000016510
269-
19000016510 SPITZER_SHA image ... 316800 19000016510
270-
... ... ... ... ... ...
271-
19000016510 SPITZER_SHA image ... 57600 19000016510
272-
19000016510 SPITZER_SHA image ... 57600 19000016510
273-
19000016510 SPITZER_SHA image ... 57600 19000016510
274-
19000016510 SPITZER_SHA image ... 57600 19000016510
275-
19000016510 SPITZER_SHA image ... 57600 19000016510
276-
19000016510 SPITZER_SHA image ... 57600 19000016510
277-
19000016510 SPITZER_SHA image ... 57600 19000016510
278-
19000016510 SPITZER_SHA image ... 57600 19000016510
279-
19000016510 SPITZER_SHA image ... 57600 19000016510
280-
19000016510 SPITZER_SHA image ... 57600 19000016510
281-
19000016510 SPITZER_SHA image ... 8648640 19000016510
282-
Length = 1153 rows
283-
...
236+
obsID obs_collection dataproduct_type ... dataRights calib_level filters
237+
------ -------------- ---------------- ... ---------- ----------- -------
238+
664784 K2 timeseries ... PUBLIC 2 KEPLER
239+
664785 K2 timeseries ... PUBLIC 2 KEPLER
284240
>>> print((data_products_by_obs == data_products_by_id).all())
285241
True
286242

@@ -309,18 +265,18 @@ To return only unique data products for an observation, use `~astroquery.mast.Ob
309265
INFO: 180 of 370 products were duplicates. Only returning 190 unique product(s). [astroquery.mast.utils]
310266
INFO: To return all products, use `Observations.get_product_list` [astroquery.mast.observations]
311267
>>> print(unique_products[:10]['dataURI'])
312-
dataURI
313-
-------------------------------------------------------------------
314-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveo_drc.fits
315-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveo_drc.jpg
316-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveo_point-cat.ecsv
317-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveo_segment-cat.ecsv
318-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveo_trl.txt
319-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveoes_drc.fits
320-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveoes_drc.jpg
321-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveoes_flc.fits
322-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveoes_hlet.fits
323-
mast:HST/product/hst_12062_eo_acs_wfc_f606w_jbeveoes_trl.txt
268+
dataURI
269+
----------------------------------------
270+
mast:HST/product/jbeveoesq_flt_hlet.fits
271+
mast:HST/product/jbeveoesq_spt.fits
272+
mast:HST/product/jbeveoesq_trl.fits
273+
mast:HST/product/jbeveoesq_log.txt
274+
mast:HST/product/jbeveoesq_raw.jpg
275+
mast:HST/product/jbeveoesq_flc.jpg
276+
mast:HST/product/jbeveoesq_flt.jpg
277+
mast:HST/product/jbeveoesq_flc.fits
278+
mast:HST/product/jbeveoesq_flt.fits
279+
mast:HST/product/jbeveoesq_raw.fits
324280

325281
Filtering
326282
---------

0 commit comments

Comments
 (0)