From 6b26d0f25be0a127a40a0e6ca6a7d0ae2e24b4a1 Mon Sep 17 00:00:00 2001
From: Zach Marshall <ZLMarshall@lbl.gov>
Date: Tue, 19 Sep 2017 19:17:06 +0200
Subject: [PATCH] Using central tau truth matching tool
In the HIGG4DxAugmentation, we can now use the 'central' tau truth
matching setup, which turns some lines of redundant python into a simple
import. In the other Higgs derivations, they had some old lines that
had been commented out; removing these so that no one is ever tempted to
uncomment them (they should just use the central tool as well).
Former-commit-id: e553e29927cf9b205f0b65652a7f32ee948ceebe
---
.../python/HIGG4DxAugmentation.py | 25 ++++---------
.../DerivationFrameworkHiggs/share/HIGG2D4.py | 35 -------------------
.../DerivationFrameworkHiggs/share/HIGG5D1.py | 34 ------------------
.../DerivationFrameworkHiggs/share/HIGG5D2.py | 34 ------------------
.../DerivationFrameworkHiggs/share/HIGG5D3.py | 34 ------------------
.../DerivationFrameworkHiggs/share/HIGG6D1.py | 21 -----------
6 files changed, 6 insertions(+), 177 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxAugmentation.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxAugmentation.py
index 636f2f9abb8..0c25d6f6a01 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxAugmentation.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG4DxAugmentation.py
@@ -1,10 +1,10 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
#################################################
-# Common code used for the HIGG4 augmentation #
-# Z.Zinonos #
-# zenon@cern.ch #
-# Nov 2015 #
+# Common code used for the HIGG4 augmentation #
+# Z.Zinonos #
+# zenon@cern.ch #
+# Nov 2015 #
#################################################
from AthenaCommon.GlobalFlags import globalflags
@@ -74,21 +74,8 @@ def setup(HIGG4DxName, ToolSvc):
augmentationTools.append(HIGG4DxTauPVRefittingTool)
if DFisMC:
- # Tau truth matching
- from TauAnalysisTools.TauAnalysisToolsConf import TauAnalysisTools__TauTruthMatchingTool
- HIGG4DxTauTruthMatchingTool = TauAnalysisTools__TauTruthMatchingTool(name="HIGG4DxTauTruthMatchingTool",
- WriteTruthTaus = True)
-
- ToolSvc += HIGG4DxTauTruthMatchingTool
-
- # Tau truth matching wrapper
- from DerivationFrameworkTau.DerivationFrameworkTauConf import DerivationFramework__TauTruthMatchingWrapper
- HIGG4DxTauTruthMatchingWrapper = DerivationFramework__TauTruthMatchingWrapper( name = "HIGG4DxTauTruthMatchingWrapper",
- TauTruthMatchingTool = HIGG4DxTauTruthMatchingTool)
-
- ToolSvc += HIGG4DxTauTruthMatchingWrapper
- augmentationTools.append(HIGG4DxTauTruthMatchingWrapper)
-
+ # Tau truth matching - using the tau tools
+ from DerivationFrameworkTau.TauTruthCommon import *
#Tau Overlapping Electron LLH Decorator
from TauAnalysisTools.TauAnalysisToolsConf import TauAnalysisTools__TauOverlappingElectronLLHDecorator
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py
index 369d00ffa33..56e158c1c64 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py
@@ -308,41 +308,6 @@ applyJetCalibration_xAODColl(jetalg="AntiKt4EMTopo", sequence=higg2d4Seq)
import JetTagNonPromptLepton.JetTagNonPromptLeptonConfig as JetTagConfig
higg2d4Seq += JetTagConfig.GetDecoratePromptLeptonAlgs()
-
-
-# # Tau Truth matching
-# if DerivationFrameworkIsMonteCarlo:
-# TauTruthWrapperTools2d4 = []
-# from DerivationFrameworkTau.DerivationFrameworkTauConf import DerivationFramework__TauTruthMatchingWrapper
-# from TauAnalysisTools.TauAnalysisToolsConf import TauAnalysisTools__TauTruthMatchingTool
-# from RecExConfig.ObjKeyStore import objKeyStore
-# # Tau Truth making and matching
-# from MCTruthClassifier.MCTruthClassifierConf import MCTruthClassifier
-# TauTruthClassifier2d4 = MCTruthClassifier(name = "TauTruthClassifier2d4",
-# ParticleCaloExtensionTool="")
-# ToolSvc += TauTruthClassifier2d4
-# # Build the truth taus
-# from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__TruthCollectionMakerTau
-# TruthTauTool2d4 = DerivationFramework__TruthCollectionMakerTau(name = "TruthTauTool2d4",
-# NewCollectionName = "TruthTaus",
-# MCTruthClassifier = TauTruthClassifier2d4)
-# ToolSvc += TruthTauTool2d4
-# TauTruthWrapperTools2d4.append(TruthTauTool2d4)
-# if objKeyStore.isInInput( "xAOD::TauJetContainer", "TauJets" ):
-# TauTruthMatchingTool2d4 = TauAnalysisTools__TauTruthMatchingTool(name="TauTruthMatchingTool2d4")
-# ToolSvc += TauTruthMatchingTool2d4
-# TauTruthMatchingWrapper2d4 = DerivationFramework__TauTruthMatchingWrapper( name = "TauTruthMatchingWrapper2d4",
-# TauTruthMatchingTool = TauTruthMatchingTool2d4,
-# TauContainerName = "TauJets")
-# ToolSvc += TauTruthMatchingWrapper2d4
-# print TauTruthMatchingWrapper2d4
-# TauTruthWrapperTools2d4 += [TauTruthMatchingWrapper2d4]
-# higg2d4Seq += CfgMgr.DerivationFramework__DerivationKernel(
-# "HIGG2D4Kernel_aug",
-# AugmentationTools = TauTruthWrapperTools2d4
-# )
-
-
# Main selection
higg2d4Seq += CfgMgr.DerivationFramework__DerivationKernel(
"HIGG2D4Kernel",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py
index 83ebdec56cb..f13e57325a0 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py
@@ -327,40 +327,6 @@ import JetTagNonPromptLepton.JetTagNonPromptLeptonConfig as JetTagConfig
higg5d1Seq += JetTagConfig.GetDecoratePromptLeptonAlgs()
-
-# # Tau Truth matching
-# if DerivationFrameworkIsMonteCarlo:
-# TauTruthWrapperTools5d1 = []
-# from DerivationFrameworkTau.DerivationFrameworkTauConf import DerivationFramework__TauTruthMatchingWrapper
-# from TauAnalysisTools.TauAnalysisToolsConf import TauAnalysisTools__TauTruthMatchingTool
-# from RecExConfig.ObjKeyStore import objKeyStore
-# # Tau Truth making and matching
-# from MCTruthClassifier.MCTruthClassifierConf import MCTruthClassifier
-# TauTruthClassifier5d1 = MCTruthClassifier(name = "TauTruthClassifier5d1",
-# ParticleCaloExtensionTool="")
-# ToolSvc += TauTruthClassifier5d1
-# # Build the truth taus
-# from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__TruthCollectionMakerTau
-# TruthTauTool5d1 = DerivationFramework__TruthCollectionMakerTau(name = "TruthTauTool5d1",
-# NewCollectionName = "TruthTaus",
-# MCTruthClassifier = TauTruthClassifier5d1)
-# ToolSvc += TruthTauTool5d1
-# TauTruthWrapperTools5d1.append(TruthTauTool5d1)
-# if objKeyStore.isInInput( "xAOD::TauJetContainer", "TauJets" ):
-# TauTruthMatchingTool5d1 = TauAnalysisTools__TauTruthMatchingTool(name="TauTruthMatchingTool5d1")
-# ToolSvc += TauTruthMatchingTool5d1
-# TauTruthMatchingWrapper5d1 = DerivationFramework__TauTruthMatchingWrapper( name = "TauTruthMatchingWrapper5d1",
-# TauTruthMatchingTool = TauTruthMatchingTool5d1,
-# TauContainerName = "TauJets")
-# ToolSvc += TauTruthMatchingWrapper5d1
-# print TauTruthMatchingWrapper5d1
-# TauTruthWrapperTools5d1 += [TauTruthMatchingWrapper5d1]
-# higg5d1Seq += CfgMgr.DerivationFramework__DerivationKernel(
-# "HIGG5D1Kernel_aug",
-# AugmentationTools = TauTruthWrapperTools5d1
-# )
-
-
higg5d1Seq += CfgMgr.DerivationFramework__DerivationKernel(
"HIGG5D1Kernel_jet",
SkimmingTools = [HIGG5D1JetSkimmingTool]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py
index e160b19e517..79c5a93e129 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py
@@ -393,40 +393,6 @@ import JetTagNonPromptLepton.JetTagNonPromptLeptonConfig as JetTagConfig
higg5d2Seq += JetTagConfig.GetDecoratePromptLeptonAlgs()
-
-# # Tau Truth matching
-# if DerivationFrameworkIsMonteCarlo:
-# TauTruthWrapperTools5d2 = []
-# from DerivationFrameworkTau.DerivationFrameworkTauConf import DerivationFramework__TauTruthMatchingWrapper
-# from TauAnalysisTools.TauAnalysisToolsConf import TauAnalysisTools__TauTruthMatchingTool
-# from RecExConfig.ObjKeyStore import objKeyStore
-# # Tau Truth making and matching
-# from MCTruthClassifier.MCTruthClassifierConf import MCTruthClassifier
-# TauTruthClassifier5d2 = MCTruthClassifier(name = "TauTruthClassifier5d2",
-# ParticleCaloExtensionTool="")
-# ToolSvc += TauTruthClassifier5d2
-# # Build the truth taus
-# from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__TruthCollectionMakerTau
-# TruthTauTool5d2 = DerivationFramework__TruthCollectionMakerTau(name = "TruthTauTool5d2",
-# NewCollectionName = "TruthTaus",
-# MCTruthClassifier = TauTruthClassifier5d2)
-# ToolSvc += TruthTauTool5d2
-# TauTruthWrapperTools5d2.append(TruthTauTool5d2)
-# if objKeyStore.isInInput( "xAOD::TauJetContainer", "TauJets" ):
-# TauTruthMatchingTool5d2 = TauAnalysisTools__TauTruthMatchingTool(name="TauTruthMatchingTool5d2")
-# ToolSvc += TauTruthMatchingTool5d2
-# TauTruthMatchingWrapper5d2 = DerivationFramework__TauTruthMatchingWrapper( name = "TauTruthMatchingWrapper5d2",
-# TauTruthMatchingTool = TauTruthMatchingTool5d2,
-# TauContainerName = "TauJets")
-# ToolSvc += TauTruthMatchingWrapper5d2
-# print TauTruthMatchingWrapper5d2
-# TauTruthWrapperTools5d2 += [TauTruthMatchingWrapper5d2]
-# higg5d2Seq += CfgMgr.DerivationFramework__DerivationKernel(
-# "HIGG5D2Kernel_aug",
-# AugmentationTools = TauTruthWrapperTools5d2
-# )
-
-
higg5d2Seq += CfgMgr.DerivationFramework__DerivationKernel(
"HIGG5D2Kernel_jet",
SkimmingTools = [HIGG5D2JetSkimmingTool]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py
index 9a81fdb3508..30c658b71b5 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py
@@ -439,40 +439,6 @@ import JetTagNonPromptLepton.JetTagNonPromptLeptonConfig as JetTagConfig
higg5d3Seq += JetTagConfig.GetDecoratePromptLeptonAlgs()
-
-# # Tau Truth matching
-# if DerivationFrameworkIsMonteCarlo:
-# TauTruthWrapperTools5d3 = []
-# from DerivationFrameworkTau.DerivationFrameworkTauConf import DerivationFramework__TauTruthMatchingWrapper
-# from TauAnalysisTools.TauAnalysisToolsConf import TauAnalysisTools__TauTruthMatchingTool
-# from RecExConfig.ObjKeyStore import objKeyStore
-# # Tau Truth making and matching
-# from MCTruthClassifier.MCTruthClassifierConf import MCTruthClassifier
-# TauTruthClassifier5d3 = MCTruthClassifier(name = "TauTruthClassifier5d3",
-# ParticleCaloExtensionTool="")
-# ToolSvc += TauTruthClassifier5d3
-# # Build the truth taus
-# from DerivationFrameworkMCTruth.DerivationFrameworkMCTruthConf import DerivationFramework__TruthCollectionMakerTau
-# TruthTauTool5d3 = DerivationFramework__TruthCollectionMakerTau(name = "TruthTauTool5d3",
-# NewCollectionName = "TruthTaus",
-# MCTruthClassifier = TauTruthClassifier5d3)
-# ToolSvc += TruthTauTool5d3
-# TauTruthWrapperTools5d3.append(TruthTauTool5d3)
-# if objKeyStore.isInInput( "xAOD::TauJetContainer", "TauJets" ):
-# TauTruthMatchingTool5d3 = TauAnalysisTools__TauTruthMatchingTool(name="TauTruthMatchingTool5d3")
-# ToolSvc += TauTruthMatchingTool5d3
-# TauTruthMatchingWrapper5d3 = DerivationFramework__TauTruthMatchingWrapper( name = "TauTruthMatchingWrapper5d3",
-# TauTruthMatchingTool = TauTruthMatchingTool5d3,
-# TauContainerName = "TauJets")
-# ToolSvc += TauTruthMatchingWrapper5d3
-# print TauTruthMatchingWrapper5d3
-# TauTruthWrapperTools5d3 += [TauTruthMatchingWrapper5d3]
-# higg5d3Seq += CfgMgr.DerivationFramework__DerivationKernel(
-# "HIGG5D3Kernel_aug",
-# AugmentationTools = TauTruthWrapperTools5d3
-# )
-
-
DerivationFrameworkJob += higg5d3Seq
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D1.py
index 80a7d443c9e..9c1f303de27 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG6D1.py
@@ -48,27 +48,6 @@ HIGG6D1TauWrapper = DerivationFramework__TauSelectionWrapper(name = "HIGG6D1TauS
ToolSvc += HIGG6D1TauWrapper
augmentationTools.append(HIGG6D1TauWrapper)
-#=======================================
-# Tau truth matching tool
-#=======================================
-
-#truth matching
-#if is_MC:
-# from TauAnalysisTools.TauAnalysisToolsConf import TauAnalysisTools__TauTruthMatchingTool
-# HIGG6D1TauTruthMatchingTool = TauAnalysisTools__TauTruthMatchingTool(name="HIGG6D1TauTruthMatchingTool",
-# WriteTruthTaus = True)
-#
-#
-# ToolSvc += HIGG6D1TauTruthMatchingTool
-#
-# from DerivationFrameworkTau.DerivationFrameworkTauConf import DerivationFramework__TauTruthMatchingWrapper
-# HIGG6D1TauTruthMatchingWrapper = DerivationFramework__TauTruthMatchingWrapper( name = "HIGG6D1TauTruthMatchingWrapper",
-# TauTruthMatchingTool = HIGG6D1TauTruthMatchingTool,
-# TauContainerName = "TauJets")
-#
-# ToolSvc += HIGG6D1TauTruthMatchingWrapper
-# augmentationTools.append(HIGG6D1TauTruthMatchingWrapper)
-
#====================================================================
# MC selection
#====================================================================
--
GitLab