Skip to content

Commit 6400d6c

Browse files
authored
Merge pull request #2279 from jaymedina/add-plato
Add PLATO to Catalogs
2 parents 5740dc7 + 03eca88 commit 6400d6c

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

CHANGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ mast
3131

3232
- GALEX data is now available to download anonymously from the public STScI S3 buckets. [#2261]
3333

34+
- Adding the All-Sky PLATO Input Catalog ('plato') as a catalog option for methods of ``astroquery.mast.Catalogs``. [#2279]
35+
3436
Infrastructure, Utility and Other Changes and Additions
3537
-------------------------------------------------------
3638

astroquery/mast/collections.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def __init__(self):
4242

4343
services = {"panstarrs": {"path": "panstarrs/{data_release}/{table}.json",
4444
"args": {"data_release": "dr2", "table": "mean"}}}
45+
4546
self._service_api_connection.set_service_params(services, "catalogs", True)
4647

4748
self.catalog_limit = None
@@ -141,10 +142,17 @@ def query_region_async(self, coordinates, radius=0.2*u.deg, catalog="Hsc",
141142
if version == 1:
142143
service = "Mast.Catalogs.GaiaDR1.Cone"
143144
else:
144-
if version not in (2, None):
145+
if version not in (None, 2):
145146
warnings.warn("Invalid Gaia version number, defaulting to DR2.", InputWarning)
146147
service = "Mast.Catalogs.GaiaDR2.Cone"
147148

149+
elif catalog.lower() == 'plato':
150+
if version in (None, 1):
151+
service = "Mast.Catalogs.Plato.Cone"
152+
else:
153+
warnings.warn("Invalid PLATO catalog version number, defaulting to DR1.", InputWarning)
154+
service = "Mast.Catalogs.Plato.Cone"
155+
148156
else:
149157
service = "Mast.Catalogs." + catalog + ".Cone"
150158
self.catalog_limit = None

astroquery/mast/tests/test_mast_remote.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,11 @@ def test_catalogs_query_object(self):
515515
assert isinstance(result, Table)
516516
assert '441662144' in result['ID']
517517

518+
result = mast.Catalogs.query_object('M1',
519+
radius=0.001,
520+
catalog='plato')
521+
assert 'PICidDR1' in result.colnames
522+
518523
def test_catalogs_query_criteria_async(self):
519524
# without position
520525
responses = mast.Catalogs.query_criteria_async(catalog="Tic",

docs/mast/mast.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,8 @@ The Catalogs class provides access to a subset of the astronomical catalogs stor
458458
- The TESS Input Catalog (TIC)
459459
- The TESS Candidate Target List (CTL)
460460
- The Disk Detective Catalog
461-
- PanSTARRS (DR1, DR2)
461+
- The PanSTARRS Catalog (DR1 and DR2)
462+
- The All-Sky PLATO Input Catalog (DR1)
462463

463464
Positional Queries
464465
------------------

0 commit comments

Comments
 (0)