Merge pull request #7566 from chrisburr/cherry-pick-2-a2785d8b1-integ…

…ration [sweep:integration] Replace ROOT_All with ROOT
DIRACGrid · Apr 15, 2024 · 9605803 · 9605803
2 parents d553d07 + 1ac5b63
commit 9605803
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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': {'<LFN>': {'pfntype': 'ROOT_All', 'protocol': 'SRM2',
+        {'Successful': {'<LFN>': {'pfntype': 'ROOT', 'protocol': 'SRM2',
          'pfn': '<PFN>', 'turl': '<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
@@ -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
@@ -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
@@ -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"]