Skip to content

Commit b43c5bb

Browse files
authored
Merge pull request #3364 from snbianco/update-mission-docs
Clarifying documentation for `MastMissions` radius value
2 parents 479d4de + c522e2a commit b43c5bb

File tree

1 file changed

+27
-36
lines changed

1 file changed

+27
-36
lines changed

astroquery/mast/missions.py

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -188,19 +188,16 @@ def query_region_async(self, coordinates, *, radius=3*u.arcmin, limit=5000, offs
188188
coordinates : str or `~astropy.coordinates` object
189189
The target around which to search. It may be specified as a
190190
string or as the appropriate `~astropy.coordinates` object.
191-
radius : str or `~astropy.units.Quantity` object, optional
192-
Default 3 degrees.
191+
radius : str or `~astropy.units.Quantity` object
192+
Default is 3 arcminutes. The radius around the coordinates to search within.
193193
The string must be parsable by `~astropy.coordinates.Angle`. The
194-
appropriate `~astropy.units.Quantity` object from
195-
`~astropy.units` may also be used. Defaults to 3 arcminutes.
194+
appropriate `~astropy.units.Quantity` object from `~astropy.units` may also be used.
196195
limit : int
197-
Optional and default is 5000.
198-
the maximum number of dataset IDs in the results.
196+
Default is 5000. The maximum number of dataset IDs in the results.
199197
offset : int
200-
Optional and default is 0
201-
the number of records you wish to skip before selecting records.
202-
select_cols: list, None
203-
Default None. Names of columns that will be included in the result table.
198+
Default is 0. The number of records you wish to skip before selecting records.
199+
select_cols: list, optional
200+
Default is None. Names of columns that will be included in the result table.
204201
If None, a default set of columns will be returned.
205202
**criteria
206203
Other mission-specific criteria arguments.
@@ -224,7 +221,7 @@ def query_region_async(self, coordinates, *, radius=3*u.arcmin, limit=5000, offs
224221
# Put coordinates and radius into consistent format
225222
coordinates = commons.parse_coordinates(coordinates)
226223

227-
# if radius is just a number we assume degrees
224+
# If radius is just a number, assume arcminutes
228225
radius = coord.Angle(radius, u.arcmin)
229226

230227
# Dataset ID column should always be returned
@@ -233,7 +230,7 @@ def query_region_async(self, coordinates, *, radius=3*u.arcmin, limit=5000, offs
233230
elif self.mission == 'ullyses':
234231
select_cols = self._default_ullyses_cols
235232

236-
# basic params
233+
# Basic params
237234
params = {'target': [f"{coordinates.ra.deg} {coordinates.dec.deg}"],
238235
'radius': radius.arcsec,
239236
'radius_units': 'arcseconds',
@@ -258,23 +255,20 @@ def query_criteria_async(self, *, coordinates=None, objectname=None, radius=3*u.
258255
string or as the appropriate `~astropy.coordinates` object.
259256
objectname : str
260257
The name of the target around which to search.
261-
radius : str or `~astropy.units.Quantity` object, optional
262-
Default 3 degrees.
258+
radius : str or `~astropy.units.Quantity` object
259+
Default is 3 arcminutes. The radius around the coordinates to search within.
263260
The string must be parsable by `~astropy.coordinates.Angle`. The
264-
appropriate `~astropy.units.Quantity` object from
265-
`~astropy.units` may also be used. Defaults to 3 arcminutes.
261+
appropriate `~astropy.units.Quantity` object from `~astropy.units` may also be used.
266262
limit : int
267-
Optional and default is 5000.
268-
the maximum number of dataset IDs in the results.
263+
Default is 5000. The maximum number of dataset IDs in the results.
269264
offset : int
270-
Optional and default is 0.
271-
the number of records you wish to skip before selecting records.
272-
select_cols: list, None
273-
Default None. Names of columns that will be included in the result table.
265+
Default is 0. The number of records you wish to skip before selecting records.
266+
select_cols: list, optional
267+
Default is None. Names of columns that will be included in the result table.
274268
If None, a default set of columns will be returned.
275269
resolver : str, optional
276-
The resolver to use when resolving a named target into coordinates. Valid options are "SIMBAD" and "NED".
277-
If not specified, the default resolver order will be used. Please see the
270+
Default is None. The resolver to use when resolving a named target into coordinates. Valid options are
271+
"SIMBAD" and "NED". If not specified, the default resolver order will be used. Please see the
278272
`STScI Archive Name Translation Application (SANTA) <https://mastresolver.stsci.edu/Santa-war/>`__
279273
for more information. Default is None.
280274
**criteria
@@ -339,22 +333,19 @@ def query_object_async(self, objectname, *, radius=3*u.arcmin, limit=5000, offse
339333
objectname : str
340334
The name of the target around which to search.
341335
radius : str or `~astropy.units.Quantity` object, optional
342-
Default 3 arcmin.
343-
The string must be parsable by `~astropy.coordinates.Angle`.
344-
The appropriate `~astropy.units.Quantity` object from
345-
`~astropy.units` may also be used. Defaults to 3 arcminutes.
336+
Default is 3 arcminutes. The radius around the coordinates to search within.
337+
The string must be parsable by `~astropy.coordinates.Angle`. The
338+
appropriate `~astropy.units.Quantity` object from `~astropy.units` may also be used.
346339
limit : int
347-
Optional and default is 5000.
348-
the maximum number of dataset IDs in the results.
340+
Default is 5000. The maximum number of dataset IDs in the results.
349341
offset : int
350-
Optional and default is 0.
351-
the number of records you wish to skip before selecting records.
352-
select_cols: list, None
353-
Default None. Names of columns that will be included in the result table.
342+
Default is 0. The number of records you wish to skip before selecting records.
343+
select_cols: list, optional
344+
Default is None. Names of columns that will be included in the result table.
354345
If None, a default set of columns will be returned.
355346
resolver : str, optional
356-
The resolver to use when resolving a named target into coordinates. Valid options are "SIMBAD" and "NED".
357-
If not specified, the default resolver order will be used. Please see the
347+
Default is None. The resolver to use when resolving a named target into coordinates. Valid options are
348+
"SIMBAD" and "NED". If not specified, the default resolver order will be used. Please see the
358349
`STScI Archive Name Translation Application (SANTA) <https://mastresolver.stsci.edu/Santa-war/>`__
359350
for more information. Default is None.
360351
**criteria

0 commit comments

Comments
 (0)