Skip to content
Snippets Groups Projects
Commit f9e0e4cf authored by James Catmore's avatar James Catmore
Browse files

Merge branch '21.2-reorganise-DAOD_PHYSVAL' into '21.2'

Adding protection to DAOD_PHYSVAL such that it doesn't crash on MC

See merge request atlas/athena!13949

Former-commit-id: 65260f6786b5e5e4990bf34dc74fce7318cecbdc
parents c9d144dd e9deba6f
No related merge requests found
...@@ -26,19 +26,23 @@ DerivationFrameworkJob += CfgMgr.DerivationFramework__DerivationKernel("PHYSVALK ...@@ -26,19 +26,23 @@ DerivationFrameworkJob += CfgMgr.DerivationFramework__DerivationKernel("PHYSVALK
OutputJets["PHYSVAL"] = ["AntiKtVR30Rmax4Rmin02TrackJets", OutputJets["PHYSVAL"] = ["AntiKtVR30Rmax4Rmin02TrackJets",
"AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets", "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets",
"AntiKt10TruthTrimmedPtFrac5SmallR20Jets",
"AntiKt4EMTopoLowPtJets", "AntiKt4EMTopoLowPtJets",
"AntiKt4LCTopoLowPtJets", "AntiKt4LCTopoLowPtJets",
"AntiKt4EMPFlowLowPtJets"] "AntiKt4EMPFlowLowPtJets"]
reducedJetList = [ "AntiKt10PV0TrackJets", reducedJetList = [ "AntiKt10PV0TrackJets",
"AntiKt4TruthWZJets",
"AntiKt10TruthJets",
"AntiKt10TruthWZJets",
"AntiKt10LCTopoJets", "AntiKt10LCTopoJets",
"AntiKt2PV0TrackJets", "AntiKt2PV0TrackJets",
"AntiKt4PV0TrackJets", "AntiKt4PV0TrackJets"]
"AntiKt4TruthJets"]
if (DerivationFrameworkIsMonteCarlo):
OutputJets["PHYSVAL"].append("AntiKt10TruthTrimmedPtFrac5SmallR20Jets")
reducedJetList.append("AntiKt4TruthWZJets")
reducedJetList.append("AntiKt10TruthJets")
reducedJetList.append("AntiKt10TruthWZJets")
reducedJetList.append("AntiKt4TruthJets")
replaceAODReducedJets(reducedJetList,DerivationFrameworkJob,"PHYSVAL") replaceAODReducedJets(reducedJetList,DerivationFrameworkJob,"PHYSVAL")
updateJVT_xAODColl("AntiKt4EMTopo") updateJVT_xAODColl("AntiKt4EMTopo")
addAntiKt4LowPtJets(DerivationFrameworkJob,"PHYSVAL") addAntiKt4LowPtJets(DerivationFrameworkJob,"PHYSVAL")
...@@ -63,8 +67,9 @@ FlavorTagInit(JetCollections = [ 'AntiKt4EMTopoJets','AntiKt4EMPFlowJets'], Seq ...@@ -63,8 +67,9 @@ FlavorTagInit(JetCollections = [ 'AntiKt4EMTopoJets','AntiKt4EMPFlowJets'], Seq
#==================================================================== #====================================================================
# Truth collections # Truth collections
#==================================================================== #====================================================================
from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents if (DerivationFrameworkIsMonteCarlo):
addStandardTruthContents() from DerivationFrameworkMCTruth.MCTruthCommon import addStandardTruthContents
addStandardTruthContents()
#==================================================================== #====================================================================
# SET UP STREAM # SET UP STREAM
......
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