Merge pull request #3382 from esdc-esac-esa-int/ESA_gaia_GAIASWRQ-42_refactor_retrieveTypes

GAIA: rename DR4 datalink retrieve types

Author: bsipocz

CHANGES.rst

@@ -16,6 +16,8 @@ gaia
   response any more. [#3278]
 - New datalink retrieve types EPOCH_PHOTOMETRY_CROWDED_FIELD, EPOCH_ASTROMETRY_BRIGHT, XP_MEAN_SPECTRUM_GRAVLENS,
   EPOCH_FLAGS_NSS, EPOCH_PARAMETERS_RVS_SINGLE, EPOCH_PARAMETERS_RVS_DOUBLE, EPOCH_FLAGS_VARI. [#3371, #3372]
+- Rename datalink retrieval types EPOCH_SPECTRUM_RVS, EPOCH_SPECTRUM_XP_SSO, EPOCH_SPECTRUM_XP_CROWDING, MEAN_SPECTRUM_XP,
+  EPOCH_SPECTRUM_XP and MEAN_SPECTRUM_XP_GRAVLENS. [#3382]
 
 Service fixes and enhancements
 ------------------------------

astroquery/gaia/__init__.py

@@ -35,19 +35,18 @@ class Conf(_config.ConfigNamespace):
                                       'EPOCH_ASTROMETRY',
                                       'RVS_EPOCH_DATA_SINGLE',
                                       'RVS_EPOCH_DATA_DOUBLE',
-                                      'RVS_EPOCH_SPECTRUM',
-                                      'RVS_TRANSIT',
+                                      'EPOCH_SPECTRUM_RVS',
                                       'EPOCH_ASTROMETRY_CROWDED_FIELD',
                                       'EPOCH_PHOTOMETRY_CROWDED_FIELD',
                                       'EPOCH_IMAGE',
                                       'EPOCH_PHOTOMETRY_CCD',
-                                      'XP_EPOCH_SPECTRUM_SSO',
-                                      'XP_EPOCH_CROWDING',
-                                      'XP_MEAN_SPECTRUM',
-                                      'XP_EPOCH_SPECTRUM',
+                                      'EPOCH_SPECTRUM_XP_SSO',
+                                      'EPOCH_SPECTRUM_XP_CROWDING',
+                                      'MEAN_SPECTRUM_XP',
+                                      'EPOCH_SPECTRUM_XP',
                                       'CROWDED_FIELD_IMAGE',
                                       'EPOCH_ASTROMETRY_BRIGHT',
-                                      'XP_MEAN_SPECTRUM_GRAVLENS',
+                                      'MEAN_SPECTRUM_XP_GRAVLENS',
                                       'EPOCH_FLAGS_NSS',
                                       'EPOCH_PARAMETERS_RVS_SINGLE',
                                       'EPOCH_PARAMETERS_RVS_DOUBLE',

astroquery/gaia/core.py

@@ -191,11 +191,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', 'MEAN_SPECTRUM_RVS', 'XP_CONTINUOUS',
             'XP_SAMPLED', 'MCMC_GSPPHOT', 'MCMC_MSC', 'EPOCH_ASTROMETRY', 'RVS_EPOCH_DATA_SINGLE',
-            'RVS_EPOCH_DATA_DOUBLE','RVS_EPOCH_SPECTRUM', 'RVS_TRANSIT', 'EPOCH_ASTROMETRY_CROWDED_FIELD',
-            'EPOCH_PHOTOMETRY_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', 'XP_MEAN_SPECTRUM_GRAVLENS', 'EPOCH_FLAGS_NSS', 'EPOCH_PARAMETERS_RVS_SINGLE',
-            EPOCH_PARAMETERS_RVS_DOUBLE', 'EPOCH_FLAGS_VARI']. Note that for 'CROWDED_FIELD_IMAGE' only the format
+            'RVS_EPOCH_DATA_DOUBLE','EPOCH_SPECTRUM_RVS', 'EPOCH_ASTROMETRY_CROWDED_FIELD',
+            'EPOCH_PHOTOMETRY_CROWDED_FIELD', 'EPOCH_IMAGE', 'EPOCH_PHOTOMETRY_CCD', 'EPOCH_SPECTRUM_XP_SSO',
+            'EPOCH_SPECTRUM_XP_CROWDING', 'MEAN_SPECTRUM_XP', 'EPOCH_SPECTRUM_XP', 'CROWDED_FIELD_IMAGE',
+            '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 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