diff --git a/src/DIRAC/Interfaces/API/Dirac.py b/src/DIRAC/Interfaces/API/Dirac.py index 0d3b936ba6f..4227267a005 100755 --- a/src/DIRAC/Interfaces/API/Dirac.py +++ b/src/DIRAC/Interfaces/API/Dirac.py @@ -219,7 +219,7 @@ def getInputDataCatalog(self, lfns, siteName="", fileName="pool_xml_catalog.xml" Example usage: >>> print(getInputDataCatalog('/lhcb/a/b/c/00001680_00000490_5.dst',None,'myCat.xml')) - {'Successful': {'': {'pfntype': 'ROOT_All', 'protocol': 'SRM2', + {'Successful': {'': {'pfntype': 'ROOT', 'protocol': 'SRM2', 'pfn': '', 'turl': '', 'guid': '3E3E097D-0AC0-DB11-9C0A-00188B770645', 'se': 'CERN-disk'}}, 'Failed': [], 'OK': True, 'Value': ''} diff --git a/src/DIRAC/Resources/Catalog/PoolXMLCatalog.py b/src/DIRAC/Resources/Catalog/PoolXMLCatalog.py index df26dad32a5..193425e147e 100755 --- a/src/DIRAC/Resources/Catalog/PoolXMLCatalog.py +++ b/src/DIRAC/Resources/Catalog/PoolXMLCatalog.py @@ -85,7 +85,7 @@ def addPfn(self, pfn, pfntype=None, se=None): if pfntype: self.pfns.append((pfn, pfntype, sename)) else: - self.pfns.append((pfn, "ROOT_All", sename)) + self.pfns.append((pfn, "ROOT", sename)) def toXML(self, metadata): """Output the contents as an XML string""" diff --git a/src/DIRAC/Resources/Catalog/PoolXMLFile.py b/src/DIRAC/Resources/Catalog/PoolXMLFile.py index a01ba3c26de..64332dc0399 100644 --- a/src/DIRAC/Resources/Catalog/PoolXMLFile.py +++ b/src/DIRAC/Resources/Catalog/PoolXMLFile.py @@ -84,7 +84,7 @@ def getType(fileNames, directory=""): for fname in fileNames: typeFile = str(catalog.getTypeByPfn(fname)) if not typeFile: - typeFile = "ROOT_All" + typeFile = "ROOT" generated.append(fname) pfnTypes[fname] = typeFile diff --git a/src/DIRAC/WorkloadManagementSystem/Client/InputDataResolution.py b/src/DIRAC/WorkloadManagementSystem/Client/InputDataResolution.py index f49ee11989b..640892a96cf 100644 --- a/src/DIRAC/WorkloadManagementSystem/Client/InputDataResolution.py +++ b/src/DIRAC/WorkloadManagementSystem/Client/InputDataResolution.py @@ -64,7 +64,7 @@ def execute(self): return resolvedInputData - def _createCatalog(self, resolvedInputData, catalogName="pool_xml_catalog.xml", pfnType="ROOT_All"): + def _createCatalog(self, resolvedInputData, catalogName="pool_xml_catalog.xml", pfnType="ROOT"): """By default uses PoolXMLSlice, VO extensions can modify at will""" resolvedData = resolvedInputData["Successful"]