Skip to content

Commit 3908949

Browse files
authored
Merge pull request astropy#3622 from pllim/gaia-dr3
MAST: Add Gaia DR3 and make it default
2 parents 5910511 + a0d50cd commit 3908949

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

CHANGES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ mast
8181
- The ``objectname`` keyword is deprecated in ``MastMissions`` in favor of ``object_names``. [#3540]
8282
- The ``objectname`` parameter in ``Catalogs``, ``Observations``, ``Tesscut``, and ``utils`` is deprecated
8383
in favor of ``object_name``. [#3567]
84+
- Gaia cone search now defaults to DR3. Previously, DR3 was not supported and the default was DR2. [#3622]
8485

8586
vo_conesearch
8687
^^^^^^^^^^^^^

astroquery/mast/collections.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,12 @@ def query_region_async(self, coordinates, *, radius=0.2*u.deg, catalog="Hsc",
264264
elif catalog.lower() == "gaia":
265265
if version == 1:
266266
service = "Mast.Catalogs.GaiaDR1.Cone"
267-
else:
268-
if version not in (None, 2):
269-
warnings.warn("Invalid Gaia version number, defaulting to DR2.", InputWarning)
267+
elif version == 2:
270268
service = "Mast.Catalogs.GaiaDR2.Cone"
269+
else:
270+
if version not in (None, 3):
271+
warnings.warn("Invalid Gaia version number, defaulting to DR3.", InputWarning)
272+
service = "Mast.Catalogs.GaiaDR3.Cone"
271273

272274
elif catalog.lower() == 'plato':
273275
if version in (None, 1):

astroquery/mast/tests/test_mast.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
'Mast.Hsc.Db.v3': 'hsc.json',
5050
'Mast.Hsc.Db.v2': 'hsc.json',
5151
'Mast.Galex.Catalog': 'hsc.json',
52+
'Mast.Catalogs.GaiaDR3.Cone': 'hsc.json',
5253
'Mast.Catalogs.GaiaDR2.Cone': 'hsc.json',
5354
'Mast.Catalogs.GaiaDR1.Cone': 'hsc.json',
5455
'Mast.Catalogs.Sample.Cone': 'hsc.json',

0 commit comments

Comments
 (0)