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

* share/skeleton.AODtoDPD_tf.py

	* share/skeleton.AODtoRED_tf.py
	* share/skeleton.ESDtoDPD_tf.py
	* share/skeleton.MergePool.py
	* share/skeleton.NTUPtoRED_tf.py
	* share/skeleton.PhysicsValidation_tf.py
	- Import common options from RecJobTransforms (not deprecated
	  from PATJobTransforms) to pickup new --valid flag properly
	* Tag as PATJobTransforms-00-05-45 (PATJobTransforms-00-05-45)
parent 12b75cc1
No related branches found
No related tags found
No related merge requests found
......@@ -88,7 +88,7 @@ def addDAODMergerSubsteps(executorSet):
DAODTypes = knownDAODTypes()
for DAOD in DAODTypes:
executorSet.add(hybridPOOLMergeExecutor(name = DAOD.lstrip("DAOD_") + 'Merge', skeletonFile = 'RecJobTransforms/skeleton.MergePool_tf.py',
inData = [DAOD], outData = [DAOD+'_MRG'], perfMonFile = 'ntuple_POOLMerge.pmon.gz', )
inData = [DAOD], outData = [DAOD+'_MRG'])
)
def knownDAODTypes():
......
# Skeleton file for AOD to DAOD (Reduction framework) job
#
# $Id: skeleton.AODtoDAOD_tf.py 632134 2014-11-29 12:28:25Z graemes $
# $Id: skeleton.AODtoDAOD_tf.py 664818 2015-05-04 19:20:22Z blumen $
#
from AthenaCommon.AlgSequence import AlgSequence
from AthenaCommon.Logging import logging
from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
msg = logging.getLogger('AODtoDAOD')
......@@ -57,9 +58,9 @@ passThroughMode = False
if hasattr(runArgs,"passThrough"):
passThroughMode = runArgs.passThrough
if (passThroughMode==True):
msg.warning("Pass through mode is ON: decision of derivation kernels will be IGNORED!")
rec.doDPD.passThroughMode = True
#if (passThroughMode==True):
# msg.warning("Pass through mode is ON: decision of derivation kernels will be IGNORED!")
# rec.doDPD.passThroughMode = True
## Pre-exec
if hasattr(runArgs,"preExec"):
......@@ -79,15 +80,17 @@ if hasattr(runArgs,"preInclude"):
if hasattr(runArgs,"topOptions"): include(runArgs.topOptions)
else: include( "RecExCommon/RecExCommon_topOptions.py" )
# Intervene and strip algs from streams if pass through mode requested
if rec.doDPD.passThroughMode:
# Intervene and strip SkimmingTools from algs if pass through mode requested
if passThroughMode:
seq = AlgSequence()
for stream in MSMgr.StreamList:
evtStream = stream.GetEventStream()
evtStream.AcceptAlgs = []
evtStream.RequireAlgs = []
evtStream.VetoAlgs = []
for alg in list( set(evtStream.AcceptAlgs) | set(evtStream.RequireAlgs) | set(evtStream.VetoAlgs) ):
for item in seq:
if item.name() == alg:
item.SkimmingTools = []
msgFresh = logging.getLogger('AODtoDAOD')
msgFresh.info( 'Pass through mode was requested. Stream definitions have been revised. New stream definitions follow')
msgFresh.info( 'Pass through mode was requested. Skimming tools have been removed from all kernels.')
MSMgr.Print()
......
......@@ -6,7 +6,7 @@
#==============================================================
#Common job options disable most RecExCommon by default. Re-enable below on demand.
include("PATJobTransforms/CommonSkeletonJobOptions.py")
include("RecJobTransforms/CommonRecoSkeletonJobOptions.py")
rec.doAOD=False
from AthenaCommon.Logging import logging
......
......@@ -12,7 +12,7 @@ else:
msg.error('AOD Reduction job started, but with no "reductionConf" array - aborting')
raise RuntimeError, "No reductions configured"
include("PATJobTransforms/CommonSkeletonJobOptions.py")
include("RecJobTransforms/CommonRecoSkeletonJobOptions.py")
## Automatically turn ON/OFF and set output file name of each possible DPD
listOfFlags=[]
......
......@@ -6,7 +6,7 @@
#==============================================================
#Common job options disable most RecExCommon by default. Re-enable below on demand.
include("PATJobTransforms/CommonSkeletonJobOptions.py")
include("RecJobTransforms/CommonRecoSkeletonJobOptions.py")
rec.doESD=False
from AthenaCommon.Logging import logging
recoLog = logging.getLogger('esd_to_dpd')
......
......@@ -5,7 +5,7 @@
#==============================================================
#Common job options disable most RecExCommon by default. Re-enable below on demand.
include("PATJobTransforms/CommonSkeletonJobOptions.py")
include("RecJobTransforms/CommonRecoSkeletonJobOptions.py")
rec.doAOD=False
rec.doESD=False
......
......@@ -10,7 +10,7 @@ from AthenaCommon.Logging import logging
msg = logging.getLogger('NTUP Reduction')
msg.info( '****************** STARTING NTUP Reduction *****************' )
include("PATJobTransforms/CommonSkeletonJobOptions.py")
include("RecJobTransforms/CommonRecoSkeletonJobOptions.py")
## Automatically turn ON/OFF and set output file name of each possible DPD
listOfFlags=[]
......
......@@ -8,7 +8,7 @@
# ==============================================================================
# Load your input file that you want to process
# ==============================================================================
include("PATJobTransforms/CommonSkeletonJobOptions.py")
include("RecJobTransforms/CommonRecoSkeletonJobOptions.py")
from AthenaCommon.Logging import logging
skelLog = logging.getLogger('PhysicsValidaiton')
......@@ -108,18 +108,6 @@ for validationType, enabled in validationDict.iteritems():
else:
skelLog.warning("Job options file for {0} ({1}) was not found in JOBOPTSEARCHPATH!".format(validationType, JOFile))
# Set up trigger for All tools
from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
tdt = Trig__TrigDecisionTool("TrigDecisionTool")
ToolSvc += tdt
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.configurationSourceList = ['ds']
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
cfg = TriggerConfigGetter("ReadPool")
## Pre-exec
if hasattr(runArgs,"preExec"):
skelLog.info("transform pre-exec")
......
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