diff --git a/PhysicsAnalysis/PATJobTransforms/share/skeleton.PhysicsValidation_tf.py b/PhysicsAnalysis/PATJobTransforms/share/skeleton.PhysicsValidation_tf.py index de3a07c2cd48a845c2f6f7b51c63b58fa2ce0e29..00261cdf8f96250e8c5bab764c535bcad9a043ed 100644 --- a/PhysicsAnalysis/PATJobTransforms/share/skeleton.PhysicsValidation_tf.py +++ b/PhysicsAnalysis/PATJobTransforms/share/skeleton.PhysicsValidation_tf.py @@ -148,3 +148,14 @@ if hasattr(runArgs,"postExec"): exec(cmd) +# Temporary (July 19) trigger additions +if TriggerFlags.doMT() or TriggerFlags.EDMDecodingVersion() == 3: + ToolSvc.TrigDecisionTool.NavigationFormat="TrigComposite"; + ToolSvc.TrigDecisionTool.TrigConfigSvc="Trig::TrigConfigSvc/TrigConfigSvc"; + ServiceMgr.TrigConfigSvc.PriorityList=["run3_dummy", "ds", "xml"] + from TrigConfigSvc.TrigConfigSvcConfig import (findFileInXMLPATH, LVL1ConfigSvc, L1TopoConfigSvc) + from AthenaConfiguration.AllConfigFlags import ConfigFlags + ServiceMgr += LVL1ConfigSvc("LVL1ConfigSvc") + ServiceMgr += L1TopoConfigSvc() + ServiceMgr.LVL1ConfigSvc.XMLMenuFile = findFileInXMLPATH(ConfigFlags.Trigger.LVL1ConfigFile.replace('newJO_', '')) + ServiceMgr.L1TopoConfigSvc.XMLMenuFile = findFileInXMLPATH(ConfigFlags.Trigger.LVL1TopoConfigFile) \ No newline at end of file diff --git a/Tools/Tier0ChainTests/test/test_q221_mt.sh b/Tools/Tier0ChainTests/test/test_q221_mt.sh index e0cd9c4d5495b9c87b6bc3501ba293780475bee0..3f0f16038f62f6d90089df844d7dee9e425e85bf 100755 --- a/Tools/Tier0ChainTests/test/test_q221_mt.sh +++ b/Tools/Tier0ChainTests/test/test_q221_mt.sh @@ -11,7 +11,7 @@ Reco_tf.py --AMI=q221 --athenaopts='--threads=1' --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --imf False echo "art-result: $? Reco" -Reco_tf.py --validationFlags 'doExample,doMET,doPFlow,doTau,doEgamma,doBtag,doZee,doJet,doTopoCluster,doMuon,doTrigMinBias,doTrigIDtrk,doTrigBphys,doTrigMET,doTrigJet,doTrigTau, doTrigEgamma,doTrigMuon,doTrigBjet,doTrigHLTResult' --inputAODFile=myAOD.pool.root --outputNTUP_PHYSVALFile=myNTUP_PHYSVAL.root +Reco_tf.py --validationFlags 'doExample,doMET,doPFlow,doTau,doEgamma,doBtag,doZee,doJet,doTopoCluster,doMuon,doTrigMinBias,doTrigIDtrk,doTrigBphys,doTrigMET,doTrigJet,doTrigTau, doTrigEgamma,doTrigMuon,doTrigBjet,doTrigHLTResult' --inputAODFile=myAOD.pool.root --outputNTUP_PHYSVALFile=myNTUP_PHYSVAL.root --preExec="TriggerFlags.EDMDecodingVersion.set_Value_and_Lock(3)" echo "art-result: $? PhysVal" ArtPackage=$1 diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh index 465b0503cf0736960b9579ad3048b4768ee81ea6..80d558c4da7553ae0f7030f0196600b00d135d44 100755 --- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh +++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_build.sh @@ -47,6 +47,7 @@ Reco_tf.py \ --inputAODFile=AOD.pool.root \ --outputNTUP_PHYSVALFile=NTUP_PHYSVAL.pool.root \ --validationFlags="${VALIDATIONFLAGS}" \ +--preExec="TriggerFlags.EDMDecodingVersion.set_Value_and_Lock(3)" \ >${JOB_LOG} 2>&1 ) 2>&1 diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_grid.sh index 6379f9cc5ded50f5b6fcd792e033919293651e5c..bd8c2b6104e198ced5bffbc5bc5e3e089b59d22d 100755 --- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_grid.sh +++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoPhysval_mt1_grid.sh @@ -54,6 +54,7 @@ Reco_tf.py \ --inputAODFile=AOD.pool.root \ --outputNTUP_PHYSVALFile=NTUP_PHYSVAL.pool.root \ --validationFlags="${VALIDATIONFLAGS}" \ +--preExec="TriggerFlags.EDMDecodingVersion.set_Value_and_Lock(3)" \ >${JOB_LOG} 2>&1 ) 2>&1