Skip to content

Commit

Permalink
Merge pull request #2983 from esdc-esac-esa-int/ESA_gaia_tap_9_8_0_up…
Browse files Browse the repository at this point in the history
…date_retrieved_files

GAIA: Due to the new tap 9.8.0, functions return uncompressed FITS/ECSV files
  • Loading branch information
bsipocz committed Apr 30, 2024
2 parents 4813aa6 + 6599113 commit 0c824a8
Show file tree
Hide file tree
Showing 5 changed files with 1,098 additions and 20 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ gaia
- Include table size in the class TapTableMeta returned by the functions load_tables and load_table, in the class Tap.
[#2970]

- For the functions that return files in FITS/ECSV format, the files are now provided as uncompressed files.
[#2983]


jplhorizons
^^^^^^^^^^^
Expand Down
13 changes: 6 additions & 7 deletions astroquery/gaia/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ def logout(self, *, verbose=False):

def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retrieval_type="ALL",
linking_parameter='SOURCE_ID', valid_data=False, band=None, avoid_datatype_check=False,
format="votable_gzip",
output_file=None, overwrite_output_file=False, verbose=False):
format="votable", output_file=None, overwrite_output_file=False, verbose=False):
"""Loads the specified table
TAP+ only
Expand Down Expand Up @@ -215,8 +214,8 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
avoid_datatype_check: boolean, optional, default False.
By default, this value will be set to False. If it is set to 'true'
the Datalink items tags will not be checked.
format : str, optional, default 'votable_gzip'
loading format. Other available formats are 'votable', 'csv', 'ecsv','votable_plain' and 'fits'
format : str, optional, default 'votable'
loading format. Other available formats are 'csv', 'ecsv','votable_plain' and 'fits'
output_file : string or pathlib.PosixPath, optional, default None
file where the results are saved.
If it is not provided, the http response contents are returned.
Expand All @@ -227,7 +226,7 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
Returns
-------
A table object
A dictionary where the keys are the file names and its value is a list of astropy.table.table.Table objects
"""
now = datetime.now(timezone.utc)
now_formatted = now.strftime("%Y%m%d_%H%M%S")
Expand Down Expand Up @@ -975,7 +974,7 @@ def launch_job(self, query, *, name=None, output_file=None,
dump_to_file=dump_to_file,
upload_resource=upload_resource,
upload_table_name=upload_table_name,
format_with_results_compressed=('votable_gzip', 'fits', 'ecsv'))
format_with_results_compressed=('votable_gzip',))

def launch_job_async(self, query, *, name=None, output_file=None,
output_format="votable_gzip", verbose=False,
Expand Down Expand Up @@ -1028,7 +1027,7 @@ def launch_job_async(self, query, *, name=None, output_file=None,
upload_resource=upload_resource,
upload_table_name=upload_table_name,
autorun=autorun,
format_with_results_compressed=('votable_gzip', 'fits', 'ecsv'))
format_with_results_compressed=('votable_gzip',))

def get_status_messages(self):
"""Retrieve the messages to inform users about
Expand Down

0 comments on commit 0c824a8

Please sign in to comment.