Skip to content

Commit 6fa144d

Browse files
bsipoczbsipocz
authored
Merge pull request #3601 from esdc-esac-esa-int/ESAC_Euclid_EUCLIDPCR_2131_refactor_methodg_get_scientific_product_list
Euclid: refactor method get_scientific_product_list so that parameter dsr_part3 accepts the value 'latest'
2 parents 44f3749 + f6a8557 commit 6fa144d

9 files changed

Lines changed: 519 additions & 381 deletions

File tree

‎CHANGES.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ esa.euclid
6060
BASIC_DOWNLOAD_DATA_PRODUCTS. [#3562]
6161
- The method ``get_spectrum`` accepts a single source_id or designation or multiple values separated by commas or a
6262
list. [#3570]
63+
- New method, ``get_valid_le3_configuration_values``, to retrieve the valid values for the category, group, and
64+
product_type parameters dynamically. [#3601]
65+
- In the method, ``get_scientific_product_list``, the ``dsr_part3`` parameter now supports the additional value
66+
``latest``. [#3601]
6367

6468

6569
vizier

‎astroquery/esa/euclid/__init__.py‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -69,70 +69,6 @@ class Conf(_config.ConfigNamespace):
6969

7070
SIR_SCIENCE_FRAME_PRODUCTS = ['dpdSirScienceFrame']
7171

72-
VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS = {
73-
'Clusters of Galaxies': {
74-
'GrpCatalog': ['DpdLE3clAMICOModel', 'DpdLE3clDetMergeParams', 'DpdLE3clDetOnMockParams',
75-
'DpdLE3clDetInputParams', 'DpdLE3clAmicoAux', 'DpdLE3clAssociations', 'DpdLE3clPzwavAux',
76-
'DpdLE3clPZWAVDensity', 'DpdLE3clDetClusters', 'DpdLE3FullDet', 'DpdLE3clCatMergeParams',
77-
'DpdLE3clCATParams', 'DpdLE3clCcpInputParams', 'DpdLE3clRichMembers', 'DpdLE3clZClParams',
78-
'DpdLE3clGlueMatchParams', 'DpdLE3clMockGlueMatchParams'],
79-
'GrpClustering': ['DDpdLE3clPkDOA', 'DpdLE3clCovmatTwoPointCov2', 'DpdLE3clPkYam',
80-
'DpdLE3clTwoPointAutoCorrPol', 'DpolDpdLE3clCovmatPKCov1'],
81-
'GrpCOMB': ['DpdLE3clCombConfigurationSet', 'DpdLE3clCombCovMatDeltaSigmaCosmoDep',
82-
'DpdLE3clCombCovMatReducedShearCosmoDep', 'DpdLE3clCombCovMatReducedShearCosmoIndep',
83-
'DpdLE3clCombRedSheProf', 'DpdLE3clCombStackingCosmoDep', 'DpdLE3clCombStackingCosmoInd',
84-
'DpdLE3clCombUCovRedSheProf', 'DpdLE3clCombWLME'],
85-
'GrpLMF': ['DpdLE3clLMFOutput', 'DpdLE3clLMFParams'],
86-
'GrpSEL': ['DpdLE3clMatchForSelParams', 'DpdLE3clMockClusters', 'DpdLE3clRedshiftDistrib',
87-
'DpdLE3clSelRandom', 'DpdLE3clSelRandomParams', 'DpdLE3clSelSelFunc',
88-
'DpdLE3clSelSelFuncInputParams', 'DpdLE3clSelSinfoniaIniClMockInputParams',
89-
'DpdLE3clSelSinfoniaMockInputParams', 'DpdLE3clSelSubSample', 'DpdLE3clSinfoniaEllipticity'],
90-
'GrpTiling': ['DpdLE3clCLTile', 'DpdLE3clCommon', 'DpdLE3clConfigurationSet']},
91-
'External Data Products': {
92-
'LE3-ED configuration catalog': ['DpdLE3edConfigurationFile'],
93-
'LE3-ED match catalog': ['DpdLE3edMatchedCatalog']},
94-
'Galaxy Clustering Products': {
95-
'2PCF_PK': ['DpdLE3gcPkCross', 'DpdLE3gcPkDOA', 'DpdLE3gcPkYam', 'DpdLE3gcTwoPointAutoCorr',
96-
'DpdLE3gcTwoPointAutoCorrCart', 'DpdLE3gcTwoPointAutoCorrPol', 'DpdLE3gcTwoPointCrossCorr',
97-
'DpdLE3gcTwoPointCrossCorrCart', 'DpdLE3gcTwoPointCrossCorrPol', 'DpdLE3gcTwoPointRecAutoCorr',
98-
'DpdLE3gcTwoPointRecAutoCorrCart', 'DpdLE3gcTwoPointRecAutoCorrPol',
99-
'DpdLE3gcTwoPointRecCrossCorr', 'DpdLE3gcTwoPointRecCrossCorrCart',
100-
'DpdLE3gcTwoPointRecCrossCorrPol'],
101-
'3PCF_BK': ['DpdLE3gcBkMonopole', 'DpdLE3gcBkMultipole', 'DpdLE3gcThreePointAll', 'DpdLE3gcThreePointSin'],
102-
'CM-2PCF': ['DpdLE3gcCovmatTwoPointCov1D', 'DpdLE3gcCovmatTwoPointCov2Dcart',
103-
'DpdLE3gcCovmatTwoPointCov2Dpol', 'DpdLE3gcCovmatTwoPointCovMu',
104-
'DpdLE3gcCovmatTwoPointCovPro'],
105-
'CM-PK': ['DpdLE3gcCovmatPKCov1D', 'DpdLE3gcCovmatPKCov2Dcart', 'DpdLE3gcCovmatPKCov2Dpol']},
106-
'Internal Data Products': {
107-
'SEL Config/Stats': ['DpdLE3IDSELConfigurationSet', 'DpdLE3IDSELIDStatistics'],
108-
'SEL Wide Main': ['DpdLE3IDSELIDCatalog'],
109-
'SEL Wide': ['DpdLE3IDSELIDSubsampledCatalog'],
110-
'VMSP Group': ['DpdLE3IDVMSPConfiguration', 'DpdLE3IDVMSPDetectionModel', 'DpdLE3IDVMSPDistModel',
111-
'DpdLE3IDVMSPRandomCatalog']},
112-
'Weak Lensing Products': {
113-
'2D-MASS': ['DpdTwoDMassConvergenceClusters', 'DpdTwoDMassConvergencePatch',
114-
'DpdTwoDMassConvergencePatchesToSphere', 'DpdTwoDMassConvergenceSphere',
115-
'DpdTwoDMassParamsConvergenceClusters', 'DpdTwoDMassParamsConvergencePatch',
116-
'DpdTwoDMassParamsConvergencePatchesToSphere', 'DpdTwoDMassParamsConvergenceSphere',
117-
'DpdTwoDMassParamsPeakCatalogConvergence', 'DpdTwoDMassParamsPeakCatalogMassAperture',
118-
'DpdTwoDMassPeakCatalog'],
119-
'2PCF': ['DpdTwoPCFWLCOSEBIFilter', 'DpdTwoPCFWLParamsCOSEBIShearShear2D', 'DpdTwoPCFWLParamsClPosPos2D',
120-
'DpdTwoPCFWLParamsPEBPosShear2D', 'DpdTwoPCFWLParamsPEBShearShear2D', 'DpdTwoPCFWLParamsPosPos2D',
121-
'DpdTwoPCFWLParamsPosShear2D', 'DpdTwoPCFWLParamsShearShear2D', 'DpdTwoPCFWLCOSEBIShearShear2D',
122-
'DpdTwoPCFWLClPosPos2D', 'DpdTwoPCFWLPEBPosShear2D', 'DpdTwoPCFWLPEBShearShear2D',
123-
'DpdTwoPCFWLPosPos2D', 'DpdTwoPCFWLPosShear2D', 'DpdTwoPCFWLShearShear2D',
124-
'DpdCovarTwoPCFWLParams', 'DpdCovarTwoPCFWLClPosPos2D', 'DpdCovarTwoPCFWLCOSEBIShearShear2D',
125-
'DpdCovarTwoPCFWLPEBPosShear2D', 'DpdCovarTwoPCFWLPEBShearShear2D',
126-
'DpdCovarTwoPCFWLPosPos2D', 'DpdCovarTwoPCFWLPosShear2D', 'DpdCovarTwoPCFWLShearShear2D',
127-
'DpdCovarTwoPCFWLResampleCOSEBIShearShear2D', 'DpdCovarTwoPCFWLResampleClPosPos2D',
128-
'DpdCovarTwoPCFWLResamplePEBPosShear2D', 'DpdCovarTwoPCFWLResamplePEBShearShear2D',
129-
'DpdCovarTwoPCFWLResamplePosPos2D', 'DpdCovarTwoPCFWLResamplePosShear2D',
130-
'DpdCovarTwoPCFWLResampleShearShear2D'],
131-
'PK': ['DpdPKWLAlms', 'DpdPKWLCovMatrix2D', 'DpdPKWLEstimate2D', 'DpdPKWLMaps', 'DpdPKWLMixingMatrix2D']},
132-
'PHZ': {
133-
'PHZ': ['DpdBinMeanRedshift', 'DpdReferenceSample', 'DpdTomographicBins']}
134-
}
135-
13672
PRODUCT_TYPES = ['observation', 'mosaic']
13773

13874
SCHEMAS = ['sedm']

0 commit comments

Comments
 (0)