Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v8.0] Replace ROOT_All with ROOT #7561

Merged
merged 1 commit into from Apr 10, 2024
Merged

[v8.0] Replace ROOT_All with ROOT #7561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/DIRAC/Interfaces/API/Dirac.py
View file
Open in desktop
Expand Up @@ -402,7 +402,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': ''}

Expand Down
2 changes: 1 addition & 1 deletion src/DIRAC/Resources/Catalog/PoolXMLCatalog.py
View file
Open in desktop
Expand Up @@ -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"""
Expand Down
2 changes: 1 addition & 1 deletion src/DIRAC/Resources/Catalog/PoolXMLFile.py
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/DIRAC/WorkloadManagementSystem/Client/InputDataResolution.py
View file
Open in desktop
Expand Up @@ -68,7 +68,7 @@ def execute(self):

#############################################################################

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"]
Expand Down