Merge pull request #3489 from esdc-esac-esa-int/ESA_gaia_GAIAPCR-1368_new_retrieval_type_RESIDUAL_IMAGE

GAIA: new datalink retrieval type RESIDUAL_IMAGE

Author: bsipocz

CHANGES.rst

@@ -30,6 +30,10 @@ heasarc
 - Add support for uploading tables when using TAP directly through ``query_tap``. [#3403]
 - Add automatic guessing for the data host in ``download_data``. [#3403]
 
+gaia
+^^^^
+
+- New datalink DR4 retrieval type RESIDUAL_IMAGE. [#3489]
 
 esa.hubble
 ^^^^^^^^^^

astroquery/gaia/__init__.py

@@ -49,7 +49,8 @@ class Conf(_config.ConfigNamespace):
                                       'EPOCH_FLAGS_NSS',
                                       'EPOCH_PARAMETERS_RVS_SINGLE',
                                       'EPOCH_PARAMETERS_RVS_DOUBLE',
-                                      'EPOCH_FLAGS_VARI']
+                                      'EPOCH_FLAGS_VARI',
+                                      'RESIDUAL_IMAGE']
 
     VALID_LINKING_PARAMETERS = {'SOURCE_ID', 'TRANSIT_ID', 'IMAGE_ID'}
 

astroquery/gaia/core.py

@@ -196,7 +196,9 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
             'EPOCH_ASTROMETRY_BRIGHT', 'MEAN_SPECTRUM_XP_GRAVLENS', 'EPOCH_FLAGS_NSS', 'EPOCH_PARAMETERS_RVS_SINGLE',
             'EPOCH_PARAMETERS_RVS_DOUBLE', 'EPOCH_FLAGS_VARI']. Note that for 'CROWDED_FIELD_IMAGE', only the format
             'fits' can be used, and its image, in the principal header, will not be available in the returned
-            dictionary. Set 'output_file' to retrieve all data: image + tables.
+            dictionary. Set 'output_file' to retrieve all data: image + tables. Note that for 'RESIDUAL_IMAGE',
+            only the format 'fits' can be used. Since the fits files only contain images, the returned table will be
+            empty. Therefore, set 'output_file' to save the files to get access to their content.
         linking_parameter : str, optional, default SOURCE_ID, valid values: SOURCE_ID, TRANSIT_ID, IMAGE_ID
             By default, all the identifiers are considered as source_id
             SOURCE_ID: the identifiers are considered as source_id

astroquery/gaia/tests/test_gaiatap.py

@@ -467,6 +467,10 @@ def cross_match_basic_2_kwargs():
             "table_b_column_dec": "dec"}
 
 
+def test_number_retrieval_types():
+    assert len(conf.VALID_DATALINK_RETRIEVAL_TYPES) == 26
+
+
 def test_show_message():
     print(JOB_DATA_FILE_NAME)
     connHandler = DummyConnHandler()
@@ -1458,7 +1462,7 @@ def update_user_table(self, table_name, list_of_changes, verbose):
     assert job.get_phase() == "EXECUTING" if background else "COMPLETED"
     assert job.failed is False
 
-    radius_quantity = Quantity(value=1.0/3600.0, unit=u.deg)
+    radius_quantity = Quantity(value=1.0 / 3600.0, unit=u.deg)
     job = mock_querier_async.cross_match_basic(table_a_full_qualified_name="user_hola.tableA", table_a_column_ra="ra",
                                                table_a_column_dec="dec", radius=radius_quantity, background=background)
     assert job.async_ is True