From 6c5ce46a9205e4fbc0db2549d70ba848da7eb594 Mon Sep 17 00:00:00 2001
From: Goetz Gaycken <goetz.gaycken@cern.ch>
Date: Wed, 21 Feb 2018 22:23:59 +0100
Subject: [PATCH] Added TCC jets to HIGG5D1, HIGG2D4.
Also (re-consider) TCC jets in HIGG5D2 skimming (was disabled). Still have to
consider TCC jets in HIGG2D4 skimming.
Former-commit-id: 22997e34511d533c24f78b7873694d7769d938cd
---
.../python/HIGG5Common.py | 3 ++-
.../DerivationFrameworkHiggs/share/HIGG2D4.py | 23 ++++++++++++++++++-
.../DerivationFrameworkHiggs/share/HIGG5D1.py | 17 ++++++++++++++
.../DerivationFrameworkHiggs/share/HIGG5D2.py | 2 +-
4 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG5Common.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG5Common.py
index 0e9938f7464..88c02d05a66 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG5Common.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG5Common.py
@@ -14,6 +14,8 @@ def getHIGG5Common() :
("AntiKtVR30Rmax4Rmin02TrackJets.-JetConstitScaleMomentum_pt.-JetConstitScaleMomentum_eta.-JetConstitScaleMomentum_phi.-JetConstitScaleMomentum_m"
".-constituentLinks.-constituentWeight.-ConstituentScale"),
"AntiKt10LCTopoJets.GhostVR30Rmax4Rmin02TrackJet",
+ ("AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.pt.eta.phi.m.constituentLinks.JetConstitScaleMomentum_pt.JetConstitScaleMomentum_eta.JetConstitScaleMomentum_phi.JetConstitScaleMomentum_m"
+ ".Angularity.Aplanarity.DetectorEta.ECF1.ECF2.ECF3.FoxWolfram0.FoxWolfram2.GhostMuonSegmentCount.GhostTrackCount.KtDR.Parent.PlanarFlow.Qw.Split12.Split23.Tau1_wta.Tau2_wta.Tau3_wta.ZCut12"),
"BTagging_AntiKtVR30Rmax4Rmin02Track.MV2c10_discriminant",
"BTagging_AntiKt4EMTopo.MV2cl100_discriminant",
"CaloCalTopoClusters.CENTER_MAG.calE.calEta.calM.calPhi.calPt.e_sampl.etaCalo.eta_sampl.phiCalo.phi_sampl.rawE.rawEta.rawM.rawPhi",
@@ -265,4 +267,3 @@ def addJetOutputs(slimhelper,contentlist,smartlist=[],vetolist=[]):
if add_item :
dfjetlog.info( "Add full jet collection "+item )
slimhelper.AllVariables.append(item)
-
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py
index cdc5bc81965..dd341102560 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG2D4.py
@@ -51,6 +51,11 @@ thinningTools.append( HIGG5Common.getElectronTrackParticleThinning( 'HIGG2D4
thinningTools.append( HIGG5Common.getPhotonTrackParticleThinning( 'HIGG2D4',HIGG2D4ThinningHelper) )
thinningTools.append( HIGG5Common.getTauTrackParticleThinning( 'HIGG2D4',HIGG2D4ThinningHelper) )
thinningTools.append( HIGG5Common.getTauCaloClusterThinning( 'HIGG2D4',HIGG2D4ThinningHelper) )
+thinningTools.append( HIGG5Common.getAntiKt10LCTopoCaloClusterThinning( 'HIGG2D4',HIGG2D4ThinningHelper) )
+thinningTools.append( HIGG5Common.getTCCTrackParticleThinning( 'HIGG2D4',HIGG2D4ThinningHelper) )
+
+thinningTools.append( HIGG5Common.getAntiKt10LCTopoTrimmedPtFrac5SmallR20Thinning('HIGG2D4',HIGG2D4ThinningHelper) )
+thinningTools.append( HIGG5Common.getAntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Thinning('HIGG2D4',HIGG2D4ThinningHelper) )
# Truth particles
if DerivationFrameworkIsMonteCarlo:
@@ -169,6 +174,8 @@ SkimmingToolHIGG2D4_preLep = DerivationFramework__xAODStringSkimmingTool(name =
expression = leptonRequirement)
ToolSvc += SkimmingToolHIGG2D4_preLep
+# @TODO take TCC jets into account for skimming
+# jetSel = '|| (( count( (AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
from DerivationFrameworkHiggs.DerivationFrameworkHiggsConf import DerivationFramework__SkimmingToolHIGG2
SkimmingToolHIGG2D4 = DerivationFramework__SkimmingToolHIGG2(name = "SkimmingToolHIGG2D4",
FilterType = "2L2Q",
@@ -200,6 +207,8 @@ ToolSvc += SkimmingToolHIGG2D4
print SkimmingToolHIGG2D4
+
+
#=======================================
# CREATE PRIVATE SEQUENCE
#=======================================
@@ -232,6 +241,18 @@ if not "HIGG2D4Jets" in OutputJets:
if jetFlags.useTruth:
HIGG5Common.addTrimmedTruthWZJets(higg2d4Seq,'HIGG2D4Jets')
+ #=======================================
+ # TCC JETS
+ #=======================================
+ from DerivationFrameworkJetEtMiss.TCCReconstruction import runTCCReconstruction
+ # Set up geometry and BField
+ import AthenaCommon.AtlasUnixStandardJob
+
+ include("RecExCond/AllDet_detDescr.py")
+ runTCCReconstruction(higg2d4Seq, ToolSvc, "LCOriginTopoClusters", "InDetTrackParticles")
+ from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addTCCTrimmedJets
+ addTCCTrimmedJets(higg2d4Seq, "HIGG2D4Jets")
+
#====================================================================
# Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet
#====================================================================
@@ -250,7 +271,7 @@ from BTagging.BTaggingFlags import BTaggingFlags
BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtVR30Rmax4Rmin02Track,AntiKt4EMTopo"]
# Jet calibration should come after fat jets
-applyJetCalibration_xAODColl(jetalg="AntiKt4EMTopo", sequence=higg2d4Seq)
+# applyJetCalibration_xAODColl(jetalg="AntiKt4EMTopo", sequence=higg2d4Seq)
#====================================================================
# Add non-prompt lepton tagging
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py
index 5b255b14b2a..9214849385d 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D1.py
@@ -51,6 +51,11 @@ thinningTools.append( HIGG5Common.getElectronTrackParticleThinning( 'HIGG5D1
thinningTools.append( HIGG5Common.getPhotonTrackParticleThinning( 'HIGG5D1',HIGG5D1ThinningHelper) )
thinningTools.append( HIGG5Common.getTauTrackParticleThinning( 'HIGG5D1',HIGG5D1ThinningHelper) )
thinningTools.append( HIGG5Common.getTauCaloClusterThinning( 'HIGG5D1',HIGG5D1ThinningHelper) )
+thinningTools.append( HIGG5Common.getAntiKt10LCTopoCaloClusterThinning( 'HIGG5D1',HIGG5D1ThinningHelper) )
+thinningTools.append( HIGG5Common.getTCCTrackParticleThinning( 'HIGG5D1',HIGG5D1ThinningHelper) )
+
+thinningTools.append( HIGG5Common.getAntiKt10LCTopoTrimmedPtFrac5SmallR20Thinning('HIGG5D1',HIGG5D1ThinningHelper) )
+thinningTools.append( HIGG5Common.getAntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Thinning('HIGG5D1',HIGG5D1ThinningHelper) )
# MC truth thinning (not for data)
if DerivationFrameworkIsMonteCarlo :
@@ -63,6 +68,7 @@ jetSel = '(( count( (AntiKt4EMTopoJets.DFCommonJets_Calib_pt > 15.*GeV) && (abs(
jetSel += '|| (( count( (AntiKt4EMTopoJets.pt > 100.0*GeV) && (abs(AntiKt4EMTopoJets.eta) < 2.6) ) ) > 0)'
jetSel += '|| (( count( (AntiKt10LCTopoJets.pt > 100.0*GeV) && (abs(AntiKt10LCTopoJets.eta) < 2.6) ) ) > 0)'
jetSel += '|| (( count( (AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
+jetSel += '|| (( count( (AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
#====================================================================
# Trigger selection
@@ -201,6 +207,17 @@ if not "HIGG5D1Jets" in OutputJets:
if jetFlags.useTruth:
HIGG5Common.addTrimmedTruthWZJets(higg5d1Seq,'HIGG5D1Jets')
+ #=======================================
+ # TCC JETS
+ #=======================================
+ from DerivationFrameworkJetEtMiss.TCCReconstruction import runTCCReconstruction
+ # Set up geometry and BField
+ import AthenaCommon.AtlasUnixStandardJob
+
+ include("RecExCond/AllDet_detDescr.py")
+ runTCCReconstruction(higg5d1Seq, ToolSvc, "LCOriginTopoClusters", "InDetTrackParticles")
+ from DerivationFrameworkJetEtMiss.ExtendedJetCommon import addTCCTrimmedJets
+ addTCCTrimmedJets(higg5d1Seq, "HIGG5D1Jets")
#====================================================================
# Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py
index 630e51bcee6..f9b5a4cf6dc 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D2.py
@@ -75,7 +75,7 @@ jetSel = '(( count( (AntiKt4EMTopoJets.DFCommonJets_Calib_pt > 15.*GeV) && (abs(
jetSel += '|| (( count( (AntiKt4EMTopoJets.pt > 100.0*GeV) && (abs(AntiKt4EMTopoJets.eta) < 2.6) ) ) > 0)'
jetSel += '|| (( count( (AntiKt10LCTopoJets.pt > 100.0*GeV) && (abs(AntiKt10LCTopoJets.eta) < 2.6) ) ) > 0)'
jetSel += '|| (( count( (AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
-# jetSel += '|| (( count( (AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
+jetSel += '|| (( count( (AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.pt > 100.0*GeV) && (abs(AntiKt10TrackCaloClusterTrimmedPtFrac5SmallR20Jets.eta) < 2.6) ) ) > 0)'
#====================================================================
--
GitLab