Skip to content
Snippets Groups Projects
Commit 820faab7 authored by Graeme Stewart's avatar Graeme Stewart
Browse files

* python/PATTransformUtils.py

	- In addNTUPMergeSubsteps() also take Tier-0 NTUPs from trfArgs.getExtraDPDList
	* scripts/NTUPMerge_tf.py
	- Use trfArgs.addExtraDPDTypes to add extra NTUP file arguments
	* Tag as PATJobTransforms-00-05-42 (PATJobTransforms-00-05-42)
parent 255d72f3
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@ msg = msg.getChild(__name__)
import PyJobTransforms.trfArgClasses as trfArgClasses
from PyJobTransforms.trfExe import athenaExecutor
from PyJobTransforms.trfArgs import listKnownD3PDs
from PyJobTransforms.trfArgs import listKnownD3PDs, getExtraDPDList
from PyJobTransforms.trfExe import NTUPMergeExecutor, hybridPOOLMergeExecutor
def addPhysValidationFiles(parser):
......@@ -49,11 +49,16 @@ def appendPhysValidationSubstep(trf):
def addNTUPMergeSubsteps(executorSet):
# Ye olde NTUPs
try:
# 'Standard' D3PDs
inDataList, outDataList = listKnownD3PDs()
for (inData, outData) in iter(zip(inDataList, outDataList)):
executorSet.add(NTUPMergeExecutor(name='NTUPLEMerge'+inData.replace('_',''), exe='hadd', inData=[inData], outData=[outData], exeArgs=[]))
# Physics Validation NTUP
executorSet.add(NTUPMergeExecutor(name='NTUPLEMergePHYSVAL', exe='hadd', inData=['NTUP_PHYSVAL'], outData=['NTUP_PHYSVAL_MRG'], exeArgs=[]))
# Extra Tier-0 NTUPs
extraNTUPs = getExtraDPDList(NTUPOnly = True)
for ntup in extraNTUPs:
executorSet.add(NTUPMergeExecutor(name='NTUPLEMerge'+ntup.name.replace('_',''), exe='hadd', inData=[ntup.name], outData=[ntup.name+'_MRG'], exeArgs=[]))
except ImportError, e:
msg.warning("Failed to get D3PD lists - probably D3PDs are broken in this release: {0}".format(e))
......
......@@ -3,7 +3,7 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
## MergeNTUP_tf.py - NTUPLE merger
# @version $Id: NTUPMerge_tf.py 619356 2014-10-01 12:05:37Z graemes $
# @version $Id: NTUPMerge_tf.py 647214 2015-02-16 17:16:20Z graemes $
import sys
import time
......@@ -16,7 +16,7 @@ msg.info('logging set in %s' % sys.argv[0])
from PyJobTransforms.transform import transform
from PyJobTransforms.trfExe import athenaExecutor, NTUPMergeExecutor
from PyJobTransforms.trfArgs import addD3PDArguments
from PyJobTransforms.trfArgs import addD3PDArguments, addExtraDPDTypes
from PyJobTransforms.trfDecorators import stdTrfExceptionHandler, sigUsrStackTrace
from PATJobTransforms.PATTransformUtils import addNTUPMergeSubsteps, addPhysValidationMergeFiles
import PyJobTransforms.trfArgClasses as trfArgClasses
......@@ -45,6 +45,7 @@ def getTransform():
trf = transform(executor = executorSet)
addPhysValidationMergeFiles(trf.parser)
addD3PDArguments(trf.parser, transform=trf, addD3PDMRGtypes=True)
addExtraDPDTypes(trf.parser, transform=trf, NTUPMergerArgs = True)
return trf
if __name__ == '__main__':
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment