Merge pull request #3110 from esdc-esac-esa-int/ESA_gaia_GAIAMNGT-176…

…0_Include-new-datalink-retrieve-types-in-the-method-load_data GAIA: include new datalink retrieve types in the method load data
astropy · Sep 30, 2024 · 696882f · 696882f
2 parents 58171a4 + 6959406
commit 696882f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -179,6 +179,8 @@ gaia
 
 - Fix method search_async_jobs in the class TapPlus. [#2967]
 
+- New retrieval types for datalink (Gaia DR4 release). [#3110]
+
 jplhorizons
 ^^^^^^^^^^^
 

diff --git a/astroquery/gaia/__init__.py b/astroquery/gaia/__init__.py
@@ -35,15 +35,21 @@ class Conf(_config.ConfigNamespace):
                                       'RV_EPOCH_SINGLE',
                                       'RV_EPOCH_DOUBLE',
                                       'RVS_EPOCH',
-                                      'RVS_TRANSIT']
+                                      'RVS_TRANSIT',
+                                      'EPOCH_ASTROMETRY_CROWDED_FIELD',
+                                      'EPOCH_IMAGE',
+                                      'EPOCH_PHOTOMETRY_CCD',
+                                      'XP_EPOCH_SPECTRUM_SSO',
+                                      'XP_EPOCH_CROWDING',
+                                      'XP_MEAN_SPECTRUM',
+                                      'XP_EPOCH_SPECTRUM',
+                                      'CROWDED_FIELD_IMAGE']
 
     VALID_LINKING_PARAMETERS = {'SOURCE_ID', 'TRANSIT_ID', 'IMAGE_ID'}
 
 
 conf = Conf()
 
-
 from .core import Gaia, GaiaClass
 
-
 __all__ = ['Gaia', 'GaiaClass', 'Conf', 'conf']
diff --git a/astroquery/gaia/core.py b/astroquery/gaia/core.py
@@ -194,7 +194,11 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
             'MCMC_GSPPHOT' or 'MCMC_MSC']
             For GAIA DR4, possible values will be ['EPOCH_PHOTOMETRY', 'RVS', 'XP_CONTINUOUS', 'XP_SAMPLED',
             'MCMC_GSPPHOT', 'MCMC_MSC', 'EPOCH_ASTROMETRY', 'RV_EPOCH_SINGLE', 'RV_EPOCH_DOUBLE', 'RVS_EPOCH' or
-            'RVS_TRANSIT']
+            'RVS_TRANSIT', 'EPOCH_ASTROMETRY_CROWDED_FIELD', 'EPOCH_IMAGE', 'EPOCH_PHOTOMETRY_CCD',
+            'XP_EPOCH_SPECTRUM_SSO', 'XP_EPOCH_CROWDING', 'XP_MEAN_SPECTRUM', 'XP_EPOCH_SPECTRUM',
+            'CROWDED_FIELD_IMAGE']. Note that for 'CROWDED_FIELD_IMAGE' only the format 'fits' can be used,
+            and that its image, in the principal header, will not be available in the returned dictionary. Set
+            'output_file' to retrieve all data: image + tables.
         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