From 528c0c2a367b2cb33f20af564ec8f114165c99bc Mon Sep 17 00:00:00 2001
From: Samuel Van Stroud <sam.van.stroud@cern.ch>
Date: Tue, 5 Mar 2024 18:48:38 +0100
Subject: [PATCH] Add AntiKt4UFOCSSKJets and TauJets to FTAG1 smart slimming
Add AntiKt4UFOCSSKJets and TauJets to FTAG1 smart slimming
---
.../DerivationFrameworkCore/python/SlimmingHelper.py | 6 ++++++
.../DerivationFrameworkFlavourTag/python/BTaggingContent.py | 3 ++-
.../DerivationFrameworkFlavourTag/python/FTAG1.py | 5 ++++-
.../data/data_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt | 2 +-
.../data/mc_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt | 2 +-
5 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py
index 1b7be1cfcf97..14116e6e591c 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py
@@ -489,6 +489,12 @@ class SlimmingHelper:
elif collectionName=="AntiKtVR30Rmax4Rmin02PV0TrackJets":
from DerivationFrameworkJetEtMiss.AntiKtVR30Rmax4Rmin02PV0TrackJetsCPContent import AntiKtVR30Rmax4Rmin02PV0TrackJetsCPContent
items.extend(AntiKtVR30Rmax4Rmin02PV0TrackJetsCPContent)
+ elif collectionName=="BTagging_AntiKt4UFOCSSK":
+ from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
+ items.extend(BTaggingStandardContent("AntiKt4UFOCSSKJets", self.ConfigFlags))
+ elif collectionName=="BTagging_AntiKt4UFOCSSK_expert":
+ from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingExpertContent
+ items.extend(BTaggingExpertContent("AntiKt4UFOCSSKJets", self.ConfigFlags))
elif collectionName=="BTagging_AntiKt4EMPFlow":
from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
items.extend(BTaggingStandardContent("AntiKt4EMPFlowJets", self.ConfigFlags))
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py
index abfa825508bc..4f4f1101df21 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/BTaggingContent.py
@@ -1,5 +1,5 @@
"""
-Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
Define sets of standard variables to save in output files.
The variable lists returned by these functions are used by the smart slimming
@@ -57,6 +57,7 @@ JetStandardAux = fold_hashes + [
"eta",
"btaggingLink",
"GhostTrack",
+ "jetRank",
"ConeExclBHadronsFinal",
"ConeExclCHadronsFinal",
"PartonTruthLabelID",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py
index 5744b2b92004..204f6d241a76 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FTAG1.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#!/usr/bin/env python
#====================================================================
# DAOD_FTAG1.py
@@ -69,8 +69,11 @@ def FTAG1CoreCfg(flags, name_tag='FTAG1', extra_SmartCollections=None, extra_All
"InDetTrackParticles",
"AntiKt4EMPFlowJets",
"BTagging_AntiKt4EMPFlow",
+ "AntiKt4UFOCSSKJets",
+ "BTagging_AntiKt4UFOCSSK",
"MET_Baseline_AntiKt4EMPFlow",
"AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets",
+ "TauJets",
]
if flags.GeoModel.Run >= LHCPeriod.Run4:
diff --git a/Tools/PROCTools/data/data_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt b/Tools/PROCTools/data/data_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt
index 3e3b45723d45..db5461923ea1 100644
--- a/Tools/PROCTools/data/data_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt
+++ b/Tools/PROCTools/data/data_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt
@@ -11,7 +11,7 @@ BTagging_AntiKtVR30Rmax4Rmin02TrackAuxDyn\.GN2v00_p
AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsAuxDyn\.GN2(.*)
# JetEtMiss branches
-AntiKt4EMPFlowJetsAuxDyn(.*)
+AntiKt4EMPFlowJetsAuxDyn(?!\.jetRank)
Kt4EMPFlowEventShapeAuxDyn.Density
Kt4EMPFlowPUSBEventShapeAuxDyn.Density
Kt4EMPFlowNeutEventShapeAuxDyn.Density
diff --git a/Tools/PROCTools/data/mc_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt b/Tools/PROCTools/data/mc_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt
index 4f467ace8ef3..a10639b0a5cc 100644
--- a/Tools/PROCTools/data/mc_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt
+++ b/Tools/PROCTools/data/mc_PHYS_Run2_DAOD_PHYS_diff-interest-list.txt
@@ -17,7 +17,7 @@ AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsAuxDyn\.R10TruthLabel(.*)
AntiKt10UFOCSSKSoftDropBeta100Zcut10JetsAuxDyn\.Ghost(.*)
# JetEtMiss branches
-AntiKt4EMPFlowJetsAuxDyn(.*)
+AntiKt4EMPFlowJetsAuxDyn(?!\.jetRank)
Kt4EMPFlowEventShapeAuxDyn.Density
Kt4EMPFlowPUSBEventShapeAuxDyn.Density
Kt4EMPFlowNeutEventShapeAuxDyn.Density
--
GitLab