Merge pull request #3207 from esdc-esac-esa-int/ESA_gaia_GAIAMNGT-1828_Update_DR4_retrieval_type_names

GAIA: Update DR4 retrieval_type names and include the new one EPOCH_ASTROMETRY_BRIGHT

Author: bsipocz

CHANGES.rst

@@ -16,6 +16,11 @@ simbad
 Service fixes and enhancements
 ------------------------------
 
+gaia
+^^^^
+
+- Update DR4 retrieval_type names and include the new one EPOCH_ASTROMETRY_BRIGHT [#3207]
+
 ipac.nexsci.nasa_exoplanet_archive
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

astroquery/gaia/__init__.py

@@ -28,13 +28,13 @@ class Conf(_config.ConfigNamespace):
     VALID_DATALINK_RETRIEVAL_TYPES = ['EPOCH_PHOTOMETRY',
                                       'XP_CONTINUOUS',
                                       'XP_SAMPLED',
-                                      'RVS',
+                                      'RVS_MEAN_SPECTRUM',
                                       'MCMC_GSPPHOT',
                                       'MCMC_MSC',
                                       'EPOCH_ASTROMETRY',
-                                      'RV_EPOCH_SINGLE',
-                                      'RV_EPOCH_DOUBLE',
-                                      'RVS_EPOCH',
+                                      'RVS_EPOCH_DATA_SINGLE',
+                                      'RVS_EPOCH_DATA_DOUBLE',
+                                      'RVS_EPOCH_SPECTRUM',
                                       'RVS_TRANSIT',
                                       'EPOCH_ASTROMETRY_CROWDED_FIELD',
                                       'EPOCH_IMAGE',
@@ -43,7 +43,8 @@ class Conf(_config.ConfigNamespace):
                                       'XP_EPOCH_CROWDING',
                                       'XP_MEAN_SPECTRUM',
                                       'XP_EPOCH_SPECTRUM',
-                                      'CROWDED_FIELD_IMAGE']
+                                      'CROWDED_FIELD_IMAGE',
+                                      'EPOCH_ASTROMETRY_BRIGHT']
 
     VALID_LINKING_PARAMETERS = {'SOURCE_ID', 'TRANSIT_ID', 'IMAGE_ID'}
 

astroquery/gaia/core.py

@@ -195,12 +195,12 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
             For GAIA DR3, possible values are ['EPOCH_PHOTOMETRY', 'RVS', 'XP_CONTINUOUS', 'XP_SAMPLED',
             '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', '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.
+            'MCMC_GSPPHOT', 'MCMC_MSC', 'EPOCH_ASTROMETRY', 'RVS_EPOCH_DATA_SINGLE',
+            'RVS_EPOCH_DATA_DOUBLE','RVS_EPOCH_SPECTRUM', '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', 'EPOCH_ASTROMETRY_BRIGHT']. 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