Skip to content

Updated gaia default table to gaiadr2.gaia_source #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Updated gaia default table to gaiadr2.gaia_source #1113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 50 additions & 34 deletions astroquery/gaia/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

__all__ = ['Gaia', 'GaiaClass']

MAIN_GAIA_TABLE = "gaiadr1.gaia_source"
MAIN_GAIA_TABLE = "gaiadr2.gaia_source"
MAIN_GAIA_TABLE_RA = "ra"
MAIN_GAIA_TABLE_DEC = "dec"

Expand All @@ -38,6 +38,22 @@ def __init__(self, tap_plus_handler=None):
self.__gaiatap = TapPlus(url="http://gea.esac.esa.int/tap-server/tap")
else:
self.__gaiatap = tap_plus_handler
self.__maintable = MAIN_GAIA_TABLE

def set_main_table(self, table_name=MAIN_GAIA_TABLE):
"""Set main table
TAP & TAP+

Parameters
----------
table_name : str, optional, default 'gaiadr2.gaia_source'
A full qualified table name (i.e schema name plus table name)

Returns
-------
None
"""
self.__maintable = table_name

def load_tables(self, only_names=False, include_shared_tables=False,
verbose=False):
Expand Down Expand Up @@ -79,9 +95,9 @@ def load_table(self, table, verbose=False):
return self.__gaiatap.load_table(table, verbose)

def launch_job(self, query, name=None, output_file=None,
output_format="votable", verbose=False,
dump_to_file=False, upload_resource=None,
upload_table_name=None):
output_format="votable", verbose=False,
dump_to_file=False, upload_resource=None,
upload_table_name=None):
"""Launches a synchronous job
TAP & TAP+

Expand All @@ -108,13 +124,13 @@ def launch_job(self, query, name=None, output_file=None,
A Job object
"""
return self.__gaiatap.launch_job(query,
name=name,
output_file=output_file,
output_format=output_format,
verbose=verbose,
dump_to_file=dump_to_file,
upload_resource=upload_resource,
upload_table_name=upload_table_name)
name=name,
output_file=output_file,
output_format=output_format,
verbose=verbose,
dump_to_file=dump_to_file,
upload_resource=upload_resource,
upload_table_name=upload_table_name)

def launch_job_async(self, query, name=None, output_file=None,
output_format="votable", verbose=False,
Expand Down Expand Up @@ -249,7 +265,7 @@ def __query_object(self, coordinate, radius=None, width=None, height=None,
query = "SELECT DISTANCE(POINT('ICRS',"+str(MAIN_GAIA_TABLE_RA)+","\
+ str(MAIN_GAIA_TABLE_DEC)+"), \
POINT('ICRS',"+str(ra)+","+str(dec)+")) AS dist, * \
FROM "+str(MAIN_GAIA_TABLE)+" WHERE CONTAINS(\
FROM "+str(self.__maintable)+" WHERE CONTAINS(\
POINT('ICRS',"+str(MAIN_GAIA_TABLE_RA)+","\
+ str(MAIN_GAIA_TABLE_DEC)+"),\
BOX('ICRS',"+str(ra)+","+str(dec)+", "+str(widthDeg.value)+", "\
Expand Down Expand Up @@ -284,11 +300,11 @@ def query_object(self, coordinate, radius=None, width=None, height=None,
The job results (astropy.table).
"""
return self.__query_object(coordinate,
radius,
width,
height,
async_job=False,
verbose=verbose)
radius,
width,
height,
async_job=False,
verbose=verbose)

def query_object_async(self, coordinate, radius=None, width=None,
height=None, verbose=False):
Expand All @@ -315,11 +331,11 @@ def query_object_async(self, coordinate, radius=None, width=None,
The job results (astropy.table).
"""
return self.__query_object(coordinate,
radius,
width,
height,
async_job=True,
verbose=verbose)
radius,
width,
height,
async_job=True,
verbose=verbose)

def __cone_search(self, coordinate, radius, async_job=False,
background=False,
Expand Down Expand Up @@ -363,23 +379,23 @@ def __cone_search(self, coordinate, radius, async_job=False,
query = "SELECT DISTANCE(POINT('ICRS',"+str(MAIN_GAIA_TABLE_RA)+","\
+ str(MAIN_GAIA_TABLE_DEC)+"), \
POINT('ICRS',"+str(ra)+","+str(dec)+")) AS dist, * \
FROM "+str(MAIN_GAIA_TABLE)+" WHERE CONTAINS(\
FROM "+str(self.__maintable)+" WHERE CONTAINS(\
POINT('ICRS',"+str(MAIN_GAIA_TABLE_RA)+","+str(MAIN_GAIA_TABLE_DEC)+"),\
CIRCLE('ICRS',"+str(ra)+","+str(dec)+", "+str(radiusDeg)+"))=1 \
ORDER BY dist ASC"
if async_job:
return self.__gaiatap.launch_job_async(query=query,
output_file=output_file,
output_format=output_format,
verbose=verbose,
dump_to_file=dump_to_file,
background=background)
output_file=output_file,
output_format=output_format,
verbose=verbose,
dump_to_file=dump_to_file,
background=background)
else:
return self.__gaiatap.launch_job(query=query,
output_file=output_file,
output_format=output_format,
verbose=verbose,
dump_to_file=dump_to_file)
output_file=output_file,
output_format=output_format,
verbose=verbose,
dump_to_file=dump_to_file)

def cone_search(self, coordinate, radius=None, output_file=None,
output_format="votable", verbose=False,
Expand Down Expand Up @@ -417,8 +433,8 @@ def cone_search(self, coordinate, radius=None, output_file=None,
dump_to_file=dump_to_file)

def cone_search_async(self, coordinate, radius=None, background=False,
output_file=None, output_format="votable", verbose=False,
dump_to_file=False):
output_file=None, output_format="votable", verbose=False,
dump_to_file=False):
"""Cone search sorted by distance (async)
TAP & TAP+

Expand Down