Skip to content

Commit 9a7fd43

Browse files
authored
Merge pull request #3372 from esdc-esac-esa-int/gaia_GAIASWRQ-39_new_DL_DR4_retrieve_types
GAIA: Fix minor issue in PR #3371
2 parents 5d78a4f + 5191205 commit 9a7fd43

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

CHANGES.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ gaia
1515
- Deprecated ``band`` from ``load_data`` as it has no effect on upstream
1616
response any more. [#3278]
1717
- New datalink retrieve types EPOCH_PHOTOMETRY_CROWDED_FIELD, EPOCH_ASTROMETRY_BRIGHT, XP_MEAN_SPECTRUM_GRAVLENS,
18-
EPOCH_FLAGS_NSS, EPOCH_PARAMETERS_RVS_SINGLE, EPOCH_PARAMETERS_RVS_DOUBLE, EPOCH_FLAGS_VARI. [#3371]
18+
EPOCH_FLAGS_NSS, EPOCH_PARAMETERS_RVS_SINGLE, EPOCH_PARAMETERS_RVS_DOUBLE, EPOCH_FLAGS_VARI. [#3371, #3372]
1919

2020
Service fixes and enhancements
2121
------------------------------

astroquery/gaia/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Conf(_config.ConfigNamespace):
3838
'RVS_EPOCH_SPECTRUM',
3939
'RVS_TRANSIT',
4040
'EPOCH_ASTROMETRY_CROWDED_FIELD',
41-
'EPOCH_PHOTOMETRY_CROWDED_FIELD'
41+
'EPOCH_PHOTOMETRY_CROWDED_FIELD',
4242
'EPOCH_IMAGE',
4343
'EPOCH_PHOTOMETRY_CCD',
4444
'XP_EPOCH_SPECTRUM_SSO',

astroquery/gaia/core.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,20 @@ def load_data(self, ids, *, data_release=None, data_structure='INDIVIDUAL', retr
184184
in a single bundle, even if only one source/file is considered
185185
'RAW' means products are provided following a Data Model similar to that used in the MDB, meaning in
186186
particular that parameters stored as arrays will remain as such. A single file is provided for the data of
187-
all sourceIds together, but in this case there will be always be one row per sourceId
187+
all sourceIds together, but in this case there will be always be one row per sourceId.
188188
retrieval_type : str, optional, default 'ALL' to retrieve all data from the list of sources
189189
retrieval type identifier. For GAIA DR2 possible values are ['EPOCH_PHOTOMETRY']
190190
For GAIA DR3, possible values are ['EPOCH_PHOTOMETRY', 'RVS', 'XP_CONTINUOUS', 'XP_SAMPLED',
191191
'MCMC_GSPPHOT' or 'MCMC_MSC']
192192
For GAIA DR4, possible values will be ['EPOCH_PHOTOMETRY', 'MEAN_SPECTRUM_RVS', 'XP_CONTINUOUS',
193193
'XP_SAMPLED', 'MCMC_GSPPHOT', 'MCMC_MSC', 'EPOCH_ASTROMETRY', 'RVS_EPOCH_DATA_SINGLE',
194194
'RVS_EPOCH_DATA_DOUBLE','RVS_EPOCH_SPECTRUM', 'RVS_TRANSIT', 'EPOCH_ASTROMETRY_CROWDED_FIELD',
195-
'EPOCH_IMAGE', 'EPOCH_PHOTOMETRY_CCD', 'XP_EPOCH_SPECTRUM_SSO', 'XP_EPOCH_CROWDING', 'XP_MEAN_SPECTRUM',
196-
'XP_EPOCH_SPECTRUM', 'CROWDED_FIELD_IMAGE', 'EPOCH_ASTROMETRY_BRIGHT']. Note that for
197-
'CROWDED_FIELD_IMAGE' only the format 'fits' can be used, and that its image, in the principal header, will
198-
not be available in the returned dictionary. Set 'output_file' to retrieve all data: image + tables.
195+
'EPOCH_PHOTOMETRY_CROWDED_FIELD', 'EPOCH_IMAGE', 'EPOCH_PHOTOMETRY_CCD', 'XP_EPOCH_SPECTRUM_SSO',
196+
'XP_EPOCH_CROWDING', 'XP_MEAN_SPECTRUM', 'XP_EPOCH_SPECTRUM', 'CROWDED_FIELD_IMAGE',
197+
'EPOCH_ASTROMETRY_BRIGHT', 'XP_MEAN_SPECTRUM_GRAVLENS', 'EPOCH_FLAGS_NSS', 'EPOCH_PARAMETERS_RVS_SINGLE',
198+
EPOCH_PARAMETERS_RVS_DOUBLE', 'EPOCH_FLAGS_VARI']. Note that for 'CROWDED_FIELD_IMAGE' only the format
199+
'fits' can be used, and that its image, in the principal header, will not be available in the returned
200+
dictionary. Set 'output_file' to retrieve all data: image + tables.
199201
linking_parameter : str, optional, default SOURCE_ID, valid values: SOURCE_ID, TRANSIT_ID, IMAGE_ID
200202
By default, all the identifiers are considered as source_id
201203
SOURCE_ID: the identifiers are considered as source_id

0 commit comments

Comments
 (0)