Skip to content

Commit ebcbe4c

Browse files
bsipoczbsipocz
authored
Merge pull request #3274 from snbianco/ASB-30082-docs-example
DOC: mast Documentation Updates
2 parents 4edd9ee + fe46b3c commit ebcbe4c

File tree

2 files changed

+40
-28
lines changed

2 files changed

+40
-28
lines changed

‎docs/mast/mast_cut.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -312,18 +312,18 @@ If a given coordinate appears in more than one Zcut survey, a cutout will be pro
312312
Downloading URL https://mast.stsci.edu/zcut/api/v0.1/astrocut?ra=189.49206&dec=62.20615&y=200&x=300&units=px&format=jpg to ./zcut_20201202132453.zip ... [Done]
313313
...
314314
>>> print(manifest)
315-
Local Path
316-
-----------------------------------------------------------------------------------------------------
317-
./hlsp_3dhst_spitzer_irac_goods-n_irac1_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
318-
./hlsp_3dhst_spitzer_irac_goods-n-s2_irac3_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
319-
./hlsp_3dhst_spitzer_irac_goods-n-s1_irac4_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
320-
./hlsp_3dhst_spitzer_irac_goods-n_irac2_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
321-
./hlsp_3dhst_mayall_mosaic_goods-n_u_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
322-
./hlsp_3dhst_subaru_suprimecam_goods-n_rc_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
323-
./hlsp_3dhst_subaru_suprimecam_goods-n_v_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
324-
./hlsp_3dhst_subaru_suprimecam_goods-n_ic_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
325-
./hlsp_3dhst_subaru_suprimecam_goods-n_zp_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
326-
./hlsp_3dhst_subaru_suprimecam_goods-n_b_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut.jpg
315+
Local Path
316+
-------------------------------------------------------------------------------------------------------
317+
./hlsp_3dhst_spitzer_irac_goods-n_irac1_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
318+
./hlsp_3dhst_spitzer_irac_goods-n-s2_irac3_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
319+
./hlsp_3dhst_spitzer_irac_goods-n-s1_irac4_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
320+
./hlsp_3dhst_spitzer_irac_goods-n_irac2_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
321+
./hlsp_3dhst_mayall_mosaic_goods-n_u_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
322+
./hlsp_3dhst_subaru_suprimecam_goods-n_rc_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
323+
./hlsp_3dhst_subaru_suprimecam_goods-n_v_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
324+
./hlsp_3dhst_subaru_suprimecam_goods-n_ic_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
325+
./hlsp_3dhst_subaru_suprimecam_goods-n_zp_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
326+
./hlsp_3dhst_subaru_suprimecam_goods-n_b_v4.0_sc_189.492060_62.206150_10.0pix-x-5.0pix_astrocut_0.jpg
327327

328328

329329
Survey information

‎docs/mast/mast_obsquery.rst

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,33 +82,45 @@ However, only one wildcarded value can be processed per criterion.
8282

8383
RA and Dec must be given in decimal degrees, and datetimes in MJD.
8484

85+
`~astroquery.mast.ObservationsClass.query_criteria` can be used to perform non-positional criteria queries.
86+
8587
.. doctest-remote-data::
8688

8789
>>> from astroquery.mast import Observations
8890
...
89-
>>> obs_table = Observations.query_criteria(dataproduct_type=["image"],
90-
... proposal_pi="Osten*",
91-
... s_dec=[43.5,45.5])
92-
>>> print(obs_table) # doctest: +IGNORE_OUTPUT
93-
dataproduct_type calib_level obs_collection ... intentType obsid objID
94-
---------------- ----------- -------------- ... ---------- ---------- ----------
95-
image 1 HST ... science 2003520267 2023816094
96-
image 1 HST ... science 2003520266 2023816134
97-
image 1 HST ... science 2003520268 2025756935
98-
...
99-
>>> obs_table = Observations.query_criteria(filters=["*UV","Kepler"],
100-
... objectname="M10",
91+
>>> obs_table = Observations.query_criteria(dataproduct_type="image",
92+
... proposal_pi="Osten*")
93+
>>> print(obs_table[:5]) # doctest: +IGNORE_OUTPUT
94+
intentType obs_collection provenance_name ... srcDen obsid objID
95+
---------- -------------- --------------- ... ------ -------- ---------
96+
science HST CALCOS ... nan 24139596 144540274
97+
science HST CALCOS ... nan 24139591 144540276
98+
science HST CALCOS ... nan 24139580 144540277
99+
science HST CALCOS ... nan 24139597 144540280
100+
science HST CALCOS ... nan 24139575 144540281
101+
...
102+
103+
You can also perform positional queries with additional criteria by passing in ``objectname``, ``coordinates``,
104+
and/or ``radius`` as keyword arguments.
105+
106+
.. doctest-remote-data::
107+
108+
>>> from astroquery.mast import Observations
109+
...
110+
>>> obs_table = Observations.query_criteria(objectname="M10",
111+
... radius="0.1 deg",
112+
... filters=["*UV","Kepler"],
101113
... obs_collection="GALEX")
102114
>>> print(obs_table) # doctest: +IGNORE_OUTPUT
103115
intentType obs_collection provenance_name ... objID objID1 distance
104116
---------- -------------- --------------- ... ----- ------ --------
117+
science GALEX AIS ... 61675 61675 0.0
105118
science GALEX GII ... 7022 7022 0.0
106-
science GALEX GII ... 7023 7023 0.0
119+
science GALEX GII ... 78941 78941 0.0
107120
science GALEX AIS ... 61673 61673 0.0
108-
science GALEX AIS ... 61674 61674 0.0
109-
science GALEX AIS ... 61675 61675 0.0
121+
science GALEX GII ... 7023 7023 0.0
110122
science GALEX AIS ... 61676 61676 0.0
111-
science GALEX GII ... 78941 78941 0.0
123+
science GALEX AIS ... 61674 61674 0.0
112124

113125
We encourage the use of wildcards particularly when querying for JWST instruments
114126
with the instrument_name criteria. This is because of the varying instrument names

0 commit comments

Comments
 (0)