From e4065e6f6de7f0211008495e6a6a1cbb2b8ee713 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Sun, 23 Mar 2025 08:41:08 +0100 Subject: [PATCH 01/19] EUCLIDMNGT-1275 New method get_scientific_data_product_list --- astroquery/esa/euclid/__init__.py | 84 +++++ astroquery/esa/euclid/core.py | 307 +++++++++++++++++- astroquery/esa/euclid/tests/test_euclidtap.py | 95 ++++++ docs/esa/euclid/euclid.rst | 25 +- 4 files changed, 509 insertions(+), 2 deletions(-) diff --git a/astroquery/esa/euclid/__init__.py b/astroquery/esa/euclid/__init__.py index f7c870854a..b16dd06407 100644 --- a/astroquery/esa/euclid/__init__.py +++ b/astroquery/esa/euclid/__init__.py @@ -59,6 +59,90 @@ class Conf(_config.ConfigNamespace): SIR_SCIENCE_FRAME_PRODUCTS = ['dpdSirScienceFrame'] + VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS = { + 'Clusters of Galaxies': { + 'GrpCatalog': ['DpdLE3clAmicoAux', 'DpdLE3clAMICOModel', 'DpdLE3clAssociations', 'DpdLE3clCatMergeParams', + 'DpdLE3clCATParams', 'DpdLE3clCcpInputParams', 'DpdLE3clDetClusters', + 'DpdLE3clDetInputParams', 'DpdLE3clDetMergeParams', 'DpdLE3clDetOnMockParams', + 'DpdLE3clGlueMatchParams', 'DpdLE3clMockGlueMatchParams', 'DpdLE3clPzwavAux', + 'DpdLE3clPZWAVDensity', 'DpdLE3clRichMembers', 'DpdLE3clZClParams', 'DpdLE3FullDet'], + 'GrpClustering': ['DDpdLE3clPkDOA', 'DpdLE3clCovmatTwoPointCov2', 'DpdLE3clPkYam', + 'DpdLE3clTwoPointAutoCorrPol', 'DpolDpdLE3clCovmatPKCov1'], + 'GrpCOMB': ['DpdLE3clCombConfigurationSet', 'DpdLE3clCombCovMatDeltaSigmaCosmoDep', + 'DpdLE3clCombCovMatReducedShearCosmoDep', 'DpdLE3clCombCovMatReducedShearCosmoIndep', + 'DpdLE3clCombRedSheProf', 'DpdLE3clCombStackingCosmoDep', 'DpdLE3clCombStackingCosmoInd', + 'DpdLE3clCombUCovRedSheProf', 'DpdLE3clCombWLME'], + 'GrpLMF': ['DpdLE3clLMFOutput', 'DpdLE3clLMFParams'], + 'GrpSEL': ['DpdLE3clMatchForSelParams', 'DpdLE3clMockClusters', 'DpdLE3clRedshiftDistrib', + 'DpdLE3clSelRandom', 'DpdLE3clSelRandomParams', 'DpdLE3clSelSelFunc', + 'DpdLE3clSelSelFuncInputParams', 'DpdLE3clSelSinfoniaIniClMockInputParams', + 'DpdLE3clSelSinfoniaMockInputParams', 'DpdLE3clSelSubSample', 'DpdLE3clSinfoniaEllipticity'], + 'GrpTiling': ['DpdLE3clCLTile', 'DpdLE3clCommon', 'DpdLE3clConfigurationSet']}, + 'External Data Products': { + 'LE3-ED configuration catalog': ['DpdLE3edConfigurationFile'], + 'LE3-ED match catalog': ['DpdLE3edMatchedCatalog']}, + 'Galaxy Clustering Products': { + '2PCF_PK': ['DpdLE3gcPkCross', 'DpdLE3gcPkDOA', 'DpdLE3gcPkYam', 'DpdLE3gcTwoPointAutoCorr', + 'DpdLE3gcTwoPointAutoCorrCart', 'DpdLE3gcTwoPointAutoCorrPol', 'DpdLE3gcTwoPointCrossCorr', + 'DpdLE3gcTwoPointCrossCorrCart', 'DpdLE3gcTwoPointCrossCorrPol', 'DpdLE3gcTwoPointRecAutoCorr', + 'DpdLE3gcTwoPointRecAutoCorrCart', 'DpdLE3gcTwoPointRecAutoCorrPol', + 'DpdLE3gcTwoPointRecCrossCorr', 'DpdLE3gcTwoPointRecCrossCorrCart', + 'DpdLE3gcTwoPointRecCrossCorrPol'], + '3PCF_BK': ['DpdLE3gcBkMonopole', 'DpdLE3gcBkMultipole', 'DpdLE3gcThreePointAll', 'DpdLE3gcThreePointSin'], + 'CM-2PCF': ['DpdLE3gcCovmatTwoPointCov1D', 'DpdLE3gcCovmatTwoPointCov2Dcart', + 'DpdLE3gcCovmatTwoPointCov2Dpol', 'DpdLE3gcCovmatTwoPointCovMu', + 'DpdLE3gcCovmatTwoPointCovPro'], + 'CM-PK': ['DpdLE3gcCovmatPKCov1D', 'DpdLE3gcCovmatPKCov2Dcart', 'DpdLE3gcCovmatPKCov2Dpol']}, + 'Internal Data Products': { + 'SEL Config/Stats': ['DpdLE3IDSELConfigurationSet', 'DpdLE3IDSELIDStatistics'], + 'SEL Wide Main': ['DpdLE3IDSELIDCatalog'], + 'SEL Wide Post-recon': ['DpdLE3IDSELIDSubsampledCatalog'], + 'SEL Wide Pre-recon': [], + 'VMSP Group': ['DpdLE3IDVMSPConfiguration', 'DpdLE3IDVMSPDetectionModel', 'DpdLE3IDVMSPDistModel', + 'DpdLE3IDVMSPRandomCatalog']}, + 'testCategory': { + 'testGroup': ['DpdHealpixBitMaskVMPZ', 'dpdMerFinalCatalog', 'dpdPhzPfOutputCatalog', 'dpdSheLensMcChains', + 'dpdSpePfOutputCatalog'], + 'testGroup2': []}, + 'Weak Lensing Products': { + '2D-MASS': ['DpdTwoDMassConvergenceClusters', 'DpdTwoDMassConvergencePatch', + 'DpdTwoDMassConvergencePatchesToSphere', 'DpdTwoDMassConvergenceSphere', + 'DpdTwoDMassParamsConvergenceClusters', 'DpdTwoDMassParamsConvergencePatch', + 'DpdTwoDMassParamsConvergencePatchesToSphere', 'DpdTwoDMassParamsConvergenceSphere', + 'DpdTwoDMassParamsPeakCatalogConvergence', 'DpdTwoDMassParamsPeakCatalogMassAperture', + 'DpdTwoDMassPeakCatalog'], + '2PCF': ['DpdCovarTwoPCFWLClPosPos2D', + 'DpdCovarTwoPCFWLCOSEBIShearShear2D', + 'DpdCovarTwoPCFWLParams', + 'DpdCovarTwoPCFWLPEBPosShear2D', + 'DpdCovarTwoPCFWLPosPos2D', + 'DpdCovarTwoPCFWLPosShear2D', + 'DpdCovarTwoPCFWLResampleClPosPos2D', + 'DpdCovarTwoPCFWLResampleCOSEBIShearShear2D', + 'DpdCovarTwoPCFWLResamplePEBPosShear2D', + 'DpdCovarTwoPCFWLResamplePEBShearShear2D', + 'DpdCovarTwoPCFWLResamplePosPos2D', + 'DpdCovarTwoPCFWLResamplePosShear2D', + 'DpdCovarTwoPCFWLResampleShearShear2D', + 'DpdCovarTwoPCFWLShearShear2D', + 'DpdTwoPCFWLClPosPos2D', + 'DpdTwoPCFWLCOSEBIFilter', + 'DpdTwoPCFWLCOSEBIShearShear2D', + 'DpdTwoPCFWLParamsClPosPos2D', + 'DpdTwoPCFWLParamsCOSEBIShearShear2D', + 'DpdTwoPCFWLParamsPEBPosShear2D', + 'DpdTwoPCFWLParamsPEBShearShear2D', + 'DpdTwoPCFWLParamsPosPos2D', + 'DpdTwoPCFWLParamsPosShear2D', + 'DpdTwoPCFWLParamsShearShear2D', + 'DpdTwoPCFWLPEBPosShear2D', + 'DpdTwoPCFWLPEBShearShear2D', + 'DpdTwoPCFWLPosPos2D', + 'DpdTwoPCFWLPosShear2D', + 'DpdTwoPCFWLShearShear2D'], + 'PK': ['DpdPKWLAlms', 'DpdPKWLCovMatrix2D', 'DpdPKWLEstimate2D', 'DpdPKWLMaps', 'DpdPKWLMixingMatrix2D']} + } + PRODUCT_TYPES = ['observation', 'mosaic'] SCHEMAS = ['sedm'] diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index f10c607640..4a44f49e04 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -8,6 +8,7 @@ """ import binascii import os +import pprint import tarfile import zipfile from collections.abc import Iterable @@ -884,7 +885,7 @@ def get_product_list(self, *, observation_id=None, tile_index=None, product_type #. NISP DpdNispRawFrame: NISP Raw Frame Product - #. Euclid LE2/LE3 products: + #. Euclid LE2 products: #. VIS DpdVisCalibratedQuadFrame: VIS Calibrated Frame Product @@ -1276,5 +1277,309 @@ def get_datalinks(self, ids, *, linking_parameter='SOURCE_ID', verbose=False): return self.__eucliddata.get_datalinks(ids=ids, linking_parameter=linking_parameter, verbose=verbose) + def get_scientific_data_product_list(self, *, observation_id=None, tile_index=None, category=None, group=None, + product_type=None, + release='LEVEL_3_RELEASE', verbose=False): + """ Gets the LE3 products (the high-level science data products). + + Please note that not all combinations of category, group, and product_type are valid. + + Parameters + ---------- + observation_id: str, optional, default None. + It is not compatible with parameter tile_index. + tile_index: str, optional, default None. + It is not compatible with parameter observation_id. + category : str, optional, default None + Available categories: + + #. 'Clusters of Galaxies' + #. 'External Data Products' + #. 'Galaxy Clustering Products' + #. 'Internal Data Products' + #. 'testCategory' + #. 'Weak Lensing Products' + + group : str, optional, default None + Available groups: + + #. '2D-MASS' + #. '2PCF' + #. '2PCF_PK' + #. '3PCF_BK' + #. 'CM-2PCF' + #. 'CM-PK' + #. 'GrpCatalog' + #. 'GrpClustering' + #. 'GrpCOMB' + #. 'GrpLMF' + #. 'GrpSEL' + #. 'GrpTiling' + #. 'LE3-ED configuration catalog' + #. 'LE3-ED match catalog' + #. 'PK' + #. 'SEL Config/Stats' + #. 'SEL Wide Main' + #. 'SEL Wide Post-recon' + #. 'SEL Wide Pre-recon' + #. 'testGroup' + #. 'testGroup2' + #. 'VMSP Group' + + product_type : str, optional, default None + Available product types: + + #. 'DDpdLE3clPkDOA' + #. 'DpdCovarTwoPCFWLClPosPos2D' + #. 'DpdCovarTwoPCFWLCOSEBIShearShear2D' + #. 'DpdCovarTwoPCFWLParams' + #. 'DpdCovarTwoPCFWLPEBPosShear2D' + #. 'DpdCovarTwoPCFWLPosPos2D' + #. 'DpdCovarTwoPCFWLPosShear2D' + #. 'DpdCovarTwoPCFWLResampleClPosPos2D' + #. 'DpdCovarTwoPCFWLResampleCOSEBIShearShear2D' + #. 'DpdCovarTwoPCFWLResamplePEBPosShear2D' + #. 'DpdCovarTwoPCFWLResamplePEBShearShear2D' + #. 'DpdCovarTwoPCFWLResamplePosPos2D' + #. 'DpdCovarTwoPCFWLResamplePosShear2D' + #. 'DpdCovarTwoPCFWLResampleShearShear2D' + #. 'DpdCovarTwoPCFWLShearShear2D' + #. 'DpdHealpixBitMaskVMPZ' + #. 'DpdLE3clAmicoAux' + #. 'DpdLE3clAMICOModel' + #. 'DpdLE3clAssociations' + #. 'DpdLE3clCatMergeParams' + #. 'DpdLE3clCATParams' + #. 'DpdLE3clCcpInputParams' + #. 'DpdLE3clCLTile' + #. 'DpdLE3clCombConfigurationSet' + #. 'DpdLE3clCombCovMatDeltaSigmaCosmoDep' + #. 'DpdLE3clCombCovMatReducedShearCosmoDep' + #. 'DpdLE3clCombCovMatReducedShearCosmoIndep' + #. 'DpdLE3clCombRedSheProf' + #. 'DpdLE3clCombStackingCosmoDep' + #. 'DpdLE3clCombStackingCosmoInd' + #. 'DpdLE3clCombUCovRedSheProf' + #. 'DpdLE3clCombWLME' + #. 'DpdLE3clCommon' + #. 'DpdLE3clConfigurationSet' + #. 'DpdLE3clCovmatTwoPointCov2' + #. 'DpdLE3clDetClusters' + #. 'DpdLE3clDetInputParams' + #. 'DpdLE3clDetMergeParams' + #. 'DpdLE3clDetOnMockParams' + #. 'DpdLE3clGlueMatchParams' + #. 'DpdLE3clLMFOutput' + #. 'DpdLE3clLMFParams' + #. 'DpdLE3clMatchForSelParams' + #. 'DpdLE3clMockClusters' + #. 'DpdLE3clMockGlueMatchParams' + #. 'DpdLE3clPkYam' + #. 'DpdLE3clPzwavAux' + #. 'DpdLE3clPZWAVDensity' + #. 'DpdLE3clRedshiftDistrib' + #. 'DpdLE3clRichMembers' + #. 'DpdLE3clSelRandom' + #. 'DpdLE3clSelRandomParams' + #. 'DpdLE3clSelSelFunc' + #. 'DpdLE3clSelSelFuncInputParams' + #. 'DpdLE3clSelSinfoniaIniClMockInputParams' + #. 'DpdLE3clSelSinfoniaMockInputParams' + #. 'DpdLE3clSelSubSample' + #. 'DpdLE3clSinfoniaEllipticity' + #. 'DpdLE3clTwoPointAutoCorrPol' + #. 'DpdLE3clZClParams' + #. 'DpdLE3edConfigurationFile' + #. 'DpdLE3edMatchedCatalog' + #. 'DpdLE3FullDet' + #. 'DpdLE3gcBkMonopole' + #. 'DpdLE3gcBkMultipole' + #. 'DpdLE3gcCovmatPKCov1D' + #. 'DpdLE3gcCovmatPKCov2Dcart' + #. 'DpdLE3gcCovmatPKCov2Dpol' + #. 'DpdLE3gcCovmatTwoPointCov1D' + #. 'DpdLE3gcCovmatTwoPointCov2Dcart' + #. 'DpdLE3gcCovmatTwoPointCov2Dpol' + #. 'DpdLE3gcCovmatTwoPointCovMu' + #. 'DpdLE3gcCovmatTwoPointCovPro' + #. 'DpdLE3gcPkCross' + #. 'DpdLE3gcPkDOA' + #. 'DpdLE3gcPkYam' + #. 'DpdLE3gcThreePointAll' + #. 'DpdLE3gcThreePointSin' + #. 'DpdLE3gcTwoPointAutoCorr' + #. 'DpdLE3gcTwoPointAutoCorrCart' + #. 'DpdLE3gcTwoPointAutoCorrPol' + #. 'DpdLE3gcTwoPointCrossCorr' + #. 'DpdLE3gcTwoPointCrossCorrCart' + #. 'DpdLE3gcTwoPointCrossCorrPol' + #. 'DpdLE3gcTwoPointRecAutoCorr' + #. 'DpdLE3gcTwoPointRecAutoCorrCart' + #. 'DpdLE3gcTwoPointRecAutoCorrPol' + #. 'DpdLE3gcTwoPointRecCrossCorr' + #. 'DpdLE3gcTwoPointRecCrossCorrCart' + #. 'DpdLE3gcTwoPointRecCrossCorrPol' + #. 'DpdLE3IDSELConfigurationSet' + #. 'DpdLE3IDSELIDCatalog' + #. 'DpdLE3IDSELIDStatistics' + #. 'DpdLE3IDSELIDSubsampledCatalog' + #. 'DpdLE3IDVMSPConfiguration' + #. 'DpdLE3IDVMSPDetectionModel' + #. 'DpdLE3IDVMSPDistModel' + #. 'DpdLE3IDVMSPRandomCatalog' + #. 'dpdMerFinalCatalog' + #. 'dpdPhzPfOutputCatalog' + #. 'DpdPKWLAlms' + #. 'DpdPKWLCovMatrix2D' + #. 'DpdPKWLEstimate2D' + #. 'DpdPKWLMaps' + #. 'DpdPKWLMixingMatrix2D' + #. 'dpdSheLensMcChains' + #. 'dpdSpePfOutputCatalog' + #. 'DpdTwoDMassConvergenceClusters' + #. 'DpdTwoDMassConvergencePatch' + #. 'DpdTwoDMassConvergencePatchesToSphere' + #. 'DpdTwoDMassConvergenceSphere' + #. 'DpdTwoDMassParamsConvergenceClusters' + #. 'DpdTwoDMassParamsConvergencePatch' + #. 'DpdTwoDMassParamsConvergencePatchesToSphere' + #. 'DpdTwoDMassParamsConvergenceSphere' + #. 'DpdTwoDMassParamsPeakCatalogConvergence' + #. 'DpdTwoDMassParamsPeakCatalogMassAperture' + #. 'DpdTwoDMassPeakCatalog' + #. 'DpdTwoPCFWLClPosPos2D' + #. 'DpdTwoPCFWLCOSEBIFilter' + + release : str, mandatory. + Data release from which data should be taken. + verbose : bool, optional, default 'False' + flag to display information about the process + + Returns + ------- + A table object + + """ + + query_extra_condition = "" + + if (observation_id is None and tile_index is None and category is None and group is None and product_type is + None): + raise ValueError("Include a valid parameter to retrieve a LE3 product.") + + if release is None: + raise ValueError("The release is required.") + + if observation_id is not None and tile_index is not None: + raise ValueError(self.__ERROR_MSG_REQUESTED_OBSERVATION_ID_AND_TILE_ID) + + if tile_index is not None: + query_extra_condition = f" AND '{tile_index}' = ANY(tile_index_list) " + + if observation_id is not None: + query_extra_condition = f" AND '{observation_id}' = ANY(observation_id_list) " + + if category is not None: + + try: + _ = conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category] + except KeyError: + raise ValueError( + f"Invalid combination of parameters: category={category}. Valid values:\n " + f"{pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") + + if group is not None: + + try: + _ = conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category][group] + except KeyError: + raise ValueError( + f"Invalid combination of parameters: category={category}; group={group}. Valid " + f"values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") + + if product_type is not None: + + if product_type not in conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category][group]: + raise ValueError( + f"Invalid combination of parameters: category={category}; group={group}; " + f"product_type={product_type}. Valid values:\n " + f"{pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") + + query_extra_condition = query_extra_condition + (f" AND category={category} AND group={group} AND " + f"product_type={product_type} ") + else: + query_extra_condition = query_extra_condition + f" AND category={category} AND group={group} " + else: + if product_type is not None: + + product_type_list = [item for row in + conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category].values() + for item in row] + + if product_type not in product_type_list: + raise ValueError( + f"Invalid combination of parameters: category={category}; product_type={product_type}." + f" Valid values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") + + query_extra_condition = query_extra_condition + (f" AND category={category} AND product_type=" + f"{product_type} ") + + else: + query_extra_condition = query_extra_condition + f" AND category={category} " + else: + + category_group_dict = {} + for i in conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS.keys(): + category_group_dict.update(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[i]) + + if group is not None: + + try: + _ = category_group_dict[group] + except KeyError: + raise ValueError( + f"Invalid combination of parameters: group={group}. Valid values:\n " + f"{pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") + + if product_type is not None: + + if product_type not in category_group_dict[group]: + raise ValueError( + f"Invalid combination of parameters: group={group}; product_type={product_type}. Valid " + f"values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") + + query_extra_condition = query_extra_condition + (f" AND group={group} AND product_type=" + f"{product_type} ") + else: + query_extra_condition = query_extra_condition + f" AND group={group} " + + else: + + product_type_list = [element for row in category_group_dict.values() for element in row] + + if product_type is not None: + if product_type not in product_type_list: + raise ValueError( + f"Invalid combination of parameters: product_type={product_type}. Valid values:\n " + f"{pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") + + query_extra_condition = query_extra_condition + f" AND product_type={product_type} " + + else: + query_extra_condition = query_extra_condition + "" + + query = ( + f"SELECT basic_download_data.basic_download_data_oid, basic_download_data.product_type, " + f"basic_download_data.product_id, CAST(basic_download_data.observation_id_list as text) AS " + f"observation_id_list, CAST(basic_download_data.tile_index_list as text) AS tile_index_list, " + f"CAST(basic_download_data.patch_id_list as text) AS patch_id_list, " + f"CAST(basic_download_data.filter_name as text) AS filter_name FROM sedm.basic_download_data WHERE " + f"release_name='{release}' {query_extra_condition} ORDER BY observation_id_list ASC") + + job = super().launch_job(query=query, output_format='votable_plain', verbose=verbose, + format_with_results_compressed=('votable_gzip',)) + + return job.get_results() + Euclid = EuclidClass() diff --git a/astroquery/esa/euclid/tests/test_euclidtap.py b/astroquery/esa/euclid/tests/test_euclidtap.py index de83c6af25..7165f6cf80 100644 --- a/astroquery/esa/euclid/tests/test_euclidtap.py +++ b/astroquery/esa/euclid/tests/test_euclidtap.py @@ -1048,6 +1048,101 @@ def test_get_spectrum_exceptions(): tap.get_spectrum(retrieval_type='hola', source_id='2417660845403252054', schema='schema', output_file=None) +def test_get_scientific_data_product_list(): + conn_handler = DummyConnHandler() + tap_plus = TapPlus(url="http://test:1111/tap", data_context='data', client_id='ASTROQUERY', + connhandler=conn_handler) + # Launch response: we use default response because the query contains decimals + responseLaunchJob = DummyResponse(200) + responseLaunchJob.set_data(method='POST', context=None, body=TEST_GET_PRODUCT_LIST, headers=None) + + conn_handler.set_default_response(responseLaunchJob) + + euclid = EuclidClass(tap_plus_conn_handler=conn_handler, datalink_handler=tap_plus, show_server_messages=False) + + results = euclid.get_scientific_data_product_list(observation_id=11111) + + assert results is not None, "Expected a valid table" + + results = euclid.get_scientific_data_product_list(tile_index=11111) + + assert results is not None, "Expected a valid table" + + results = euclid.get_scientific_data_product_list(category='Clusters of Galaxies', group='GrpCatalog', + product_type='DpdLE3clAmicoAux') + + assert results is not None, "Expected a valid table" + + results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF', + product_type='DpdCovarTwoPCFWLClPosPos2D') + + assert results is not None, "Expected a valid table" + + results = euclid.get_scientific_data_product_list(category='Weak Lensing Products') + + assert results is not None, "Expected a valid table" + + results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF') + + assert results is not None, "Expected a valid table" + + results = euclid.get_scientific_data_product_list(group='2PCF', product_type='DpdCovarTwoPCFWLClPosPos2D') + + assert results is not None, "Expected a valid table" + + results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', + product_type='DpdCovarTwoPCFWLClPosPos2D') + + assert results is not None, "Expected a valid table" + + results = euclid.get_scientific_data_product_list(product_type='DpdCovarTwoPCFWLClPosPos2D') + + assert results is not None, "Expected a valid table" + + +def test_get_scientific_data_product_list_exceptions(): + eculid = EuclidClass() + + with pytest.raises(ValueError, match="Include a valid parameter to retrieve a LE3 product."): + eculid.get_scientific_data_product_list(observation_id=None, tile_index=None, category=None, group=None, + product_type=None) + + with pytest.raises(ValueError, match="The release is required."): + eculid.get_scientific_data_product_list(observation_id=11111, release=None) + + with pytest.raises(ValueError, match="Incompatible: 'observation_id' and 'tile_id'. Use only one."): + eculid.get_scientific_data_product_list(observation_id=11111, tile_index=1234567) + + with pytest.raises(ValueError, match=r"Invalid combination of parameters: category=not_valid. *."): + eculid.get_scientific_data_product_list(observation_id=11111, category='not_valid') + + with pytest.raises(ValueError, match=r"Invalid combination of parameters: group=not_valid. *."): + eculid.get_scientific_data_product_list(observation_id=11111, group='not_valid') + + with pytest.raises(ValueError, match=r"Invalid combination of parameters: product_type=not_valid. *."): + eculid.get_scientific_data_product_list(observation_id=11111, product_type='not_valid') + + with pytest.raises(ValueError, match=r"Invalid combination of parameters: category=Clusters of Galaxies. *."): + eculid.get_scientific_data_product_list(observation_id=11111, category='Clusters of Galaxies', + group='not_valid') + + with pytest.raises(ValueError, match=r"Invalid combination of parameters: category=Clusters of Galaxies; " + r"group=GrpCatalog; product_type=not_valid. *."): + eculid.get_scientific_data_product_list(observation_id=11111, category='Clusters of Galaxies', + group='GrpCatalog', + product_type='not_valid') + + with pytest.raises(ValueError, + match=r"Invalid combination of parameters: category=Clusters of Galaxies; " + r"product_type=not_valid. *."): + eculid.get_scientific_data_product_list(observation_id=11111, category='Clusters of Galaxies', + product_type='not_valid') + + with pytest.raises(ValueError, + match=r"Invalid combination of parameters: group=GrpCatalog; product_type=not_valid. *."): + eculid.get_scientific_data_product_list(observation_id=11111, group='GrpCatalog', product_type='not_valid') + + @patch.object(TapPlus, 'login') def test_login(mock_login): conn_handler = DummyConnHandler() diff --git a/docs/esa/euclid/euclid.rst b/docs/esa/euclid/euclid.rst index 44ac6d4f49..d5e8b0e6d1 100644 --- a/docs/esa/euclid/euclid.rst +++ b/docs/esa/euclid/euclid.rst @@ -240,7 +240,30 @@ To get the list of products associated with a given Euclid observation_id or til EUC_MER_BGSUB-MOSAIC-DES-Z_TILE102018211-83C32F_20241018T143526.104818Z_00.00.fits 1398 102018211 DECAM DECAM_z SCIENCE SKY 57.9990741 -51.5 IMAGE -The method returns a list of products as an astropy.table. +The method returns a list of products as an astropy.table. It is also possible to search by observation_id, but not by both parameters simultaneously. + +It is possible to retrieve LE3 data (scientific data) by observation_id or tile_index (but not by both simultaneously) and/or for different categories, groups and product types: + +.. Skipping authentication requiring examples +.. doctest-skip:: + + >>> from astroquery.esa.euclid import Euclid + >>> le3_product_list = Euclid.get_scientific_data_product_list(tile_index=102034414) + >>> print("Found", len(le3_product_list), "results") + Found 12 results + >>> print(le3_product_list) + +In the following example, for the LE3 Weak-Lensing data, we retrieve all the Tomographic Cosmic Shear Correlation products (2PCF TwoPCFWLShearShear2D): + +.. Skipping authentication requiring examples +.. doctest-skip:: + + >>> from astroquery.esa.euclid import Euclid + >>> results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF', product_type='DpdCovarTwoPCFWLClPosPos2D') + >>> print("Found", len(le3_product_list), "results") + Found 12 results + >>> print(le3_product_list) + 1.2. Cone search ^^^^^^^^^^^^^^^^ From 85970afed71b3796418368fca546a523e698d8fe Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Sun, 23 Mar 2025 08:43:58 +0100 Subject: [PATCH 02/19] EUCLIDMNGT-1275 Update example --- docs/esa/euclid/euclid.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/esa/euclid/euclid.rst b/docs/esa/euclid/euclid.rst index d5e8b0e6d1..5086dae77e 100644 --- a/docs/esa/euclid/euclid.rst +++ b/docs/esa/euclid/euclid.rst @@ -259,7 +259,7 @@ In the following example, for the LE3 Weak-Lensing data, we retrieve all the Tom .. doctest-skip:: >>> from astroquery.esa.euclid import Euclid - >>> results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF', product_type='DpdCovarTwoPCFWLClPosPos2D') + >>> results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF', product_type='DpdTwoPCFWLShearShear2D') >>> print("Found", len(le3_product_list), "results") Found 12 results >>> print(le3_product_list) From 245e915cd40361c0b7c709e8149407035f2110f0 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 26 Mar 2025 06:49:10 +0100 Subject: [PATCH 03/19] EUCLIDMNGT-1275 Update product types and documentation --- astroquery/esa/euclid/__init__.py | 48 ++-- astroquery/esa/euclid/core.py | 388 ++++++++++++++++++------------ 2 files changed, 252 insertions(+), 184 deletions(-) diff --git a/astroquery/esa/euclid/__init__.py b/astroquery/esa/euclid/__init__.py index b16dd06407..2904bd6471 100644 --- a/astroquery/esa/euclid/__init__.py +++ b/astroquery/esa/euclid/__init__.py @@ -65,7 +65,8 @@ class Conf(_config.ConfigNamespace): 'DpdLE3clCATParams', 'DpdLE3clCcpInputParams', 'DpdLE3clDetClusters', 'DpdLE3clDetInputParams', 'DpdLE3clDetMergeParams', 'DpdLE3clDetOnMockParams', 'DpdLE3clGlueMatchParams', 'DpdLE3clMockGlueMatchParams', 'DpdLE3clPzwavAux', - 'DpdLE3clPZWAVDensity', 'DpdLE3clRichMembers', 'DpdLE3clZClParams', 'DpdLE3FullDet'], + 'DpdLE3clPZWAVDensity', 'DpdLE3clRichMembers', 'DpdLE3clZClParams', 'DpdLE3FullDet', + 'DpdLE3clMockGlueMatchParams'], 'GrpClustering': ['DDpdLE3clPkDOA', 'DpdLE3clCovmatTwoPointCov2', 'DpdLE3clPkYam', 'DpdLE3clTwoPointAutoCorrPol', 'DpolDpdLE3clCovmatPKCov1'], 'GrpCOMB': ['DpdLE3clCombConfigurationSet', 'DpdLE3clCombCovMatDeltaSigmaCosmoDep', @@ -100,10 +101,6 @@ class Conf(_config.ConfigNamespace): 'SEL Wide Pre-recon': [], 'VMSP Group': ['DpdLE3IDVMSPConfiguration', 'DpdLE3IDVMSPDetectionModel', 'DpdLE3IDVMSPDistModel', 'DpdLE3IDVMSPRandomCatalog']}, - 'testCategory': { - 'testGroup': ['DpdHealpixBitMaskVMPZ', 'dpdMerFinalCatalog', 'dpdPhzPfOutputCatalog', 'dpdSheLensMcChains', - 'dpdSpePfOutputCatalog'], - 'testGroup2': []}, 'Weak Lensing Products': { '2D-MASS': ['DpdTwoDMassConvergenceClusters', 'DpdTwoDMassConvergencePatch', 'DpdTwoDMassConvergencePatchesToSphere', 'DpdTwoDMassConvergenceSphere', @@ -111,35 +108,18 @@ class Conf(_config.ConfigNamespace): 'DpdTwoDMassParamsConvergencePatchesToSphere', 'DpdTwoDMassParamsConvergenceSphere', 'DpdTwoDMassParamsPeakCatalogConvergence', 'DpdTwoDMassParamsPeakCatalogMassAperture', 'DpdTwoDMassPeakCatalog'], - '2PCF': ['DpdCovarTwoPCFWLClPosPos2D', - 'DpdCovarTwoPCFWLCOSEBIShearShear2D', - 'DpdCovarTwoPCFWLParams', - 'DpdCovarTwoPCFWLPEBPosShear2D', - 'DpdCovarTwoPCFWLPosPos2D', - 'DpdCovarTwoPCFWLPosShear2D', - 'DpdCovarTwoPCFWLResampleClPosPos2D', - 'DpdCovarTwoPCFWLResampleCOSEBIShearShear2D', - 'DpdCovarTwoPCFWLResamplePEBPosShear2D', - 'DpdCovarTwoPCFWLResamplePEBShearShear2D', - 'DpdCovarTwoPCFWLResamplePosPos2D', - 'DpdCovarTwoPCFWLResamplePosShear2D', - 'DpdCovarTwoPCFWLResampleShearShear2D', - 'DpdCovarTwoPCFWLShearShear2D', - 'DpdTwoPCFWLClPosPos2D', - 'DpdTwoPCFWLCOSEBIFilter', - 'DpdTwoPCFWLCOSEBIShearShear2D', - 'DpdTwoPCFWLParamsClPosPos2D', - 'DpdTwoPCFWLParamsCOSEBIShearShear2D', - 'DpdTwoPCFWLParamsPEBPosShear2D', - 'DpdTwoPCFWLParamsPEBShearShear2D', - 'DpdTwoPCFWLParamsPosPos2D', - 'DpdTwoPCFWLParamsPosShear2D', - 'DpdTwoPCFWLParamsShearShear2D', - 'DpdTwoPCFWLPEBPosShear2D', - 'DpdTwoPCFWLPEBShearShear2D', - 'DpdTwoPCFWLPosPos2D', - 'DpdTwoPCFWLPosShear2D', - 'DpdTwoPCFWLShearShear2D'], + '2PCF': ['DpdTwoPCFWLCOSEBIFilter', 'DpdTwoPCFWLParamsCOSEBIShearShear2D', 'DpdTwoPCFWLParamsClPosPos2D', + 'DpdTwoPCFWLParamsPEBPosShear2D', 'DpdTwoPCFWLParamsPEBShearShear2D', 'DpdTwoPCFWLParamsPosPos2D', + 'DpdTwoPCFWLParamsPosShear2D', 'DpdTwoPCFWLParamsShearShear2D', 'DpdTwoPCFWLCOSEBIShearShear2D', + 'DpdTwoPCFWLClPosPos2D', 'DpdTwoPCFWLPEBPosShear2D', 'DpdTwoPCFWLPEBShearShear2D', + 'DpdTwoPCFWLPosPos2D', 'DpdTwoPCFWLPosShear2D', 'DpdTwoPCFWLShearShear2D', + 'DpdCovarTwoPCFWLParams', 'DpdCovarTwoPCFWLClPosPos2D', 'DpdCovarTwoPCFWLCOSEBIShearShear2D', + 'DpdCovarTwoPCFWLPEBPosShear2D', 'DpdCovarTwoPCFWLPEBShearShear2D', + 'DpdCovarTwoPCFWLPosPos2D', 'DpdCovarTwoPCFWLPosShear2D', 'DpdCovarTwoPCFWLShearShear2D', + 'DpdCovarTwoPCFWLResampleCOSEBIShearShear2D', 'DpdCovarTwoPCFWLResampleClPosPos2D', + 'DpdCovarTwoPCFWLResamplePEBPosShear2D', 'DpdCovarTwoPCFWLResamplePEBShearShear2D', + 'DpdCovarTwoPCFWLResamplePosPos2D', 'DpdCovarTwoPCFWLResamplePosShear2D', + 'DpdCovarTwoPCFWLResampleShearShear2D'], 'PK': ['DpdPKWLAlms', 'DpdPKWLCovMatrix2D', 'DpdPKWLEstimate2D', 'DpdPKWLMaps', 'DpdPKWLMixingMatrix2D']} } diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 4a44f49e04..7becde4b8f 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1290,166 +1290,254 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No It is not compatible with parameter tile_index. tile_index: str, optional, default None. It is not compatible with parameter observation_id. - category : str, optional, default None + category: str, optional, default None. Available categories: #. 'Clusters of Galaxies' #. 'External Data Products' #. 'Galaxy Clustering Products' #. 'Internal Data Products' - #. 'testCategory' #. 'Weak Lensing Products' - group : str, optional, default None - Available groups: - - #. '2D-MASS' - #. '2PCF' - #. '2PCF_PK' - #. '3PCF_BK' - #. 'CM-2PCF' - #. 'CM-PK' - #. 'GrpCatalog' - #. 'GrpClustering' - #. 'GrpCOMB' - #. 'GrpLMF' - #. 'GrpSEL' - #. 'GrpTiling' - #. 'LE3-ED configuration catalog' - #. 'LE3-ED match catalog' - #. 'PK' - #. 'SEL Config/Stats' - #. 'SEL Wide Main' - #. 'SEL Wide Post-recon' - #. 'SEL Wide Pre-recon' - #. 'testGroup' - #. 'testGroup2' - #. 'VMSP Group' + Available groups per category: + + #. Internal Data Products + #. 'SEL Wide Main' + #. 'SEL Wide' + #. 'VMSP Group' + #. 'SEL Config/Stats' + #. External Data Products + #. 'LE3-ED configuration catalog' + #. Weak Lensing Products + #. '2PCF' + #. 'PK' + #. '2D-MASS' + #. Galaxy Clustering Products + #. '2PCF_PK' + #. '3PCF_BK' + #. 'CM-2PCF' + #. 'CM-PK' + #. Clusters of Galaxies + #. 'GrpCatalog' + #. 'GrpCOMB' + #. 'GrpSEL' + #. 'GrpClustering' + #. 'GrpLMF' + #. 'GrpTiling' product_type : str, optional, default None - Available product types: - - #. 'DDpdLE3clPkDOA' - #. 'DpdCovarTwoPCFWLClPosPos2D' - #. 'DpdCovarTwoPCFWLCOSEBIShearShear2D' - #. 'DpdCovarTwoPCFWLParams' - #. 'DpdCovarTwoPCFWLPEBPosShear2D' - #. 'DpdCovarTwoPCFWLPosPos2D' - #. 'DpdCovarTwoPCFWLPosShear2D' - #. 'DpdCovarTwoPCFWLResampleClPosPos2D' - #. 'DpdCovarTwoPCFWLResampleCOSEBIShearShear2D' - #. 'DpdCovarTwoPCFWLResamplePEBPosShear2D' - #. 'DpdCovarTwoPCFWLResamplePEBShearShear2D' - #. 'DpdCovarTwoPCFWLResamplePosPos2D' - #. 'DpdCovarTwoPCFWLResamplePosShear2D' - #. 'DpdCovarTwoPCFWLResampleShearShear2D' - #. 'DpdCovarTwoPCFWLShearShear2D' - #. 'DpdHealpixBitMaskVMPZ' - #. 'DpdLE3clAmicoAux' - #. 'DpdLE3clAMICOModel' - #. 'DpdLE3clAssociations' - #. 'DpdLE3clCatMergeParams' - #. 'DpdLE3clCATParams' - #. 'DpdLE3clCcpInputParams' - #. 'DpdLE3clCLTile' - #. 'DpdLE3clCombConfigurationSet' - #. 'DpdLE3clCombCovMatDeltaSigmaCosmoDep' - #. 'DpdLE3clCombCovMatReducedShearCosmoDep' - #. 'DpdLE3clCombCovMatReducedShearCosmoIndep' - #. 'DpdLE3clCombRedSheProf' - #. 'DpdLE3clCombStackingCosmoDep' - #. 'DpdLE3clCombStackingCosmoInd' - #. 'DpdLE3clCombUCovRedSheProf' - #. 'DpdLE3clCombWLME' - #. 'DpdLE3clCommon' - #. 'DpdLE3clConfigurationSet' - #. 'DpdLE3clCovmatTwoPointCov2' - #. 'DpdLE3clDetClusters' - #. 'DpdLE3clDetInputParams' - #. 'DpdLE3clDetMergeParams' - #. 'DpdLE3clDetOnMockParams' - #. 'DpdLE3clGlueMatchParams' - #. 'DpdLE3clLMFOutput' - #. 'DpdLE3clLMFParams' - #. 'DpdLE3clMatchForSelParams' - #. 'DpdLE3clMockClusters' - #. 'DpdLE3clMockGlueMatchParams' - #. 'DpdLE3clPkYam' - #. 'DpdLE3clPzwavAux' - #. 'DpdLE3clPZWAVDensity' - #. 'DpdLE3clRedshiftDistrib' - #. 'DpdLE3clRichMembers' - #. 'DpdLE3clSelRandom' - #. 'DpdLE3clSelRandomParams' - #. 'DpdLE3clSelSelFunc' - #. 'DpdLE3clSelSelFuncInputParams' - #. 'DpdLE3clSelSinfoniaIniClMockInputParams' - #. 'DpdLE3clSelSinfoniaMockInputParams' - #. 'DpdLE3clSelSubSample' - #. 'DpdLE3clSinfoniaEllipticity' - #. 'DpdLE3clTwoPointAutoCorrPol' - #. 'DpdLE3clZClParams' - #. 'DpdLE3edConfigurationFile' - #. 'DpdLE3edMatchedCatalog' - #. 'DpdLE3FullDet' - #. 'DpdLE3gcBkMonopole' - #. 'DpdLE3gcBkMultipole' - #. 'DpdLE3gcCovmatPKCov1D' - #. 'DpdLE3gcCovmatPKCov2Dcart' - #. 'DpdLE3gcCovmatPKCov2Dpol' - #. 'DpdLE3gcCovmatTwoPointCov1D' - #. 'DpdLE3gcCovmatTwoPointCov2Dcart' - #. 'DpdLE3gcCovmatTwoPointCov2Dpol' - #. 'DpdLE3gcCovmatTwoPointCovMu' - #. 'DpdLE3gcCovmatTwoPointCovPro' - #. 'DpdLE3gcPkCross' - #. 'DpdLE3gcPkDOA' - #. 'DpdLE3gcPkYam' - #. 'DpdLE3gcThreePointAll' - #. 'DpdLE3gcThreePointSin' - #. 'DpdLE3gcTwoPointAutoCorr' - #. 'DpdLE3gcTwoPointAutoCorrCart' - #. 'DpdLE3gcTwoPointAutoCorrPol' - #. 'DpdLE3gcTwoPointCrossCorr' - #. 'DpdLE3gcTwoPointCrossCorrCart' - #. 'DpdLE3gcTwoPointCrossCorrPol' - #. 'DpdLE3gcTwoPointRecAutoCorr' - #. 'DpdLE3gcTwoPointRecAutoCorrCart' - #. 'DpdLE3gcTwoPointRecAutoCorrPol' - #. 'DpdLE3gcTwoPointRecCrossCorr' - #. 'DpdLE3gcTwoPointRecCrossCorrCart' - #. 'DpdLE3gcTwoPointRecCrossCorrPol' - #. 'DpdLE3IDSELConfigurationSet' - #. 'DpdLE3IDSELIDCatalog' - #. 'DpdLE3IDSELIDStatistics' - #. 'DpdLE3IDSELIDSubsampledCatalog' - #. 'DpdLE3IDVMSPConfiguration' - #. 'DpdLE3IDVMSPDetectionModel' - #. 'DpdLE3IDVMSPDistModel' - #. 'DpdLE3IDVMSPRandomCatalog' - #. 'dpdMerFinalCatalog' - #. 'dpdPhzPfOutputCatalog' - #. 'DpdPKWLAlms' - #. 'DpdPKWLCovMatrix2D' - #. 'DpdPKWLEstimate2D' - #. 'DpdPKWLMaps' - #. 'DpdPKWLMixingMatrix2D' - #. 'dpdSheLensMcChains' - #. 'dpdSpePfOutputCatalog' - #. 'DpdTwoDMassConvergenceClusters' - #. 'DpdTwoDMassConvergencePatch' - #. 'DpdTwoDMassConvergencePatchesToSphere' - #. 'DpdTwoDMassConvergenceSphere' - #. 'DpdTwoDMassParamsConvergenceClusters' - #. 'DpdTwoDMassParamsConvergencePatch' - #. 'DpdTwoDMassParamsConvergencePatchesToSphere' - #. 'DpdTwoDMassParamsConvergenceSphere' - #. 'DpdTwoDMassParamsPeakCatalogConvergence' - #. 'DpdTwoDMassParamsPeakCatalogMassAperture' - #. 'DpdTwoDMassPeakCatalog' - #. 'DpdTwoPCFWLClPosPos2D' - #. 'DpdTwoPCFWLCOSEBIFilter' - + Available product types per category and group: + + #. Internal Data Products + #. SEL Wide Main + #. 'DpdLE3IDSELIDCatalog' + #. SEL Wide + #. 'DpdLE3IDSELIDSubsampledCatalog': + #. VMSP Group + #. 'DpdLE3IDVMSPConfiguration' : VMSP Configuration + #. 'DpdLE3IDVMSPDetectionModel': VMSP ID Detection Model + #. 'DpdLE3IDVMSPDistModel': VMSP Distribution Model + #. 'DpdLE3IDVMSPRandomCatalog': Random Catalog Product + #. SEL Config/Stats + #. 'DpdLE3IDSELIDStatistics': SEL-ID Purity and completeness statistics + #. 'DpdLE3IDSELConfigurationSet': SEL Configuration + #. External Data Products + #. LE3-ED configuration catalog + #. 'DpdLE3edConfigurationFile': LE3-ED configuration catalog + #. 'DpdLE3edMatchedCatalog': LE3-ED match catalog + #. Weak Lensing Products + #. 2PCF + #. 'DpdTwoPCFWLCOSEBIFilter': This product contains COSEBI filters + #. 'DpdTwoPCFWLParamsCOSEBIShearShear2D': This product contains parameters to compute the + tomographic cosmic shear COSEBI modes NO en GUI + #. 'DpdTwoPCFWLParamsClPosPos2D': This product contains parameters to compute the tomographic + angular power spectra. NO en GUI + #. 'DpdTwoPCFWLParamsPEBPosShear2D': This product contains parameters to compute the + tomographic galaxy-galaxy lensing E/B power spectra. NO en GUI + #. 'DpdTwoPCFWLParamsPEBShearShear2D': This product contains parameters to compute the + tomographic cosmic shear E/B power spectra. NO en GUI + #. 'DpdTwoPCFWLParamsPosPos2D': Input parameters to compute tomographic angular 2PCF. NO en + GUI + #. 'DpdTwoPCFWLParamsPosShear2D': Input parameters to compute the tomographic galaxy-galaxy + lensing 2PCF. NO en GUI + #. 'DpdTwoPCFWLParamsShearShear2D': Input parameters to compute tomographic cosmic shear 2PCF. + NO en GUI + #. 'DpdTwoPCFWLCOSEBIShearShear2D': Tomographic cosmic shear COSEBI modes. NO en GUI + #. 'DpdTwoPCFWLClPosPos2D': This product contains the tomographic angular power spectra + #. 'DpdTwoPCFWLPEBPosShear2D': Tomographic galaxy-galaxy lensing E/B power spectra NO en GUI + #. 'DpdTwoPCFWLPEBShearShear2D': Tomographic cosmic shear E/B power spectra. NO en GUI + #. 'DpdTwoPCFWLPosPos2D': Tomographic angular 2PCF. NO en GUI + #. 'DpdTwoPCFWLPosShear2D': Tomographic galaxy - galaxy lensing 2PCF. NO en GU + #. 'DpdTwoPCFWLShearShear2D': Tomographic cosmic shear 2PCF. NO en GU + #. 'DpdCovarTwoPCFWLParams': This product contains resampling parameters to compute the + covariance matrices. + #. 'DpdCovarTwoPCFWLClPosPos2D': Covariance of Tomographic Angular Power Spectra + #. 'DpdCovarTwoPCFWLCOSEBIShearShear2D': Covariance of Tomographic Cosmic Shear COSEBI + #. 'DpdCovarTwoPCFWLPEBPosShear2D': Cov. of Tomo. Galaxy-Galaxy Lensing EB Power Spectra + #. 'DpdCovarTwoPCFWLPEBShearShear2D': Covariance of Tomographic Cosmic Shear EB Power + Spectra NO en GUI + #. 'DpdCovarTwoPCFWLPosPos2D': Covariance of Tomographic Angular Correlation + #. 'DpdCovarTwoPCFWLPosShear2D': Cov. of Tomographic Galaxy-Galaxy Lensing Correlation + #. 'DpdCovarTwoPCFWLShearShear2D': Covariance of Tomographic Cosmic Shear Correlation + #. 'DpdCovarTwoPCFWLResampleCOSEBIShearShear2D': This product contains a list of resampled + tomographic cosmic shear COSEBI modes. + #. 'DpdCovarTwoPCFWLResampleClPosPos2D': This product contains a list of resampled + tomographic angular power spectrum. + #. 'DpdCovarTwoPCFWLResamplePEBPosShear2D': This product contains a list of resampled + tomographic galaxy-galaxy lensing E/B power spectra. + #. 'DpdCovarTwoPCFWLResamplePEBShearShear2D': This product contains a list of resampled + tomographic cosmic shear E/B power spectra. + #. 'DpdCovarTwoPCFWLResamplePosPos2D': This product contains a list of resampled tomographic + galaxy-galaxy lensing correlation function. + #. 'DpdCovarTwoPCFWLResamplePosShear2D': This product contains a list of resampled + tomographic galaxy-galaxy lensing correlation function. + #. 'DpdCovarTwoPCFWLResampleShearShear2D': This product contains a list of resampled + tomographic cosmic shear 2PCF. + #. PK + #. 'DpdPKWLAlms': Data product that contains the alms generated by PK-WL. + #. 'DpdPKWLCovMatrix2D': This product contains the covariance matrix of angular power spectra. + #. 'DpdPKWLEstimate2D': This product contains the tomographic angular clustering power spectra. + #. 'DpdPKWLMaps': Data product that contains the FITS file with maps generated by PK-WL. + #. 'DpdPKWLMixingMatrix2D': This product contains the mixing matrix components. + #. 2D-MASS + #. 'DpdTwoDMassParamsConvergenceClusters': This product contains input parameters to compute + the 2D convergence maps for clusters studies. + #. 'DpdTwoDMassParamsConvergencePatch': This product contains inputs to compute the 2D + convergence maps for one or several patches. + #. 'DpdTwoDMassParamsConvergencePatchesToSphere': This product contains inputs to compute the + 2D convergence maps on the sphere. + #. 'DpdTwoDMassParamsConvergenceSphere': This product contains inputs to compute the 2D + convergence maps on the sphere. + #. 'DpdTwoDMassParamsPeakCatalogConvergence': This product contains inputs to perform peak + counting on a convergence map. + #. 'DpdTwoDMassParamsPeakCatalogMassAperture': This product contains inputs to perform peak + counting on shear catalog for one or several patches + #. 'DpdTwoDMassConvergenceClusters': E/B Convergence Maps for Clusters + #. 'DpdTwoDMassConvergencePatchesToSphere': MultiPatch-Based E/B Convergence Maps for Large + field + #. 'DpdTwoDMassConvergencePatch': E/B Convergence Maps for Small Field + #. 'DpdTwoDMassConvergenceSphere': Spherical E/B Convergence Maps + #. 'DpdTwoDMassPeakCatalog': Peak Catalog + #. Galaxy Clustering Products + #. 2PCF_PK + #. 'DpdLE3gcPkCross': Cross [Power Spectrum Multipoles and Window Product] + #. 'DpdLE3gcPkDOA': DOA [Power Spectrum Multipoles, 2Dpolar, 2Dcart and Window Product] + #. 'DpdLE3gcPkYam': Yamamoto [Power Spectrum Multipoles and Window Product] + #. 'DpdLE3gcTwoPointAutoCorr': 1D [Angle-averaged Auto-correlation Product] + #. 'DpdLE3gcTwoPointAutoCorrCart': 2D Cartesian [2D Cartesian and Projected Auto-corr. Product] + #. 'DpdLE3gcTwoPointAutoCorrPol': 2D Polar [2D Polar and Multipole Auto-correlation Product] + #. 'DpdLE3gcTwoPointCrossCorr' : 1D [Angle-averaged Cross-correlation Product] + #. 'DpdLE3gcTwoPointCrossCorrCart': 2D Cartesian [2D Cartesian and Projected Cross-corr. + Product] + #. 'DpdLE3gcTwoPointCrossCorrPol': 2D Polar [2D Polar and Multipole Cross-correlation Product] + #. 'DpdLE3gcTwoPointRecAutoCorr': 1D [Post-reconstruction Angle-averaged Auto-correlation + Product] + #. 'DpdLE3gcTwoPointRecAutoCorrCart': 2D Cartesian [Post-reconstruction 2D Cartesian and + Projected Auto-correlation Product] + #. 'DpdLE3gcTwoPointRecAutoCorrPol': 2D Polar [Post-reconstruction 2D Polar and Multipole + Auto-correlation Product] + #. 'DpdLE3gcTwoPointRecCrossCorr': 1D [Post-reconstruction Angle-averaged Cross-corr. Product] + #. 'DpdLE3gcTwoPointRecCrossCorrCart': 2D Cartesian [Post-reconstruction 2D Cartesian and + Projected Cross-correlation Product] + #. 'DpdLE3gcTwoPointRecCrossCorrPol': 2D Polar [Post-reconstruction 2D Polar and Multipole + Cross-correlation Product] + #. 3PCF_BK + #. 'DpdLE3gcThreePointAll': 3PCF Triplets “ALL” Product + #. 'DpdLE3gcThreePointSin': 3PCF Correlation “SINGLE” Product + #. 'DpdLE3gcBkMonopole': Bispectrum Product Monopole + #. 'DpdLE3gcBkMultipole': Bispectrum Product Multipoles + #. CM-2PCF + #. 'DpdLE3gcCovmatTwoPointCov1D': Output - 1D [Covariance Matrix of the Angle-averaged + Auto-correlation Product] + #. 'DpdLE3gcCovmatTwoPointCov2Dcart': Output - 2D cartesian [Covariance Matrix of the 2D + Cartesian 2PCF Product] + #. 'DpdLE3gcCovmatTwoPointCov2Dpol': Output - 2D Polar [Covariance Matrix of the 2D Polar + 2PCF Product] + #. 'DpdLE3gcCovmatTwoPointCovMu': Output - Covariance Matrix of the Multipoles 0,1,2,3, + 4 2PCF Product + #. 'DpdLE3gcCovmatTwoPointCovPro': Output - Projected [Covariance Matrix of the Projected + 2PCF Product] + #. CM-PK + #. 'DpdLE3gcCovmatPKCov1D': Output - Covariance Matrix of the Power Spectrum 0, 1, 2, 3, + 4 multipoles Product + #. 'DpdLE3gcCovmatPKCov2Dcart': Output - Covariance Matrix of the Power Spectrum 2D Cartesian + Product + #. 'DpdLE3gcCovmatPKCov2Dpol': Output - Covariance Matrix of the Power Spectrum 2D Polar Product + #. Clusters of Galaxies + #. GrpCatalog + #. 'DpdLE3clAMICOModel': This product contains the Model for AMICO + #. 'DpdLE3clDetMergeParams': This product contains the input parameters for DET + #. 'DpdLE3clDetOnMockParams': This product contains the input parameters for DET_ON_MOCK + pipeline + #. 'DpdLE3clDetInputParams': This product contains the input parameters for DEt + #. 'DpdLE3clAmicoAux': DET-CL AMICO auxiliary Data Product + #. 'DpdLE3clAssociations': This output product contains the catalog of associations galaxy to + clusters + #. 'DpdLE3clPzwavAux': DET-CL PZWAV auxiliary Data Product + #. 'DpdLE3clPZWAVDensity': This output product contains the intermediate Product "Density + Map" from DET-CL/PZWAV + #. 'DpdLE3clDetClusters': This output product contains the catalog of candidate clusters from + DET-CL + #. 'DpdLE3FullDet': This output product contains the merged catalog of candidate clusters + #. 'DpdLE3clCatMergeParams': This product contains the input parameters for the merging in + CAT-CL + #. 'DpdLE3clCATParams': This product contains the configuration parameters for LE3 CAT-CL + #. 'DpdLE3clCcpInputParams': This product contains the input parameters for Cluster + Characterization Pipeline + #. 'DpdLE3clRichMembers': Galaxy Membership Output Product + #. 'DpdLE3clZClParams': This product contains the configuration parameters for LE3 Z-CL + #. 'DpdLE3clGlueMatchParams': This product contains the input parameters for the glue-match + pipeline + #. 'DpdLE3clMockGlueMatchParams': This product contains the input parameters for the mock + glue-match pipeline + #. 'DpdLE3clGlueMatchParams': This product contains the input parameters for the glue-match + pipeline. No en GUI + #. GrpCOMB + #. 'DpdLE3clCombConfigurationSet': Configuration information for COMB-CL pipelines + #. 'DpdLE3clCombRedSheProf': Output Reduced shear profiles + #. 'DpdLE3clCombUCovRedSheProf': Output Uncertainty Covariance matrix of the reduced + #. 'DpdLE3clCombWLME': Output Weak lensing mass estimates + #. 'DpdLE3clCombCovMatDeltaSigmaCosmoDep': This output product contains the stacking + covariance matrix of the differential surface density derived with a cosmology dependent + binning. + #. 'DpdLE3clCombCovMatReducedShearCosmoDep': This output product contains the stacking + covariance matrix of the reduced shear derived with a cosmology dependent binning. + #. 'DpdLE3clCombCovMatReducedShearCosmoIndep': This output product contains the stacking + covariance matrix of the reduced shear derived with a cosmology independent binning. + #. 'DpdLE3clCombStackingCosmoDep': This output product contains the stacking cosmology + dependent binning. + #. 'DpdLE3clCombStackingCosmoInd': This output product contains the stacking cosmology + independent binning. + #. GrpSEL + #. 'DpdLE3clSelRandomParams': This output product contains the configuration parameters for + SEL-CL to create the random catalogue + #. 'DpdLE3clSelSelFuncInputParams': This product contains the input parameters for SEL SelFunc + #. 'DpdLE3clSelSinfoniaIniClMockInputParams': This product contains the input parameters for + SEL Sinfonia Cluster Mock pipeline + #. 'DpdLE3clSelSinfoniaMockInputParams': This product contains the input parameters for SEL + Sinfonia Mock pipeline + #. 'DpdLE3clSelSelFunc': This output product contains the selection function of the galaxy + cluster detections + #. 'DpdLE3clSinfoniaEllipticity': This output product contains the file for the ellipticity + #. 'DpdLE3clSelSubSample': Clusters Subsample Output Product + #. 'DpdLE3clRedshiftDistrib': Redshift distribution of detections + #. 'DpdLE3clSelRandom': Random for the CL clustering codes + #. 'DpdLE3clMatchForSelParams': This product contains the input parameters for the + match-for-sel pipeline + #. 'DpdLE3clMockClusters': This output product contains the catalog of mock clusters + #. GrpClustering + #. 'DpdLE3clTwoPointAutoCorrPol': Cluster Clustering Two Point Correlation 2D polar data product + #. 'DpdLE3clCovmatTwoPointCov2': Cluster Clustering Covariance Matrix 2PCF 2D polar data product + #. 'DpolDpdLE3clCovmatPKCov1': NO en GUI + #. 'DDpdLE3clPkDOA': + #. 'DpdLE3clPkYam': Cluster Clustering Power Spectrum Yamamoto data product + #. GrpLMF + #. 'DpdLE3clLMFParams': This product contains the configuration parameters for LE3 LMF-CL + #. 'DpdLE3clLMFOutput': This product contains the output for LE3_CL LMF PF + #. GrpTiling + #. 'DpdLE3clCLTile': This product contains the information describing a CL tile + #. 'DpdLE3clCommon': Common data product for CL + #. 'DpdLE3clConfigurationSet': Generic configuration information for CL PFs release : str, mandatory. Data release from which data should be taken. verbose : bool, optional, default 'False' From 4be57bd10e1533a4fe3cf2cb9ebe8799b4aa0e7a Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 26 Mar 2025 07:44:17 +0100 Subject: [PATCH 04/19] EUCLIDMNGT-1275 New category PHZ --- astroquery/esa/euclid/__init__.py | 4 +++- astroquery/esa/euclid/core.py | 13 +++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/astroquery/esa/euclid/__init__.py b/astroquery/esa/euclid/__init__.py index 2904bd6471..94e8e2d675 100644 --- a/astroquery/esa/euclid/__init__.py +++ b/astroquery/esa/euclid/__init__.py @@ -120,7 +120,9 @@ class Conf(_config.ConfigNamespace): 'DpdCovarTwoPCFWLResamplePEBPosShear2D', 'DpdCovarTwoPCFWLResamplePEBShearShear2D', 'DpdCovarTwoPCFWLResamplePosPos2D', 'DpdCovarTwoPCFWLResamplePosShear2D', 'DpdCovarTwoPCFWLResampleShearShear2D'], - 'PK': ['DpdPKWLAlms', 'DpdPKWLCovMatrix2D', 'DpdPKWLEstimate2D', 'DpdPKWLMaps', 'DpdPKWLMixingMatrix2D']} + 'PK': ['DpdPKWLAlms', 'DpdPKWLCovMatrix2D', 'DpdPKWLEstimate2D', 'DpdPKWLMaps', 'DpdPKWLMixingMatrix2D']}, + 'PHZ': { + 'PHZ': ['DpdBinMeanRedshift', 'DpdReferenceSample', 'DpdTomographicBins']} } PRODUCT_TYPES = ['observation', 'mosaic'] diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 7becde4b8f..127fd6b2ef 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1298,6 +1298,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'Galaxy Clustering Products' #. 'Internal Data Products' #. 'Weak Lensing Products' + 3. 'PHZ' group : str, optional, default None Available groups per category: @@ -1324,6 +1325,8 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'GrpClustering' #. 'GrpLMF' #. 'GrpTiling' + #. PHZ + #. 'PHZ' product_type : str, optional, default None Available product types per category and group: @@ -1334,7 +1337,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. SEL Wide #. 'DpdLE3IDSELIDSubsampledCatalog': #. VMSP Group - #. 'DpdLE3IDVMSPConfiguration' : VMSP Configuration + #. 'DpdLE3IDVMSPConfiguration': VMSP Configuration #. 'DpdLE3IDVMSPDetectionModel': VMSP ID Detection Model #. 'DpdLE3IDVMSPDistModel': VMSP Distribution Model #. 'DpdLE3IDVMSPRandomCatalog': Random Catalog Product @@ -1426,7 +1429,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'DpdLE3gcTwoPointAutoCorr': 1D [Angle-averaged Auto-correlation Product] #. 'DpdLE3gcTwoPointAutoCorrCart': 2D Cartesian [2D Cartesian and Projected Auto-corr. Product] #. 'DpdLE3gcTwoPointAutoCorrPol': 2D Polar [2D Polar and Multipole Auto-correlation Product] - #. 'DpdLE3gcTwoPointCrossCorr' : 1D [Angle-averaged Cross-correlation Product] + #. 'DpdLE3gcTwoPointCrossCorr': 1D [Angle-averaged Cross-correlation Product] #. 'DpdLE3gcTwoPointCrossCorrCart': 2D Cartesian [2D Cartesian and Projected Cross-corr. Product] #. 'DpdLE3gcTwoPointCrossCorrPol': 2D Polar [2D Polar and Multipole Cross-correlation Product] @@ -1538,6 +1541,12 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'DpdLE3clCLTile': This product contains the information describing a CL tile #. 'DpdLE3clCommon': Common data product for CL #. 'DpdLE3clConfigurationSet': Generic configuration information for CL PFs + #. PHZ + #. PHZ + #. 'DpdBinMeanRedshift': + #. 'DpdReferenceSample': + #. 'DpdTomographicBins': + release : str, mandatory. Data release from which data should be taken. verbose : bool, optional, default 'False' From e287268f8a5fb6c04cc7f582396caba90c3dfb94 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 26 Mar 2025 07:54:09 +0100 Subject: [PATCH 05/19] EUCLIDMNGT-1275 sort categories in the help --- astroquery/esa/euclid/core.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 127fd6b2ef..c60a57f32a 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1293,12 +1293,12 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No category: str, optional, default None. Available categories: - #. 'Clusters of Galaxies' - #. 'External Data Products' - #. 'Galaxy Clustering Products' #. 'Internal Data Products' + #. 'External Data Products' #. 'Weak Lensing Products' - 3. 'PHZ' + #. 'Galaxy Clustering Products' + #. 'Clusters of Galaxies' + #. 'PHZ' group : str, optional, default None Available groups per category: From a9423d8465fd861ba1daa4d5563fa39364992890 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 26 Mar 2025 08:13:48 +0100 Subject: [PATCH 06/19] EUCLIDMNGT-1275 rename parameter dataset to dataset_release --- astroquery/esa/euclid/core.py | 9 ++++----- astroquery/esa/euclid/tests/test_euclidtap.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index c60a57f32a..6f6b34e792 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1278,8 +1278,7 @@ def get_datalinks(self, ids, *, linking_parameter='SOURCE_ID', verbose=False): return self.__eucliddata.get_datalinks(ids=ids, linking_parameter=linking_parameter, verbose=verbose) def get_scientific_data_product_list(self, *, observation_id=None, tile_index=None, category=None, group=None, - product_type=None, - release='LEVEL_3_RELEASE', verbose=False): + product_type=None, dataset_release='LEVEL_3_RELEASE', verbose=False): """ Gets the LE3 products (the high-level science data products). Please note that not all combinations of category, group, and product_type are valid. @@ -1547,7 +1546,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'DpdReferenceSample': #. 'DpdTomographicBins': - release : str, mandatory. + dataset_release : str, mandatory. Default LEVEL_3_RELEASE Data release from which data should be taken. verbose : bool, optional, default 'False' flag to display information about the process @@ -1564,7 +1563,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No None): raise ValueError("Include a valid parameter to retrieve a LE3 product.") - if release is None: + if dataset_release is None: raise ValueError("The release is required.") if observation_id is not None and tile_index is not None: @@ -1671,7 +1670,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No f"observation_id_list, CAST(basic_download_data.tile_index_list as text) AS tile_index_list, " f"CAST(basic_download_data.patch_id_list as text) AS patch_id_list, " f"CAST(basic_download_data.filter_name as text) AS filter_name FROM sedm.basic_download_data WHERE " - f"release_name='{release}' {query_extra_condition} ORDER BY observation_id_list ASC") + f"release_name='{dataset_release}' {query_extra_condition} ORDER BY observation_id_list ASC") job = super().launch_job(query=query, output_format='votable_plain', verbose=verbose, format_with_results_compressed=('votable_gzip',)) diff --git a/astroquery/esa/euclid/tests/test_euclidtap.py b/astroquery/esa/euclid/tests/test_euclidtap.py index 7165f6cf80..83c6f981bd 100644 --- a/astroquery/esa/euclid/tests/test_euclidtap.py +++ b/astroquery/esa/euclid/tests/test_euclidtap.py @@ -1108,7 +1108,7 @@ def test_get_scientific_data_product_list_exceptions(): product_type=None) with pytest.raises(ValueError, match="The release is required."): - eculid.get_scientific_data_product_list(observation_id=11111, release=None) + eculid.get_scientific_data_product_list(observation_id=11111, dataset_release=None) with pytest.raises(ValueError, match="Incompatible: 'observation_id' and 'tile_id'. Use only one."): eculid.get_scientific_data_product_list(observation_id=11111, tile_index=1234567) From 3db0e4223c30b0d4a67de48202af5180ba9df108 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 26 Mar 2025 10:07:00 +0100 Subject: [PATCH 07/19] EUCLIDMNGT-1275 Update help info --- astroquery/esa/euclid/core.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 6f6b34e792..e47986ba4b 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1353,22 +1353,20 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'DpdTwoPCFWLParamsCOSEBIShearShear2D': This product contains parameters to compute the tomographic cosmic shear COSEBI modes NO en GUI #. 'DpdTwoPCFWLParamsClPosPos2D': This product contains parameters to compute the tomographic - angular power spectra. NO en GUI + angular power spectra. #. 'DpdTwoPCFWLParamsPEBPosShear2D': This product contains parameters to compute the - tomographic galaxy-galaxy lensing E/B power spectra. NO en GUI + tomographic galaxy-galaxy lensing E/B power spectra. #. 'DpdTwoPCFWLParamsPEBShearShear2D': This product contains parameters to compute the - tomographic cosmic shear E/B power spectra. NO en GUI - #. 'DpdTwoPCFWLParamsPosPos2D': Input parameters to compute tomographic angular 2PCF. NO en - GUI + tomographic cosmic shear E/B power spectra. + #. 'DpdTwoPCFWLParamsPosPos2D': Input parameters to compute tomographic angular 2PCF. #. 'DpdTwoPCFWLParamsPosShear2D': Input parameters to compute the tomographic galaxy-galaxy - lensing 2PCF. NO en GUI + lensing 2PCF. #. 'DpdTwoPCFWLParamsShearShear2D': Input parameters to compute tomographic cosmic shear 2PCF. - NO en GUI - #. 'DpdTwoPCFWLCOSEBIShearShear2D': Tomographic cosmic shear COSEBI modes. NO en GUI + #. 'DpdTwoPCFWLCOSEBIShearShear2D': Tomographic cosmic shear COSEBI modes. #. 'DpdTwoPCFWLClPosPos2D': This product contains the tomographic angular power spectra - #. 'DpdTwoPCFWLPEBPosShear2D': Tomographic galaxy-galaxy lensing E/B power spectra NO en GUI - #. 'DpdTwoPCFWLPEBShearShear2D': Tomographic cosmic shear E/B power spectra. NO en GUI - #. 'DpdTwoPCFWLPosPos2D': Tomographic angular 2PCF. NO en GUI + #. 'DpdTwoPCFWLPEBPosShear2D': Tomographic galaxy-galaxy lensing E/B power spectra + #. 'DpdTwoPCFWLPEBShearShear2D': Tomographic cosmic shear E/B power spectra. + #. 'DpdTwoPCFWLPosPos2D': Tomographic angular 2PCF. #. 'DpdTwoPCFWLPosShear2D': Tomographic galaxy - galaxy lensing 2PCF. NO en GU #. 'DpdTwoPCFWLShearShear2D': Tomographic cosmic shear 2PCF. NO en GU #. 'DpdCovarTwoPCFWLParams': This product contains resampling parameters to compute the @@ -1377,7 +1375,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'DpdCovarTwoPCFWLCOSEBIShearShear2D': Covariance of Tomographic Cosmic Shear COSEBI #. 'DpdCovarTwoPCFWLPEBPosShear2D': Cov. of Tomo. Galaxy-Galaxy Lensing EB Power Spectra #. 'DpdCovarTwoPCFWLPEBShearShear2D': Covariance of Tomographic Cosmic Shear EB Power - Spectra NO en GUI + Spectra #. 'DpdCovarTwoPCFWLPosPos2D': Covariance of Tomographic Angular Correlation #. 'DpdCovarTwoPCFWLPosShear2D': Cov. of Tomographic Galaxy-Galaxy Lensing Correlation #. 'DpdCovarTwoPCFWLShearShear2D': Covariance of Tomographic Cosmic Shear Correlation From b066f48a800bef1efdc98dd600d30ba092411780 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 26 Mar 2025 12:52:03 +0100 Subject: [PATCH 08/19] EUCLIDMNGT-1275 Update implementation --- astroquery/esa/euclid/core.py | 53 ++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index e47986ba4b..e550de82db 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1591,36 +1591,39 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No f"Invalid combination of parameters: category={category}; group={group}. Valid " f"values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") + product_type_for_category_list = conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category][group] + if product_type is not None: - if product_type not in conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category][group]: + if product_type not in product_type_for_category_list: raise ValueError( f"Invalid combination of parameters: category={category}; group={group}; " f"product_type={product_type}. Valid values:\n " f"{pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") - query_extra_condition = query_extra_condition + (f" AND category={category} AND group={group} AND " - f"product_type={product_type} ") + query_extra_condition = query_extra_condition + f" AND product_type ='{product_type}' " else: - query_extra_condition = query_extra_condition + f" AND category={category} AND group={group} " - else: - if product_type is not None: - product_type_list = [item for row in - conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category].values() - for item in row] + final_products = ', '.join(f"'{w}'" for w in product_type_for_category_list) + query_extra_condition = query_extra_condition + f" AND product_type IN ({final_products}) " + else: # category is not None and group is None + + product_type_for_category_list = [item for row in + conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category].values() + for item in row] + if product_type is not None: - if product_type not in product_type_list: + if product_type not in product_type_for_category_list: raise ValueError( f"Invalid combination of parameters: category={category}; product_type={product_type}." f" Valid values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") - query_extra_condition = query_extra_condition + (f" AND category={category} AND product_type=" - f"{product_type} ") + query_extra_condition = query_extra_condition + f" AND product_type = '{product_type}' " - else: - query_extra_condition = query_extra_condition + f" AND category={category} " - else: + else: # category is not None and group is None and product_type is None + final_products = ', '.join(f"'{w}'" for w in product_type_for_category_list) + query_extra_condition = query_extra_condition + f" AND product_type IN ({final_products}) " + else: # category is None category_group_dict = {} for i in conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS.keys(): @@ -1642,22 +1645,26 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No f"Invalid combination of parameters: group={group}; product_type={product_type}. Valid " f"values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") - query_extra_condition = query_extra_condition + (f" AND group={group} AND product_type=" - f"{product_type} ") - else: - query_extra_condition = query_extra_condition + f" AND group={group} " + query_extra_condition = query_extra_condition + f" AND product_type = '{product_type}' " + else: # product_type is None - else: + product_type_for_category_list = [element for sublist in category_group_dict.values() for element in + sublist] + final_products = ', '.join(f"'{w}'" for w in product_type_for_category_list) + query_extra_condition = query_extra_condition + f" AND product_type IN ({final_products}) " + + else: # category is None and group is None - product_type_list = [element for row in category_group_dict.values() for element in row] + product_type_for_category_list = [element for sublist in category_group_dict.values() for element in + sublist] if product_type is not None: - if product_type not in product_type_list: + if product_type not in product_type_for_category_list: raise ValueError( f"Invalid combination of parameters: product_type={product_type}. Valid values:\n " f"{pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") - query_extra_condition = query_extra_condition + f" AND product_type={product_type} " + query_extra_condition = query_extra_condition + f" AND product_type = '{product_type}' " else: query_extra_condition = query_extra_condition + "" From 068080af80c16ec0f175801a4ef0753354ddea5d Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 26 Mar 2025 13:21:57 +0100 Subject: [PATCH 09/19] EUCLIDMNGT-1275 Update help info --- astroquery/esa/euclid/core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index e550de82db..9dd54f5a33 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1351,7 +1351,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 2PCF #. 'DpdTwoPCFWLCOSEBIFilter': This product contains COSEBI filters #. 'DpdTwoPCFWLParamsCOSEBIShearShear2D': This product contains parameters to compute the - tomographic cosmic shear COSEBI modes NO en GUI + tomographic cosmic shear COSEBI modes. #. 'DpdTwoPCFWLParamsClPosPos2D': This product contains parameters to compute the tomographic angular power spectra. #. 'DpdTwoPCFWLParamsPEBPosShear2D': This product contains parameters to compute the @@ -1491,7 +1491,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'DpdLE3clMockGlueMatchParams': This product contains the input parameters for the mock glue-match pipeline #. 'DpdLE3clGlueMatchParams': This product contains the input parameters for the glue-match - pipeline. No en GUI + pipeline. #. GrpCOMB #. 'DpdLE3clCombConfigurationSet': Configuration information for COMB-CL pipelines #. 'DpdLE3clCombRedSheProf': Output Reduced shear profiles @@ -1528,7 +1528,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. GrpClustering #. 'DpdLE3clTwoPointAutoCorrPol': Cluster Clustering Two Point Correlation 2D polar data product #. 'DpdLE3clCovmatTwoPointCov2': Cluster Clustering Covariance Matrix 2PCF 2D polar data product - #. 'DpolDpdLE3clCovmatPKCov1': NO en GUI + #. 'DpolDpdLE3clCovmatPKCov1': #. 'DDpdLE3clPkDOA': #. 'DpdLE3clPkYam': Cluster Clustering Power Spectrum Yamamoto data product #. GrpLMF From a8c803e7112dd3c67820fe444d8d551e39f73de8 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Thu, 27 Mar 2025 10:25:05 +0100 Subject: [PATCH 10/19] EUCLIDMNGT-1275 Update variable names --- astroquery/esa/euclid/core.py | 39 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 9dd54f5a33..64717f890d 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1585,17 +1585,16 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No if group is not None: try: - _ = conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category][group] + product_type_for_category_group_list = conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category][ + group] except KeyError: raise ValueError( f"Invalid combination of parameters: category={category}; group={group}. Valid " f"values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") - product_type_for_category_list = conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category][group] - if product_type is not None: - if product_type not in product_type_for_category_list: + if product_type not in product_type_for_category_group_list: raise ValueError( f"Invalid combination of parameters: category={category}; group={group}; " f"product_type={product_type}. Valid values:\n " @@ -1604,16 +1603,16 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No query_extra_condition = query_extra_condition + f" AND product_type ='{product_type}' " else: - final_products = ', '.join(f"'{w}'" for w in product_type_for_category_list) + final_products = ', '.join(f"'{w}'" for w in product_type_for_category_group_list) query_extra_condition = query_extra_condition + f" AND product_type IN ({final_products}) " else: # category is not None and group is None - product_type_for_category_list = [item for row in - conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category].values() - for item in row] + product_type_for_category_group_list = [item for row in + conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[category] + .values() for item in row] if product_type is not None: - if product_type not in product_type_for_category_list: + if product_type not in product_type_for_category_group_list: raise ValueError( f"Invalid combination of parameters: category={category}; product_type={product_type}." f" Valid values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") @@ -1621,18 +1620,18 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No query_extra_condition = query_extra_condition + f" AND product_type = '{product_type}' " else: # category is not None and group is None and product_type is None - final_products = ', '.join(f"'{w}'" for w in product_type_for_category_list) + final_products = ', '.join(f"'{w}'" for w in product_type_for_category_group_list) query_extra_condition = query_extra_condition + f" AND product_type IN ({final_products}) " else: # category is None - category_group_dict = {} + all_groups_dict = {} for i in conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS.keys(): - category_group_dict.update(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[i]) + all_groups_dict.update(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS[i]) if group is not None: try: - _ = category_group_dict[group] + _ = all_groups_dict[group] except KeyError: raise ValueError( f"Invalid combination of parameters: group={group}. Valid values:\n " @@ -1640,7 +1639,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No if product_type is not None: - if product_type not in category_group_dict[group]: + if product_type not in all_groups_dict[group]: raise ValueError( f"Invalid combination of parameters: group={group}; product_type={product_type}. Valid " f"values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") @@ -1648,18 +1647,18 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No query_extra_condition = query_extra_condition + f" AND product_type = '{product_type}' " else: # product_type is None - product_type_for_category_list = [element for sublist in category_group_dict.values() for element in - sublist] - final_products = ', '.join(f"'{w}'" for w in product_type_for_category_list) + product_type_for_category_group_list = [element for sublist in all_groups_dict.values() for element + in sublist] + final_products = ', '.join(f"'{w}'" for w in product_type_for_category_group_list) query_extra_condition = query_extra_condition + f" AND product_type IN ({final_products}) " else: # category is None and group is None - product_type_for_category_list = [element for sublist in category_group_dict.values() for element in - sublist] + product_type_for_category_group_list = [element for sublist in all_groups_dict.values() for element + in sublist] if product_type is not None: - if product_type not in product_type_for_category_list: + if product_type not in product_type_for_category_group_list: raise ValueError( f"Invalid combination of parameters: product_type={product_type}. Valid values:\n " f"{pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") From 3eec15bf764edd2f3e8ae85dfa5b302e8ba2c1d0 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Fri, 28 Mar 2025 11:00:56 +0100 Subject: [PATCH 11/19] EUCLIDMNGT-1275 merge categories 'SEL 'Wide Post-recon' and 'SEL Wide Pre-recon', into 'SEL Wide' --- astroquery/esa/euclid/__init__.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/astroquery/esa/euclid/__init__.py b/astroquery/esa/euclid/__init__.py index 94e8e2d675..bd3d0019ca 100644 --- a/astroquery/esa/euclid/__init__.py +++ b/astroquery/esa/euclid/__init__.py @@ -61,12 +61,11 @@ class Conf(_config.ConfigNamespace): VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS = { 'Clusters of Galaxies': { - 'GrpCatalog': ['DpdLE3clAmicoAux', 'DpdLE3clAMICOModel', 'DpdLE3clAssociations', 'DpdLE3clCatMergeParams', - 'DpdLE3clCATParams', 'DpdLE3clCcpInputParams', 'DpdLE3clDetClusters', - 'DpdLE3clDetInputParams', 'DpdLE3clDetMergeParams', 'DpdLE3clDetOnMockParams', - 'DpdLE3clGlueMatchParams', 'DpdLE3clMockGlueMatchParams', 'DpdLE3clPzwavAux', - 'DpdLE3clPZWAVDensity', 'DpdLE3clRichMembers', 'DpdLE3clZClParams', 'DpdLE3FullDet', - 'DpdLE3clMockGlueMatchParams'], + 'GrpCatalog': ['DpdLE3clAMICOModel', 'DpdLE3clDetMergeParams', 'DpdLE3clDetOnMockParams', + 'DpdLE3clDetInputParams', 'DpdLE3clAmicoAux', 'DpdLE3clAssociations', 'DpdLE3clPzwavAux', + 'DpdLE3clPZWAVDensity', 'DpdLE3clDetClusters', 'DpdLE3FullDet', 'DpdLE3clCatMergeParams', + 'DpdLE3clCATParams', 'DpdLE3clCcpInputParams', 'DpdLE3clRichMembers', 'DpdLE3clZClParams', + 'DpdLE3clGlueMatchParams', 'DpdLE3clMockGlueMatchParams'], 'GrpClustering': ['DDpdLE3clPkDOA', 'DpdLE3clCovmatTwoPointCov2', 'DpdLE3clPkYam', 'DpdLE3clTwoPointAutoCorrPol', 'DpolDpdLE3clCovmatPKCov1'], 'GrpCOMB': ['DpdLE3clCombConfigurationSet', 'DpdLE3clCombCovMatDeltaSigmaCosmoDep', @@ -97,8 +96,7 @@ class Conf(_config.ConfigNamespace): 'Internal Data Products': { 'SEL Config/Stats': ['DpdLE3IDSELConfigurationSet', 'DpdLE3IDSELIDStatistics'], 'SEL Wide Main': ['DpdLE3IDSELIDCatalog'], - 'SEL Wide Post-recon': ['DpdLE3IDSELIDSubsampledCatalog'], - 'SEL Wide Pre-recon': [], + 'SEL Wide': ['DpdLE3IDSELIDSubsampledCatalog'], 'VMSP Group': ['DpdLE3IDVMSPConfiguration', 'DpdLE3IDVMSPDetectionModel', 'DpdLE3IDVMSPDistModel', 'DpdLE3IDVMSPRandomCatalog']}, 'Weak Lensing Products': { From 80901c24a13ff094ef77d6b52f23239a3436b31f Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 7 May 2025 11:38:36 +0200 Subject: [PATCH 12/19] EUCLIDMNGT-1275 final changes from the archive scientists --- astroquery/esa/euclid/core.py | 14 ++--- astroquery/esa/euclid/tests/test_euclidtap.py | 54 +++++++++---------- docs/esa/euclid/euclid.rst | 10 ++++ 3 files changed, 45 insertions(+), 33 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 64717f890d..ff92b7d810 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1277,8 +1277,8 @@ def get_datalinks(self, ids, *, linking_parameter='SOURCE_ID', verbose=False): return self.__eucliddata.get_datalinks(ids=ids, linking_parameter=linking_parameter, verbose=verbose) - def get_scientific_data_product_list(self, *, observation_id=None, tile_index=None, category=None, group=None, - product_type=None, dataset_release='LEVEL_3_RELEASE', verbose=False): + def get_scientific_product_list(self, *, observation_id=None, tile_index=None, category=None, group=None, + product_type=None, dataset_release='REGREPROC1_R2', verbose=False): """ Gets the LE3 products (the high-level science data products). Please note that not all combinations of category, group, and product_type are valid. @@ -1308,6 +1308,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'SEL Config/Stats' #. External Data Products #. 'LE3-ED configuration catalog' + #. 'LE3-ED match catalog' #. Weak Lensing Products #. '2PCF' #. 'PK' @@ -1346,6 +1347,7 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. External Data Products #. LE3-ED configuration catalog #. 'DpdLE3edConfigurationFile': LE3-ED configuration catalog + #. LE3-ED match catalog # #. 'DpdLE3edMatchedCatalog': LE3-ED match catalog #. Weak Lensing Products #. 2PCF @@ -1442,8 +1444,8 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'DpdLE3gcTwoPointRecCrossCorrPol': 2D Polar [Post-reconstruction 2D Polar and Multipole Cross-correlation Product] #. 3PCF_BK - #. 'DpdLE3gcThreePointAll': 3PCF Triplets “ALL” Product - #. 'DpdLE3gcThreePointSin': 3PCF Correlation “SINGLE” Product + #. 'DpdLE3gcThreePointAll': 3PCF Triplets "ALL" Product + #. 'DpdLE3gcThreePointSin': 3PCF Correlation "SINGLE" Product #. 'DpdLE3gcBkMonopole': Bispectrum Product Monopole #. 'DpdLE3gcBkMultipole': Bispectrum Product Multipoles #. CM-2PCF @@ -1544,14 +1546,14 @@ def get_scientific_data_product_list(self, *, observation_id=None, tile_index=No #. 'DpdReferenceSample': #. 'DpdTomographicBins': - dataset_release : str, mandatory. Default LEVEL_3_RELEASE + dataset_release : str, mandatory. Default REGREPROC1_R2 Data release from which data should be taken. verbose : bool, optional, default 'False' flag to display information about the process Returns ------- - A table object + The list of products (astropy.table) """ diff --git a/astroquery/esa/euclid/tests/test_euclidtap.py b/astroquery/esa/euclid/tests/test_euclidtap.py index 83c6f981bd..9366fba551 100644 --- a/astroquery/esa/euclid/tests/test_euclidtap.py +++ b/astroquery/esa/euclid/tests/test_euclidtap.py @@ -1060,42 +1060,42 @@ def test_get_scientific_data_product_list(): euclid = EuclidClass(tap_plus_conn_handler=conn_handler, datalink_handler=tap_plus, show_server_messages=False) - results = euclid.get_scientific_data_product_list(observation_id=11111) + results = euclid.get_scientific_product_list(observation_id=11111) assert results is not None, "Expected a valid table" - results = euclid.get_scientific_data_product_list(tile_index=11111) + results = euclid.get_scientific_product_list(tile_index=11111) assert results is not None, "Expected a valid table" - results = euclid.get_scientific_data_product_list(category='Clusters of Galaxies', group='GrpCatalog', - product_type='DpdLE3clAmicoAux') + results = euclid.get_scientific_product_list(category='Clusters of Galaxies', group='GrpCatalog', + product_type='DpdLE3clAmicoAux') assert results is not None, "Expected a valid table" - results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF', - product_type='DpdCovarTwoPCFWLClPosPos2D') + results = euclid.get_scientific_product_list(category='Weak Lensing Products', group='2PCF', + product_type='DpdCovarTwoPCFWLClPosPos2D') assert results is not None, "Expected a valid table" - results = euclid.get_scientific_data_product_list(category='Weak Lensing Products') + results = euclid.get_scientific_product_list(category='Weak Lensing Products') assert results is not None, "Expected a valid table" - results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF') + results = euclid.get_scientific_product_list(category='Weak Lensing Products', group='2PCF') assert results is not None, "Expected a valid table" - results = euclid.get_scientific_data_product_list(group='2PCF', product_type='DpdCovarTwoPCFWLClPosPos2D') + results = euclid.get_scientific_product_list(group='2PCF', product_type='DpdCovarTwoPCFWLClPosPos2D') assert results is not None, "Expected a valid table" - results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', - product_type='DpdCovarTwoPCFWLClPosPos2D') + results = euclid.get_scientific_product_list(category='Weak Lensing Products', + product_type='DpdCovarTwoPCFWLClPosPos2D') assert results is not None, "Expected a valid table" - results = euclid.get_scientific_data_product_list(product_type='DpdCovarTwoPCFWLClPosPos2D') + results = euclid.get_scientific_product_list(product_type='DpdCovarTwoPCFWLClPosPos2D') assert results is not None, "Expected a valid table" @@ -1104,43 +1104,43 @@ def test_get_scientific_data_product_list_exceptions(): eculid = EuclidClass() with pytest.raises(ValueError, match="Include a valid parameter to retrieve a LE3 product."): - eculid.get_scientific_data_product_list(observation_id=None, tile_index=None, category=None, group=None, - product_type=None) + eculid.get_scientific_product_list(observation_id=None, tile_index=None, category=None, group=None, + product_type=None) with pytest.raises(ValueError, match="The release is required."): - eculid.get_scientific_data_product_list(observation_id=11111, dataset_release=None) + eculid.get_scientific_product_list(observation_id=11111, dataset_release=None) with pytest.raises(ValueError, match="Incompatible: 'observation_id' and 'tile_id'. Use only one."): - eculid.get_scientific_data_product_list(observation_id=11111, tile_index=1234567) + eculid.get_scientific_product_list(observation_id=11111, tile_index=1234567) with pytest.raises(ValueError, match=r"Invalid combination of parameters: category=not_valid. *."): - eculid.get_scientific_data_product_list(observation_id=11111, category='not_valid') + eculid.get_scientific_product_list(observation_id=11111, category='not_valid') with pytest.raises(ValueError, match=r"Invalid combination of parameters: group=not_valid. *."): - eculid.get_scientific_data_product_list(observation_id=11111, group='not_valid') + eculid.get_scientific_product_list(observation_id=11111, group='not_valid') with pytest.raises(ValueError, match=r"Invalid combination of parameters: product_type=not_valid. *."): - eculid.get_scientific_data_product_list(observation_id=11111, product_type='not_valid') + eculid.get_scientific_product_list(observation_id=11111, product_type='not_valid') with pytest.raises(ValueError, match=r"Invalid combination of parameters: category=Clusters of Galaxies. *."): - eculid.get_scientific_data_product_list(observation_id=11111, category='Clusters of Galaxies', - group='not_valid') + eculid.get_scientific_product_list(observation_id=11111, category='Clusters of Galaxies', + group='not_valid') with pytest.raises(ValueError, match=r"Invalid combination of parameters: category=Clusters of Galaxies; " r"group=GrpCatalog; product_type=not_valid. *."): - eculid.get_scientific_data_product_list(observation_id=11111, category='Clusters of Galaxies', - group='GrpCatalog', - product_type='not_valid') + eculid.get_scientific_product_list(observation_id=11111, category='Clusters of Galaxies', + group='GrpCatalog', + product_type='not_valid') with pytest.raises(ValueError, match=r"Invalid combination of parameters: category=Clusters of Galaxies; " r"product_type=not_valid. *."): - eculid.get_scientific_data_product_list(observation_id=11111, category='Clusters of Galaxies', - product_type='not_valid') + eculid.get_scientific_product_list(observation_id=11111, category='Clusters of Galaxies', + product_type='not_valid') with pytest.raises(ValueError, match=r"Invalid combination of parameters: group=GrpCatalog; product_type=not_valid. *."): - eculid.get_scientific_data_product_list(observation_id=11111, group='GrpCatalog', product_type='not_valid') + eculid.get_scientific_product_list(observation_id=11111, group='GrpCatalog', product_type='not_valid') @patch.object(TapPlus, 'login') diff --git a/docs/esa/euclid/euclid.rst b/docs/esa/euclid/euclid.rst index 5086dae77e..15ff9229ea 100644 --- a/docs/esa/euclid/euclid.rst +++ b/docs/esa/euclid/euclid.rst @@ -248,6 +248,12 @@ It is possible to retrieve LE3 data (scientific data) by observation_id or tile_ .. doctest-skip:: >>> from astroquery.esa.euclid import Euclid + >>> le3_product_list = Euclid.get_scientific_product_list(tile_index=102034414) + >>> print("Found", len(le3_product_list), "results") + Found 12 results + >>> print(le3_product_list) + + In the following example, for the LE3 Weak-Lensing data, we retrieve all the Tomographic Cosmic Shear Correlation products (2PCF TwoPCFWLShearShear2D): >>> le3_product_list = Euclid.get_scientific_data_product_list(tile_index=102034414) >>> print("Found", len(le3_product_list), "results") Found 12 results @@ -259,6 +265,10 @@ In the following example, for the LE3 Weak-Lensing data, we retrieve all the Tom .. doctest-skip:: >>> from astroquery.esa.euclid import Euclid + >>> results = euclid.get_scientific_product_list(category='Weak Lensing Products', group='2PCF', product_type='DpdTwoPCFWLShearShear2D') + >>> print("Found", len(le3_product_list), "results") + Found 12 results + >>> print(le3_product_list) >>> results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF', product_type='DpdTwoPCFWLShearShear2D') >>> print("Found", len(le3_product_list), "results") Found 12 results From c813a39a5e252762ace93a53e101e61190319a31 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 7 May 2025 12:23:22 +0200 Subject: [PATCH 13/19] EUCLIDMNGT-1275 include PR reference --- CHANGES.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f6171ec9c2..22b2d99250 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -24,6 +24,12 @@ alma - Bug fix in ``footprint_to_reg`` that did not allow regions to be plotted. [#3285] +esa.euclid +^^^^^^^^^^ + +- New method, get_scientific_product_list, to retrieve scientific LE3 + products. [#3313] + gaia ^^^^ @@ -82,10 +88,10 @@ mast - Fix bug in ``utils.remove_duplicate_products`` that does not retain the order of the products in an input table. [#3314] -- Added ``return_uri_map`` parameter to ``Observations.get_cloud_uris`` to return a mapping of the input data product URIs +- Added ``return_uri_map`` parameter to ``Observations.get_cloud_uris`` to return a mapping of the input data product URIs to the returned cloud URIs. [#3314] -- Added ``verbose`` parameter to ``Observations.get_cloud_uris`` to control whether warnings are logged when a product cannot +- Added ``verbose`` parameter to ``Observations.get_cloud_uris`` to control whether warnings are logged when a product cannot be found in the cloud. [#3314] From b6cf5c05f558b09dcb8defcf7581f94876846d0c Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 7 May 2025 12:40:23 +0200 Subject: [PATCH 14/19] EUCLIDMNGT-1275 Fix codestyle: trailing whitespace --- astroquery/esa/euclid/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index ff92b7d810..5036dc0c7c 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1357,7 +1357,7 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c #. 'DpdTwoPCFWLParamsClPosPos2D': This product contains parameters to compute the tomographic angular power spectra. #. 'DpdTwoPCFWLParamsPEBPosShear2D': This product contains parameters to compute the - tomographic galaxy-galaxy lensing E/B power spectra. + tomographic galaxy-galaxy lensing E/B power spectra. #. 'DpdTwoPCFWLParamsPEBShearShear2D': This product contains parameters to compute the tomographic cosmic shear E/B power spectra. #. 'DpdTwoPCFWLParamsPosPos2D': Input parameters to compute tomographic angular 2PCF. From 386018f8cf12addad4bfa52e0606769080447456 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 7 May 2025 13:03:10 +0200 Subject: [PATCH 15/19] EUCLIDMNGT-1275 Remove duplicated information --- docs/esa/euclid/euclid.rst | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/docs/esa/euclid/euclid.rst b/docs/esa/euclid/euclid.rst index 15ff9229ea..c3b4775c14 100644 --- a/docs/esa/euclid/euclid.rst +++ b/docs/esa/euclid/euclid.rst @@ -253,12 +253,6 @@ It is possible to retrieve LE3 data (scientific data) by observation_id or tile_ Found 12 results >>> print(le3_product_list) - In the following example, for the LE3 Weak-Lensing data, we retrieve all the Tomographic Cosmic Shear Correlation products (2PCF TwoPCFWLShearShear2D): - >>> le3_product_list = Euclid.get_scientific_data_product_list(tile_index=102034414) - >>> print("Found", len(le3_product_list), "results") - Found 12 results - >>> print(le3_product_list) - In the following example, for the LE3 Weak-Lensing data, we retrieve all the Tomographic Cosmic Shear Correlation products (2PCF TwoPCFWLShearShear2D): .. Skipping authentication requiring examples @@ -269,10 +263,6 @@ In the following example, for the LE3 Weak-Lensing data, we retrieve all the Tom >>> print("Found", len(le3_product_list), "results") Found 12 results >>> print(le3_product_list) - >>> results = euclid.get_scientific_data_product_list(category='Weak Lensing Products', group='2PCF', product_type='DpdTwoPCFWLShearShear2D') - >>> print("Found", len(le3_product_list), "results") - Found 12 results - >>> print(le3_product_list) 1.2. Cone search From f74810e600265d5066a156cf82a8118b2d88acf6 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 7 May 2025 13:18:35 +0200 Subject: [PATCH 16/19] EUCLIDMNGT-1275 Fix indentation --- astroquery/esa/euclid/core.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 5036dc0c7c..7873e8014e 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1298,6 +1298,7 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c #. 'Galaxy Clustering Products' #. 'Clusters of Galaxies' #. 'PHZ' + group : str, optional, default None Available groups per category: @@ -1347,7 +1348,7 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c #. External Data Products #. LE3-ED configuration catalog #. 'DpdLE3edConfigurationFile': LE3-ED configuration catalog - #. LE3-ED match catalog # + #. LE3-ED match catalog #. 'DpdLE3edMatchedCatalog': LE3-ED match catalog #. Weak Lensing Products #. 2PCF @@ -1376,8 +1377,7 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c #. 'DpdCovarTwoPCFWLClPosPos2D': Covariance of Tomographic Angular Power Spectra #. 'DpdCovarTwoPCFWLCOSEBIShearShear2D': Covariance of Tomographic Cosmic Shear COSEBI #. 'DpdCovarTwoPCFWLPEBPosShear2D': Cov. of Tomo. Galaxy-Galaxy Lensing EB Power Spectra - #. 'DpdCovarTwoPCFWLPEBShearShear2D': Covariance of Tomographic Cosmic Shear EB Power - Spectra + #. 'DpdCovarTwoPCFWLPEBShearShear2D': Covariance of Tomographic Cosmic Shear EB Power Spectra #. 'DpdCovarTwoPCFWLPosPos2D': Covariance of Tomographic Angular Correlation #. 'DpdCovarTwoPCFWLPosShear2D': Cov. of Tomographic Galaxy-Galaxy Lensing Correlation #. 'DpdCovarTwoPCFWLShearShear2D': Covariance of Tomographic Cosmic Shear Correlation @@ -1455,7 +1455,7 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c Cartesian 2PCF Product] #. 'DpdLE3gcCovmatTwoPointCov2Dpol': Output - 2D Polar [Covariance Matrix of the 2D Polar 2PCF Product] - #. 'DpdLE3gcCovmatTwoPointCovMu': Output - Covariance Matrix of the Multipoles 0,1,2,3, + #. 'DpdLE3gcCovmatTwoPointCovMu': Output - Covariance Matrix of the Multipoles 0, 1, 2, 3, 4 2PCF Product #. 'DpdLE3gcCovmatTwoPointCovPro': Output - Projected [Covariance Matrix of the Projected 2PCF Product] From 5e25fe921b85f5431408e089bc18e2c55a175054 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Wed, 7 May 2025 20:31:36 +0200 Subject: [PATCH 17/19] EUCLIDMNGT-1275 Include changes suggested by the astroquery team --- astroquery/esa/euclid/core.py | 4 ++-- docs/esa/euclid/euclid.rst | 32 +++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 7873e8014e..e6c7b09ffe 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -780,7 +780,7 @@ def __get_tile_catalogue_list(self, *, tile_index, product_type, verbose=False): Returns ------- - The list of products (astropy.table) + The products in an astropy.table.Table """ if tile_index is None: @@ -1553,7 +1553,7 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c Returns ------- - The list of products (astropy.table) + The products in an astropy.table.Table """ diff --git a/docs/esa/euclid/euclid.rst b/docs/esa/euclid/euclid.rst index c3b4775c14..e1ebf3acbc 100644 --- a/docs/esa/euclid/euclid.rst +++ b/docs/esa/euclid/euclid.rst @@ -240,7 +240,7 @@ To get the list of products associated with a given Euclid observation_id or til EUC_MER_BGSUB-MOSAIC-DES-Z_TILE102018211-83C32F_20241018T143526.104818Z_00.00.fits 1398 102018211 DECAM DECAM_z SCIENCE SKY 57.9990741 -51.5 IMAGE -The method returns a list of products as an astropy.table. It is also possible to search by observation_id, but not by both parameters simultaneously. +The method returns a list of products as an `~astropy.table.Table`. It is also possible to search by observation_id, but not by both parameters simultaneously. It is possible to retrieve LE3 data (scientific data) by observation_id or tile_index (but not by both simultaneously) and/or for different categories, groups and product types: @@ -248,21 +248,31 @@ It is possible to retrieve LE3 data (scientific data) by observation_id or tile_ .. doctest-skip:: >>> from astroquery.esa.euclid import Euclid - >>> le3_product_list = Euclid.get_scientific_product_list(tile_index=102034414) - >>> print("Found", len(le3_product_list), "results") - Found 12 results - >>> print(le3_product_list) + >>> le3_product_list = Euclid.get_scientific_product_list(tile_index=22) + >>> print("Found", len(le3_product_list), "results") + Found 3 results + >>> print(le3_product_list) + basic_download_data_oid product_type product_id observation_id_list tile_index_list patch_id_list filter_name + ----------------------- -------------- ------------------------------------------------------------- ------------------- --------------- ------------- ----------- + 47191 DpdLE3clCLTile PPO_REGREPROC1_R2_CLTEST_R0_CLTILING_R5-output_tiles-27 {} {22} {} + 47132 DpdLE3clCLTile PPO_REGREPROC1_R2_CLTEST_R0_CLTILINGPOLYHR_R2-output_tiles-27 {} {22} {} + 47233 DpdLE3clCLTile PPO_REGREPROC1_R2_CLTEST_R0_CLTILING_R6-output_tiles-27 {} {22} {} -In the following example, for the LE3 Weak-Lensing data, we retrieve all the Tomographic Cosmic Shear Correlation products (2PCF TwoPCFWLShearShear2D): + +In the following example, for the Clusters of Galaxies category, and the group GrpCatalog, we retrieve all the DET-CL AMICO auxiliary Data Product products (DpdLE3clAmicoAux): .. Skipping authentication requiring examples .. doctest-skip:: >>> from astroquery.esa.euclid import Euclid - >>> results = euclid.get_scientific_product_list(category='Weak Lensing Products', group='2PCF', product_type='DpdTwoPCFWLShearShear2D') - >>> print("Found", len(le3_product_list), "results") - Found 12 results - >>> print(le3_product_list) + >>> results = euclid.get_scientific_product_list(category='Clusters of Galaxies', group='GrpCatalog', product_type='DpdLE3clAmicoAux') + >>> print("Found", len(le3_product_list), "results") + Found 2 results + >>> print(le3_product_list) + basic_download_data_oid product_type product_id observation_id_list tile_index_list patch_id_list filter_name + ----------------------- ---------------- ------------------------------------------------ ------------------- --------------- ------------- ----------- + 47257 DpdLE3clAmicoAux PPO_REGREPROC1_R2_CLTEST_R0_CLDET_R3-amico_aux-0 {} {} {} + 47258 DpdLE3clAmicoAux PPO_REGREPROC1_R2_CLTEST_R0_CLDET_R7-amico_aux-0 {} {} {} 1.2. Cone search @@ -690,7 +700,7 @@ To get the list of products associated with a given EUCLID observation_id or til EUC_MER_BGSUB-MOSAIC-DES-R_TILE102018211-1078B7_20241018T142927.232351Z_00.00.fits 1401 102018211 DECAM DECAM_r SCIENCE SKY 57.9990741 -51.5 IMAGE EUC_MER_BGSUB-MOSAIC-DES-Z_TILE102018211-83C32F_20241018T143526.104818Z_00.00.fits 1398 102018211 DECAM DECAM_z SCIENCE SKY 57.9990741 -51.5 IMAGE -The method returns a list of products as an astropy.table. +The method returns a list of products as an `~astropy.table.Table`. It is possible to download a product given its file name or product id: From 31e340463db7e505e2d588e2cdf4d737bd07d9d7 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Thu, 8 May 2025 09:20:30 +0200 Subject: [PATCH 18/19] EUCLIDMNGT-1275 Fix bug to retrieve data by group --- astroquery/esa/euclid/core.py | 7 +++---- astroquery/esa/euclid/tests/test_euclidtap.py | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index e6c7b09ffe..24f4512d4a 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -1647,11 +1647,10 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c f"values:\n {pprint.pformat(conf.VALID_LE3_PRODUCT_TYPES_CATEGORIES_GROUPS)}") query_extra_condition = query_extra_condition + f" AND product_type = '{product_type}' " - else: # product_type is None + else: # group is not None and product_type is None - product_type_for_category_group_list = [element for sublist in all_groups_dict.values() for element - in sublist] - final_products = ', '.join(f"'{w}'" for w in product_type_for_category_group_list) + product_type_for_group_list = all_groups_dict[group] + final_products = ', '.join(f"'{w}'" for w in product_type_for_group_list) query_extra_condition = query_extra_condition + f" AND product_type IN ({final_products}) " else: # category is None and group is None diff --git a/astroquery/esa/euclid/tests/test_euclidtap.py b/astroquery/esa/euclid/tests/test_euclidtap.py index 9366fba551..5f8c2ff4bc 100644 --- a/astroquery/esa/euclid/tests/test_euclidtap.py +++ b/astroquery/esa/euclid/tests/test_euclidtap.py @@ -1082,6 +1082,10 @@ def test_get_scientific_data_product_list(): assert results is not None, "Expected a valid table" + results = euclid.get_scientific_product_list(group='GrpCatalog') + + assert results is not None, "Expected a valid table" + results = euclid.get_scientific_product_list(category='Weak Lensing Products', group='2PCF') assert results is not None, "Expected a valid table" From d140a90902622eb17e91d7b4f1fcae0dd49b86b4 Mon Sep 17 00:00:00 2001 From: Jorge Fernandez Hernandez Date: Fri, 9 May 2025 23:59:17 +0200 Subject: [PATCH 19/19] EUCLIDMNGT-1275 move the description of the method get_scientific_product_list to the documentation --- astroquery/esa/euclid/core.py | 270 ++----------------------------- docs/esa/euclid/euclid.rst | 16 +- docs/esa/euclid/table_values.csv | 135 ++++++++++++++++ 3 files changed, 165 insertions(+), 256 deletions(-) create mode 100644 docs/esa/euclid/table_values.csv diff --git a/astroquery/esa/euclid/core.py b/astroquery/esa/euclid/core.py index 24f4512d4a..aea9b1a227 100644 --- a/astroquery/esa/euclid/core.py +++ b/astroquery/esa/euclid/core.py @@ -473,6 +473,10 @@ def login(self, *, user=None, password=None, credentials_file=None, verbose=Fals file containing user and password in two lines verbose : bool, optional, default 'False' flag to display information about the process + + Returns + ------- + None """ try: log.info(f"Login to Euclid TAP server: {self._TapPlus__getconnhandler().get_host_url()}") @@ -504,6 +508,10 @@ def login_gui(self, verbose=False): ---------- verbose : bool, optional, default 'False' flag to display information about the process + + Returns + ------- + None """ try: log.info(f"Login to Euclid TAP server: {self._TapPlus__getconnhandler().get_host_url()}") @@ -541,6 +549,11 @@ def logout(self, verbose=False): ---------- verbose : bool, optional, default 'False' flag to display information about the process + + Returns + ------- + None + """ try: super().logout(verbose=verbose) @@ -1281,7 +1294,8 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c product_type=None, dataset_release='REGREPROC1_R2', verbose=False): """ Gets the LE3 products (the high-level science data products). - Please note that not all combinations of category, group, and product_type are valid. + Please note that not all combinations of category, group, and product_type are valid. Check the available values + in https://astroquery.readthedocs.io/en/latest/esa/euclid/euclid.html#appendix Parameters ---------- @@ -1290,262 +1304,8 @@ def get_scientific_product_list(self, *, observation_id=None, tile_index=None, c tile_index: str, optional, default None. It is not compatible with parameter observation_id. category: str, optional, default None. - Available categories: - - #. 'Internal Data Products' - #. 'External Data Products' - #. 'Weak Lensing Products' - #. 'Galaxy Clustering Products' - #. 'Clusters of Galaxies' - #. 'PHZ' - group : str, optional, default None - Available groups per category: - - #. Internal Data Products - #. 'SEL Wide Main' - #. 'SEL Wide' - #. 'VMSP Group' - #. 'SEL Config/Stats' - #. External Data Products - #. 'LE3-ED configuration catalog' - #. 'LE3-ED match catalog' - #. Weak Lensing Products - #. '2PCF' - #. 'PK' - #. '2D-MASS' - #. Galaxy Clustering Products - #. '2PCF_PK' - #. '3PCF_BK' - #. 'CM-2PCF' - #. 'CM-PK' - #. Clusters of Galaxies - #. 'GrpCatalog' - #. 'GrpCOMB' - #. 'GrpSEL' - #. 'GrpClustering' - #. 'GrpLMF' - #. 'GrpTiling' - #. PHZ - #. 'PHZ' - product_type : str, optional, default None - Available product types per category and group: - - #. Internal Data Products - #. SEL Wide Main - #. 'DpdLE3IDSELIDCatalog' - #. SEL Wide - #. 'DpdLE3IDSELIDSubsampledCatalog': - #. VMSP Group - #. 'DpdLE3IDVMSPConfiguration': VMSP Configuration - #. 'DpdLE3IDVMSPDetectionModel': VMSP ID Detection Model - #. 'DpdLE3IDVMSPDistModel': VMSP Distribution Model - #. 'DpdLE3IDVMSPRandomCatalog': Random Catalog Product - #. SEL Config/Stats - #. 'DpdLE3IDSELIDStatistics': SEL-ID Purity and completeness statistics - #. 'DpdLE3IDSELConfigurationSet': SEL Configuration - #. External Data Products - #. LE3-ED configuration catalog - #. 'DpdLE3edConfigurationFile': LE3-ED configuration catalog - #. LE3-ED match catalog - #. 'DpdLE3edMatchedCatalog': LE3-ED match catalog - #. Weak Lensing Products - #. 2PCF - #. 'DpdTwoPCFWLCOSEBIFilter': This product contains COSEBI filters - #. 'DpdTwoPCFWLParamsCOSEBIShearShear2D': This product contains parameters to compute the - tomographic cosmic shear COSEBI modes. - #. 'DpdTwoPCFWLParamsClPosPos2D': This product contains parameters to compute the tomographic - angular power spectra. - #. 'DpdTwoPCFWLParamsPEBPosShear2D': This product contains parameters to compute the - tomographic galaxy-galaxy lensing E/B power spectra. - #. 'DpdTwoPCFWLParamsPEBShearShear2D': This product contains parameters to compute the - tomographic cosmic shear E/B power spectra. - #. 'DpdTwoPCFWLParamsPosPos2D': Input parameters to compute tomographic angular 2PCF. - #. 'DpdTwoPCFWLParamsPosShear2D': Input parameters to compute the tomographic galaxy-galaxy - lensing 2PCF. - #. 'DpdTwoPCFWLParamsShearShear2D': Input parameters to compute tomographic cosmic shear 2PCF. - #. 'DpdTwoPCFWLCOSEBIShearShear2D': Tomographic cosmic shear COSEBI modes. - #. 'DpdTwoPCFWLClPosPos2D': This product contains the tomographic angular power spectra - #. 'DpdTwoPCFWLPEBPosShear2D': Tomographic galaxy-galaxy lensing E/B power spectra - #. 'DpdTwoPCFWLPEBShearShear2D': Tomographic cosmic shear E/B power spectra. - #. 'DpdTwoPCFWLPosPos2D': Tomographic angular 2PCF. - #. 'DpdTwoPCFWLPosShear2D': Tomographic galaxy - galaxy lensing 2PCF. NO en GU - #. 'DpdTwoPCFWLShearShear2D': Tomographic cosmic shear 2PCF. NO en GU - #. 'DpdCovarTwoPCFWLParams': This product contains resampling parameters to compute the - covariance matrices. - #. 'DpdCovarTwoPCFWLClPosPos2D': Covariance of Tomographic Angular Power Spectra - #. 'DpdCovarTwoPCFWLCOSEBIShearShear2D': Covariance of Tomographic Cosmic Shear COSEBI - #. 'DpdCovarTwoPCFWLPEBPosShear2D': Cov. of Tomo. Galaxy-Galaxy Lensing EB Power Spectra - #. 'DpdCovarTwoPCFWLPEBShearShear2D': Covariance of Tomographic Cosmic Shear EB Power Spectra - #. 'DpdCovarTwoPCFWLPosPos2D': Covariance of Tomographic Angular Correlation - #. 'DpdCovarTwoPCFWLPosShear2D': Cov. of Tomographic Galaxy-Galaxy Lensing Correlation - #. 'DpdCovarTwoPCFWLShearShear2D': Covariance of Tomographic Cosmic Shear Correlation - #. 'DpdCovarTwoPCFWLResampleCOSEBIShearShear2D': This product contains a list of resampled - tomographic cosmic shear COSEBI modes. - #. 'DpdCovarTwoPCFWLResampleClPosPos2D': This product contains a list of resampled - tomographic angular power spectrum. - #. 'DpdCovarTwoPCFWLResamplePEBPosShear2D': This product contains a list of resampled - tomographic galaxy-galaxy lensing E/B power spectra. - #. 'DpdCovarTwoPCFWLResamplePEBShearShear2D': This product contains a list of resampled - tomographic cosmic shear E/B power spectra. - #. 'DpdCovarTwoPCFWLResamplePosPos2D': This product contains a list of resampled tomographic - galaxy-galaxy lensing correlation function. - #. 'DpdCovarTwoPCFWLResamplePosShear2D': This product contains a list of resampled - tomographic galaxy-galaxy lensing correlation function. - #. 'DpdCovarTwoPCFWLResampleShearShear2D': This product contains a list of resampled - tomographic cosmic shear 2PCF. - #. PK - #. 'DpdPKWLAlms': Data product that contains the alms generated by PK-WL. - #. 'DpdPKWLCovMatrix2D': This product contains the covariance matrix of angular power spectra. - #. 'DpdPKWLEstimate2D': This product contains the tomographic angular clustering power spectra. - #. 'DpdPKWLMaps': Data product that contains the FITS file with maps generated by PK-WL. - #. 'DpdPKWLMixingMatrix2D': This product contains the mixing matrix components. - #. 2D-MASS - #. 'DpdTwoDMassParamsConvergenceClusters': This product contains input parameters to compute - the 2D convergence maps for clusters studies. - #. 'DpdTwoDMassParamsConvergencePatch': This product contains inputs to compute the 2D - convergence maps for one or several patches. - #. 'DpdTwoDMassParamsConvergencePatchesToSphere': This product contains inputs to compute the - 2D convergence maps on the sphere. - #. 'DpdTwoDMassParamsConvergenceSphere': This product contains inputs to compute the 2D - convergence maps on the sphere. - #. 'DpdTwoDMassParamsPeakCatalogConvergence': This product contains inputs to perform peak - counting on a convergence map. - #. 'DpdTwoDMassParamsPeakCatalogMassAperture': This product contains inputs to perform peak - counting on shear catalog for one or several patches - #. 'DpdTwoDMassConvergenceClusters': E/B Convergence Maps for Clusters - #. 'DpdTwoDMassConvergencePatchesToSphere': MultiPatch-Based E/B Convergence Maps for Large - field - #. 'DpdTwoDMassConvergencePatch': E/B Convergence Maps for Small Field - #. 'DpdTwoDMassConvergenceSphere': Spherical E/B Convergence Maps - #. 'DpdTwoDMassPeakCatalog': Peak Catalog - #. Galaxy Clustering Products - #. 2PCF_PK - #. 'DpdLE3gcPkCross': Cross [Power Spectrum Multipoles and Window Product] - #. 'DpdLE3gcPkDOA': DOA [Power Spectrum Multipoles, 2Dpolar, 2Dcart and Window Product] - #. 'DpdLE3gcPkYam': Yamamoto [Power Spectrum Multipoles and Window Product] - #. 'DpdLE3gcTwoPointAutoCorr': 1D [Angle-averaged Auto-correlation Product] - #. 'DpdLE3gcTwoPointAutoCorrCart': 2D Cartesian [2D Cartesian and Projected Auto-corr. Product] - #. 'DpdLE3gcTwoPointAutoCorrPol': 2D Polar [2D Polar and Multipole Auto-correlation Product] - #. 'DpdLE3gcTwoPointCrossCorr': 1D [Angle-averaged Cross-correlation Product] - #. 'DpdLE3gcTwoPointCrossCorrCart': 2D Cartesian [2D Cartesian and Projected Cross-corr. - Product] - #. 'DpdLE3gcTwoPointCrossCorrPol': 2D Polar [2D Polar and Multipole Cross-correlation Product] - #. 'DpdLE3gcTwoPointRecAutoCorr': 1D [Post-reconstruction Angle-averaged Auto-correlation - Product] - #. 'DpdLE3gcTwoPointRecAutoCorrCart': 2D Cartesian [Post-reconstruction 2D Cartesian and - Projected Auto-correlation Product] - #. 'DpdLE3gcTwoPointRecAutoCorrPol': 2D Polar [Post-reconstruction 2D Polar and Multipole - Auto-correlation Product] - #. 'DpdLE3gcTwoPointRecCrossCorr': 1D [Post-reconstruction Angle-averaged Cross-corr. Product] - #. 'DpdLE3gcTwoPointRecCrossCorrCart': 2D Cartesian [Post-reconstruction 2D Cartesian and - Projected Cross-correlation Product] - #. 'DpdLE3gcTwoPointRecCrossCorrPol': 2D Polar [Post-reconstruction 2D Polar and Multipole - Cross-correlation Product] - #. 3PCF_BK - #. 'DpdLE3gcThreePointAll': 3PCF Triplets "ALL" Product - #. 'DpdLE3gcThreePointSin': 3PCF Correlation "SINGLE" Product - #. 'DpdLE3gcBkMonopole': Bispectrum Product Monopole - #. 'DpdLE3gcBkMultipole': Bispectrum Product Multipoles - #. CM-2PCF - #. 'DpdLE3gcCovmatTwoPointCov1D': Output - 1D [Covariance Matrix of the Angle-averaged - Auto-correlation Product] - #. 'DpdLE3gcCovmatTwoPointCov2Dcart': Output - 2D cartesian [Covariance Matrix of the 2D - Cartesian 2PCF Product] - #. 'DpdLE3gcCovmatTwoPointCov2Dpol': Output - 2D Polar [Covariance Matrix of the 2D Polar - 2PCF Product] - #. 'DpdLE3gcCovmatTwoPointCovMu': Output - Covariance Matrix of the Multipoles 0, 1, 2, 3, - 4 2PCF Product - #. 'DpdLE3gcCovmatTwoPointCovPro': Output - Projected [Covariance Matrix of the Projected - 2PCF Product] - #. CM-PK - #. 'DpdLE3gcCovmatPKCov1D': Output - Covariance Matrix of the Power Spectrum 0, 1, 2, 3, - 4 multipoles Product - #. 'DpdLE3gcCovmatPKCov2Dcart': Output - Covariance Matrix of the Power Spectrum 2D Cartesian - Product - #. 'DpdLE3gcCovmatPKCov2Dpol': Output - Covariance Matrix of the Power Spectrum 2D Polar Product - #. Clusters of Galaxies - #. GrpCatalog - #. 'DpdLE3clAMICOModel': This product contains the Model for AMICO - #. 'DpdLE3clDetMergeParams': This product contains the input parameters for DET - #. 'DpdLE3clDetOnMockParams': This product contains the input parameters for DET_ON_MOCK - pipeline - #. 'DpdLE3clDetInputParams': This product contains the input parameters for DEt - #. 'DpdLE3clAmicoAux': DET-CL AMICO auxiliary Data Product - #. 'DpdLE3clAssociations': This output product contains the catalog of associations galaxy to - clusters - #. 'DpdLE3clPzwavAux': DET-CL PZWAV auxiliary Data Product - #. 'DpdLE3clPZWAVDensity': This output product contains the intermediate Product "Density - Map" from DET-CL/PZWAV - #. 'DpdLE3clDetClusters': This output product contains the catalog of candidate clusters from - DET-CL - #. 'DpdLE3FullDet': This output product contains the merged catalog of candidate clusters - #. 'DpdLE3clCatMergeParams': This product contains the input parameters for the merging in - CAT-CL - #. 'DpdLE3clCATParams': This product contains the configuration parameters for LE3 CAT-CL - #. 'DpdLE3clCcpInputParams': This product contains the input parameters for Cluster - Characterization Pipeline - #. 'DpdLE3clRichMembers': Galaxy Membership Output Product - #. 'DpdLE3clZClParams': This product contains the configuration parameters for LE3 Z-CL - #. 'DpdLE3clGlueMatchParams': This product contains the input parameters for the glue-match - pipeline - #. 'DpdLE3clMockGlueMatchParams': This product contains the input parameters for the mock - glue-match pipeline - #. 'DpdLE3clGlueMatchParams': This product contains the input parameters for the glue-match - pipeline. - #. GrpCOMB - #. 'DpdLE3clCombConfigurationSet': Configuration information for COMB-CL pipelines - #. 'DpdLE3clCombRedSheProf': Output Reduced shear profiles - #. 'DpdLE3clCombUCovRedSheProf': Output Uncertainty Covariance matrix of the reduced - #. 'DpdLE3clCombWLME': Output Weak lensing mass estimates - #. 'DpdLE3clCombCovMatDeltaSigmaCosmoDep': This output product contains the stacking - covariance matrix of the differential surface density derived with a cosmology dependent - binning. - #. 'DpdLE3clCombCovMatReducedShearCosmoDep': This output product contains the stacking - covariance matrix of the reduced shear derived with a cosmology dependent binning. - #. 'DpdLE3clCombCovMatReducedShearCosmoIndep': This output product contains the stacking - covariance matrix of the reduced shear derived with a cosmology independent binning. - #. 'DpdLE3clCombStackingCosmoDep': This output product contains the stacking cosmology - dependent binning. - #. 'DpdLE3clCombStackingCosmoInd': This output product contains the stacking cosmology - independent binning. - #. GrpSEL - #. 'DpdLE3clSelRandomParams': This output product contains the configuration parameters for - SEL-CL to create the random catalogue - #. 'DpdLE3clSelSelFuncInputParams': This product contains the input parameters for SEL SelFunc - #. 'DpdLE3clSelSinfoniaIniClMockInputParams': This product contains the input parameters for - SEL Sinfonia Cluster Mock pipeline - #. 'DpdLE3clSelSinfoniaMockInputParams': This product contains the input parameters for SEL - Sinfonia Mock pipeline - #. 'DpdLE3clSelSelFunc': This output product contains the selection function of the galaxy - cluster detections - #. 'DpdLE3clSinfoniaEllipticity': This output product contains the file for the ellipticity - #. 'DpdLE3clSelSubSample': Clusters Subsample Output Product - #. 'DpdLE3clRedshiftDistrib': Redshift distribution of detections - #. 'DpdLE3clSelRandom': Random for the CL clustering codes - #. 'DpdLE3clMatchForSelParams': This product contains the input parameters for the - match-for-sel pipeline - #. 'DpdLE3clMockClusters': This output product contains the catalog of mock clusters - #. GrpClustering - #. 'DpdLE3clTwoPointAutoCorrPol': Cluster Clustering Two Point Correlation 2D polar data product - #. 'DpdLE3clCovmatTwoPointCov2': Cluster Clustering Covariance Matrix 2PCF 2D polar data product - #. 'DpolDpdLE3clCovmatPKCov1': - #. 'DDpdLE3clPkDOA': - #. 'DpdLE3clPkYam': Cluster Clustering Power Spectrum Yamamoto data product - #. GrpLMF - #. 'DpdLE3clLMFParams': This product contains the configuration parameters for LE3 LMF-CL - #. 'DpdLE3clLMFOutput': This product contains the output for LE3_CL LMF PF - #. GrpTiling - #. 'DpdLE3clCLTile': This product contains the information describing a CL tile - #. 'DpdLE3clCommon': Common data product for CL - #. 'DpdLE3clConfigurationSet': Generic configuration information for CL PFs - #. PHZ - #. PHZ - #. 'DpdBinMeanRedshift': - #. 'DpdReferenceSample': - #. 'DpdTomographicBins': - dataset_release : str, mandatory. Default REGREPROC1_R2 Data release from which data should be taken. verbose : bool, optional, default 'False' diff --git a/docs/esa/euclid/euclid.rst b/docs/esa/euclid/euclid.rst index e1ebf3acbc..28383962f5 100644 --- a/docs/esa/euclid/euclid.rst +++ b/docs/esa/euclid/euclid.rst @@ -242,7 +242,9 @@ To get the list of products associated with a given Euclid observation_id or til The method returns a list of products as an `~astropy.table.Table`. It is also possible to search by observation_id, but not by both parameters simultaneously. -It is possible to retrieve LE3 data (scientific data) by observation_id or tile_index (but not by both simultaneously) and/or for different categories, groups and product types: +It is possible to retrieve LE3 data (scientific data) by observation_id or tile_index (but not by both simultaneously) and/or for different categories, groups and product types. The available values +for these parameters are summarized in section :ref:`appendix`. + .. Skipping authentication requiring examples .. doctest-skip:: @@ -1239,6 +1241,18 @@ A fits file is made if no file name is provided. .. _DataLink: https://www.ivoa.net/documents/DataLink/ +.. _appendix: + +======== +Appendix +======== + +The following table summarises the available values of the parameters of the method get_scientific_product_list. + +.. csv-table:: Valid values for the parameters of the method get_scientific_product_list + :file: table_values.csv + :header-rows: 1 + :widths: auto ============= Reference/API diff --git a/docs/esa/euclid/table_values.csv b/docs/esa/euclid/table_values.csv new file mode 100644 index 0000000000..4b8a6044b2 --- /dev/null +++ b/docs/esa/euclid/table_values.csv @@ -0,0 +1,135 @@ +category,group,product_type,description +'Internal Data Products','SEL Wide Main','DpdLE3IDSELIDCatalog', +'Internal Data Products','SEL Wide','DpdLE3IDSELIDSubsampledCatalog', +'Internal Data Products','VMSP Group','DpdLE3IDVMSPConfiguration',VMSP Configuration +'Internal Data Products','VMSP Group','DpdLE3IDVMSPDetectionModel',VMSP ID Detection Model +'Internal Data Products' ,'VMSP Group','DpdLE3IDVMSPDistModel',VMSP Distribution Model +'Internal Data Products','VMSP Group','DpdLE3IDVMSPRandomCatalog',Random Catalog Product +'Internal Data Products','SEL Config/Stats','DpdLE3IDSELIDStatistics',SEL-ID Purity and completeness statistics +'Internal Data Products','SEL Config/Stats','DpdLE3IDSELConfigurationSet',SEL Configuration +'Internal Data Products','External Data Products','LE3-ED configuration catalog',LE3-ED configuration catalog +'Internal Data Products','External Data Products','LE3-ED match catalog','DpdLE3edMatchedCatalog' +'Weak Lensing Products','2PCF','DpdTwoPCFWLCOSEBIFilter',This product contains COSEBI filters +'Weak Lensing Products','2PCF','DpdTwoPCFWLParamsCOSEBIShearShear2D',This product contains parameters to compute the +'Weak Lensing Products','2PCF','DpdTwoPCFWLParamsClPosPos2D',This product contains parameters to compute the tomographic +'Weak Lensing Products','2PCF','DpdTwoPCFWLParamsPEBPosShear2D',This product contains parameters to compute the +'Weak Lensing Products','2PCF','DpdTwoPCFWLParamsPEBShearShear2D',This product contains parameters to compute the +'Weak Lensing Products','2PCF','DpdTwoPCFWLParamsPosPos2D',Input parameters to compute tomographic angular 2PCF. +'Weak Lensing Products','2PCF','DpdTwoPCFWLParamsPosShear2D',Input parameters to compute the tomographic galaxy-galaxy lensing 2PCF. +'Weak Lensing Products','2PCF','DpdTwoPCFWLParamsShearShear2D',Input parameters to compute tomographic cosmic shear 2PCF. +'Weak Lensing Products','2PCF','DpdTwoPCFWLCOSEBIShearShear2D',Tomographic cosmic shear COSEBI modes. +'Weak Lensing Products','2PCF','DpdTwoPCFWLClPosPos2D',This product contains the tomographic angular power spectra +'Weak Lensing Products','2PCF','DpdTwoPCFWLPEBPosShear2D',Tomographic galaxy-galaxy lensing E/B power spectra +'Weak Lensing Products','2PCF','DpdTwoPCFWLPEBShearShear2D',Tomographic cosmic shear E/B power spectra. +'Weak Lensing Products','2PCF','DpdTwoPCFWLPosPos2D',Tomographic angular 2PCF. +'Weak Lensing Products','2PCF','DpdTwoPCFWLPosShear2D',Tomographic galaxy galaxy lensing 2PCF. +'Weak Lensing Products','2PCF','DpdTwoPCFWLShearShear2D',Tomographic cosmic shear 2PCF. +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLParams',This product contains resampling parameters to compute the covariance matrices. +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLClPosPos2D',Covariance of Tomographic Angular Power Spectra +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLCOSEBIShearShear2D',Covariance of Tomographic Cosmic Shear COSEBI +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLPEBPosShear2D',Cov. of Tomo. Galaxy-Galaxy Lensing EB Power Spectra +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLPEBShearShear2D',Covariance of Tomographic Cosmic Shear EB Power Spectra +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLPosPos2D',Covariance of Tomographic Angular Correlation +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLPosShear2D',Cov. of Tomographic Galaxy-Galaxy Lensing Correlation +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLShearShear2D',Covariance of Tomographic Cosmic Shear Correlation +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLResampleCOSEBIShearShear2D',This product contains a list of resampled tomographic cosmic shear COSEBI modes. +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLResampleClPosPos2D',This product contains a list of resampled tomographic angular power spectrum. +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLResamplePEBPosShear2D',This product contains a list of resampled tomographic galaxy-galaxy lensing E/B power spectra. +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLResamplePEBShearShear2D',This product contains a list of resampled tomographic cosmic shear E/B power spectra. +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLResamplePosPos2D',This product contains a list of resampled tomographic galaxy-galaxy lensing correlation function. +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLResamplePosShear2D',This product contains a list of resampled tomographic galaxy-galaxy lensing correlation function. +'Weak Lensing Products','2PCF','DpdCovarTwoPCFWLResampleShearShear2D',This product contains a list of resampled tomographic cosmic shear 2PCF. +'Weak Lensing Products','PK','DpdPKWLAlms',Data product that contains the alms generated by PK-WL. +'Weak Lensing Products','PK','DpdPKWLCovMatrix2D',This product contains the covariance matrix of angular power spectra. +'Weak Lensing Products','PK','DpdPKWLEstimate2D',This product contains the tomographic angular clustering power spectra. +'Weak Lensing Products','PK','DpdPKWLMaps',Data product that contains the FITS file with maps generated by PK-WL. +'Weak Lensing Products','PK','DpdPKWLMixingMatrix2D',This product contains the mixing matrix components. +'Weak Lensing Products','2D-MASS','DpdTwoDMassParamsConvergenceClusters',This product contains input parameters to compute the 2D convergence maps for clusters studies. +'Weak Lensing Products','2D-MASS','DpdTwoDMassParamsConvergencePatch',This product contains inputs to compute the 2D convergence maps for one or several patches. +'Weak Lensing Products','2D-MASS','DpdTwoDMassParamsConvergencePatchesToSphere',This product contains inputs to compute the 2D convergence maps on the sphere. +'Weak Lensing Products','2D-MASS','DpdTwoDMassParamsConvergenceSphere',This product contains inputs to compute the 2D convergence maps on the sphere. +'Weak Lensing Products','2D-MASS','DpdTwoDMassParamsPeakCatalogConvergence',This product contains inputs to perform peak counting on a convergence map. +'Weak Lensing Products','2D-MASS','DpdTwoDMassParamsPeakCatalogMassAperture',This product contains inputs to perform peak counting on shear catalog for one or several patches +'Weak Lensing Products','2D-MASS','DpdTwoDMassConvergenceClusters',E/B Convergence Maps for Clusters +'Weak Lensing Products','2D-MASS','DpdTwoDMassConvergencePatchesToSphere',MultiPatch-Based E/B Convergence Maps for Large field +'Weak Lensing Products','2D-MASS','DpdTwoDMassConvergencePatch',E/B Convergence Maps for Small Field +'Weak Lensing Products','2D-MASS','DpdTwoDMassConvergenceSphere',Spherical E/B Convergence Maps +'Weak Lensing Products','2D-MASS','DpdTwoDMassPeakCatalog',Peak Catalog +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcPkCross',Cross [Power Spectrum Multipoles and Window Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcPkDOA',"DOA [Power Spectrum Multipoles, 2Dpolar, 2Dcart and Window Product]" +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcPkYam',Yamamoto [Power Spectrum Multipoles and Window Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointAutoCorr',1D [Angle-averaged Auto-correlation Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointAutoCorrCart',2D Cartesian [2D Cartesian and Projected Auto-corr. Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointAutoCorrPol',2D Polar [2D Polar and Multipole Auto-correlation Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointCrossCorr',1D [Angle-averaged Cross-correlation Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointCrossCorrCart',2D Cartesian [2D Cartesian and Projected Cross-corr. Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointCrossCorrPol',2D Polar [2D Polar and Multipole Cross-correlation Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointRecAutoCorr',1D [Post-reconstruction Angle-averaged Auto-correlation Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointRecAutoCorrCart',2D Cartesian [Post-reconstruction 2D Cartesian and Projected Auto-correlation Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointRecAutoCorrPol',2D Polar [Post-reconstruction 2D Polar and Multipole Auto-correlation Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointRecCrossCorr',1D [Post-reconstruction Angle-averaged Cross-corr. Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointRecCrossCorrCart',2D Cartesian [Post-reconstruction 2D Cartesian and Projected Cross-correlation Product] +'Galaxy Clustering Products','2PCF_PK','DpdLE3gcTwoPointRecCrossCorrPol',2D Polar [Post-reconstruction 2D Polar and Multipole Cross-correlation Product] +'Galaxy Clustering Products','3PCF_BK','DpdLE3gcThreePointAll',3PCF Triplets "ALL" Product +'Galaxy Clustering Products','3PCF_BK','DpdLE3gcThreePointSin',3PCF Correlation "SINGLE" Product +'Galaxy Clustering Products','3PCF_BK','DpdLE3gcBkMonopole',Bispectrum Product Monopole +'Galaxy Clustering Products','3PCF_BK','DpdLE3gcBkMultipole',Bispectrum Product Multipoles +'Galaxy Clustering Products','CM-2PCF','DpdLE3gcCovmatTwoPointCov1D',"Output, 1D [Covariance Matrix of the Angle-averaged Auto-correlation Product]" +'Galaxy Clustering Products','CM-2PCF','DpdLE3gcCovmatTwoPointCov2Dcart',"Output, 2D cartesian [Covariance Matrix of the 2D Cartesian 2PCF Product]" +'Galaxy Clustering Products','CM-2PCF','DpdLE3gcCovmatTwoPointCov2Dpol',"Output, 2D Polar [Covariance Matrix of the 2D Polar 2PCF Product]" +'Galaxy Clustering Products','CM-2PCF','DpdLE3gcCovmatTwoPointCovMu',"Output, Covariance Matrix of the Multipoles 0, 1, 2, 3, 4 2PCF Product" +'Galaxy Clustering Products','CM-2PCF','DpdLE3gcCovmatTwoPointCovPro',"Output, Projected [Covariance Matrix of the Projected 2PCF Product]" +'Galaxy Clustering Products','CM-PK','DpdLE3gcCovmatPKCov1D',"Output, Covariance Matrix of the Power Spectrum 0, 1, 2, 3, 4 multipoles Product" +'Galaxy Clustering Products','CM-PK','DpdLE3gcCovmatPKCov2Dcart',"Output, Covariance Matrix of the Power Spectrum 2D Cartesian Product" +'Galaxy Clustering Products','CM-PK','DpdLE3gcCovmatPKCov2Dpol',"Output, Covariance Matrix of the Power Spectrum 2D Polar Product" +'Clusters of Galaxies','GrpCatalog,'DpdLE3clAMICOModel',This product contains the Model for AMICO +'Clusters of Galaxies','GrpCatalog,'DpdLE3clDetMergeParams',This product contains the input parameters for DET +'Clusters of Galaxies','GrpCatalog,'DpdLE3clDetOnMockParams',This product contains the input parameters for DET_ON_MOCK pipeline +'Clusters of Galaxies','GrpCatalog,'DpdLE3clDetInputParams',This product contains the input parameters for DEt +'Clusters of Galaxies','GrpCatalog,'DpdLE3clAmicoAux',DET-CL AMICO auxiliary Data Product +'Clusters of Galaxies','GrpCatalog,'DpdLE3clAssociations',This output product contains the catalog of associations galaxy to clusters +'Clusters of Galaxies','GrpCatalog,'DpdLE3clPzwavAux',DET-CL PZWAV auxiliary Data Product +'Clusters of Galaxies','GrpCatalog,'DpdLE3clPZWAVDensity',This output product contains the intermediate Product "Density Map" from DET-CL/PZWAV +'Clusters of Galaxies','GrpCatalog,'DpdLE3clDetClusters',This output product contains the catalog of candidate clusters from DET-CL +'Clusters of Galaxies','GrpCatalog,'DpdLE3FullDet',This output product contains the merged catalog of candidate clusters +'Clusters of Galaxies','GrpCatalog,'DpdLE3clCatMergeParams',This product contains the input parameters for the merging in CAT-CL +'Clusters of Galaxies','GrpCatalog,'DpdLE3clCATParams',This product contains the configuration parameters for LE3 CAT-CL +'Clusters of Galaxies','GrpCatalog,'DpdLE3clCcpInputParams',This product contains the input parameters for Cluster Characterization Pipeline +'Clusters of Galaxies','GrpCatalog,'DpdLE3clRichMembers',Galaxy Membership Output Product +'Clusters of Galaxies',GrpCatalog,'DpdLE3clZClParams',This product contains the configuration parameters for LE3 Z-CL +'Clusters of Galaxies','GrpCatalog,'DpdLE3clGlueMatchParams',This product contains the input parameters for the glue-match pipeline +'Clusters of Galaxies','GrpCatalog,'DpdLE3clMockGlueMatchParams',This product contains the input parameters for the mock glue-match pipeline +'Clusters of Galaxies','GrpCatalog','DpdLE3clGlueMatchParams',This product contains the input parameters for the glue-match pipeline. +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombConfigurationSet',Configuration information for COMB-CL pipelines +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombRedSheProf',Output Reduced shear profiles +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombUCovRedSheProf',Output Uncertainty Covariance matrix of the reduced +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombWLME',Output Weak lensing mass estimates +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombCovMatDeltaSigmaCosmoDep',This output product contains the stacking +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombCovMatReducedShearCosmoDep',This output product contains the stacking covariance matrix of the reduced shear derived with a cosmology dependent binning. +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombCovMatReducedShearCosmoIndep',This output product contains the stacking covariance matrix of the reduced shear derived with a cosmology independent binning. +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombStackingCosmoDep',This output product contains the stacking cosmology dependent binning. +'Clusters of Galaxies','GrpCOMB','DpdLE3clCombStackingCosmoInd',This output product contains the stacking cosmology independent binning. +'Clusters of Galaxies','GrpSEL','DpdLE3clSelRandomParams',This output product contains the configuration parameters for SEL-CL to create the random catalogue +'Clusters of Galaxies','GrpSEL','DpdLE3clSelSelFuncInputParams',This product contains the input parameters for SEL SelFunc +'Clusters of Galaxies','GrpSEL','DpdLE3clSelSinfoniaIniClMockInputParams',This product contains the input parameters for SEL Sinfonia Cluster Mock pipeline +'Clusters of Galaxies','GrpSEL','DpdLE3clSelSinfoniaMockInputParams',This product contains the input parameters for SEL Sinfonia Mock pipeline +'Clusters of Galaxies','GrpSEL','DpdLE3clSelSelFunc',This output product contains the selection function of the galaxy cluster detections +'Clusters of Galaxies','GrpSEL','DpdLE3clSinfoniaEllipticity',This output product contains the file for the ellipticity +'Clusters of Galaxies','GrpSEL','DpdLE3clSelSubSample',Clusters Subsample Output Product +'Clusters of Galaxies','GrpSEL','DpdLE3clRedshiftDistrib',Redshift distribution of detections +'Clusters of Galaxies','GrpSEL','DpdLE3clSelRandom':,Random for the CL clustering codes +'Clusters of Galaxies','GrpSEL','DpdLE3clMatchForSelParams',This product contains the input parameters for the match-for-sel pipeline +'Clusters of Galaxies','GrpSEL','DpdLE3clMockClusters',This output product contains the catalog of mock clusters +'Clusters of Galaxies','GrpClustering','DpdLE3clTwoPointAutoCorrPol',Cluster Clustering Two Point Correlation 2D polar data product +'Clusters of Galaxies','GrpClustering','DpdLE3clCovmatTwoPointCov2',Cluster Clustering Covariance Matrix 2PCF 2D polar data product +'Clusters of Galaxies','GrpClustering','DpolDpdLE3clCovmatPKCov1', +'Clusters of Galaxies','GrpClustering','DDpdLE3clPkDOA', +'Clusters of Galaxies','GrpClustering','DpdLE3clPkYam',Cluster Clustering Power Spectrum Yamamoto data product +'Clusters of Galaxies','GrpLMF','DpdLE3clLMFParams',This product contains the configuration parameters for LE3 LMF-CL +'Clusters of Galaxies','GrpLMF','DpdLE3clLMFOutput',This product contains the output for LE3_CL LMF PF +'Clusters of Galaxies','GrpTiling','DpdLE3clCLTile',This product contains the information describing a CL tile +'Clusters of Galaxies','GrpTiling','DpdLE3clCommon',Common data product for CL +'Clusters of Galaxies','GrpTiling','DpdLE3clConfigurationSet',Generic configuration information for CL PFs +'PHZ','PHZ','DpdBinMeanRedshift', +'PHZ','PHZ','DpdReferenceSample', +'PHZ','PHZ','DpdTomographicBins', \ No newline at end of file