From 04ccd1b8475b09c653bc4047f189a4f0c7d9c094 Mon Sep 17 00:00:00 2001
From: Zach Marshall <zach.marshall@cern.ch>
Date: Fri, 21 Feb 2025 20:41:01 +0000
Subject: [PATCH] Removing large-R trimmed jets from standard setup
Removing AntiKt10TruthTrimmed jets from standard truth setup
It seems that these are not really useful to most folks any more. We
have separate large-R jets that are built using soft-drop, so the basic
functionality won't be gone. We also weren't writing these into the
output file for most setups. Trying this removal to see if anything
complains, or if we're really ok to go ahead.
---
.../python/JetCommonConfig.py | 5 ++---
.../python/MCTruthCommonConfig.py | 4 ++--
.../DerivationFrameworkPhys/python/PHYS.py | 1 -
.../DerivationFrameworkPhys/python/PHYSLITE.py | 1 -
Tools/WorkflowTestRunner/python/References.py | 12 ++++++------
5 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommonConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommonConfig.py
index df3de6144974..31b2928bd49a 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommonConfig.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/python/JetCommonConfig.py
@@ -27,7 +27,7 @@ def StandardJetsInDerivCfg(ConfigFlags):
"""Jet reconstruction needed for PHYS/PHYSLITE"""
from JetRecConfig.StandardSmallRJets import AntiKt4EMTopo,AntiKt4EMPFlow,AntiKtVR30Rmax4Rmin02PV0Track
- from JetRecConfig.StandardLargeRJets import AntiKt10LCTopoTrimmed,AntiKt10UFOCSSKSoftDrop
+ from JetRecConfig.StandardLargeRJets import AntiKt10UFOCSSKSoftDrop
from JetRecConfig.JetRecConfig import JetRecCfg
acc = ComponentAccumulator()
@@ -42,8 +42,7 @@ def StandardJetsInDerivCfg(ConfigFlags):
jetList = [AntiKt4EMTopo_deriv, AntiKt4EMPFlow_deriv,
AntiKtVR30Rmax4Rmin02PV0Track,
- AntiKt10LCTopoTrimmed,AntiKt10UFOCSSKSoftDrop]
-
+ AntiKt10UFOCSSKSoftDrop]
for jd in jetList:
acc.merge(JetRecCfg(ConfigFlags,jd))
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommonConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommonConfig.py
index 88d45596f02b..3cfdbd8cbf4e 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommonConfig.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/python/MCTruthCommonConfig.py
@@ -63,12 +63,12 @@ def AddTruthJetsCfg(flags):
acc = ComponentAccumulator()
from JetRecConfig.StandardSmallRJets import AntiKt4Truth,AntiKt4TruthWZ,AntiKt4TruthDressedWZ,AntiKtVRTruthCharged
- from JetRecConfig.StandardLargeRJets import AntiKt10TruthTrimmed,AntiKt10TruthSoftDrop
+ from JetRecConfig.StandardLargeRJets import AntiKt10TruthSoftDrop
from JetRecConfig.JetRecConfig import JetRecCfg
jetList = [AntiKt4Truth,AntiKt4TruthWZ,AntiKt4TruthDressedWZ,AntiKtVRTruthCharged,
- AntiKt10TruthTrimmed,AntiKt10TruthSoftDrop]
+ AntiKt10TruthSoftDrop]
for jd in jetList:
acc.merge(JetRecCfg(flags,jd))
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
index 0e20912b0fe3..e1664e220fc1 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
@@ -110,7 +110,6 @@ def PHYSCoreCfg(flags, name_tag='PHYS', StreamName='StreamDAOD_PHYS', TriggerLis
"TauJets_MuonRM",
"DiTauJets",
"DiTauJetsLowPt",
- "AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets",
"AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets",
"AntiKtVR30Rmax4Rmin02PV0TrackJets",
]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py
index b6c03e18efa8..a3118bf59cfb 100755
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYSLITE.py
@@ -397,7 +397,6 @@ def PHYSLITECfg(flags):
'AnalysisTauJets':'xAOD::TauJetContainer', 'AnalysisTauJetsAux':'xAOD::TauJetAuxContainer',
'MET_Core_AnalysisMET':'xAOD::MissingETContainer', 'MET_Core_AnalysisMETAux':'xAOD::MissingETAuxContainer',
'METAssoc_AnalysisMET':'xAOD::MissingETAssociationMap', 'METAssoc_AnalysisMETAux':'xAOD::MissingETAuxAssociationMap',
- 'AntiKt10TruthTrimmedPtFrac5SmallR20Jets':'xAOD::JetContainer', 'AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux':'xAOD::JetAuxContainer',
'AnalysisLargeRJets':'xAOD::JetContainer','AnalysisLargeRJetsAux':'xAOD::AuxContainerBase'
})
diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py
index d320bb5322a1..cca1ba17ab6b 100644
--- a/Tools/WorkflowTestRunner/python/References.py
+++ b/Tools/WorkflowTestRunner/python/References.py
@@ -30,16 +30,16 @@ references_map = {
"q452": "v33",
"q454": "v48",
# Derivations
- "data_PHYS_Run2": "v43",
+ "data_PHYS_Run2": "v44",
"data_PHYSLITE_Run2": "v25",
- "data_PHYS_Run3": "v43",
+ "data_PHYS_Run3": "v44",
"data_PHYSLITE_Run3": "v26",
- "mc_PHYS_Run2": "v55",
+ "mc_PHYS_Run2": "v56",
"mc_PHYSLITE_Run2": "v29",
- "mc_PHYS_Run3": "v58",
+ "mc_PHYS_Run3": "v59",
"mc_PHYSLITE_Run3": "v32",
- "af3_PHYS_Run2": "v5",
+ "af3_PHYS_Run2": "v6",
"af3_PHYSLITE_Run2": "v6",
- "af3_PHYS_Run3": "v39",
+ "af3_PHYS_Run3": "v40",
"af3_PHYSLITE_Run3": "v33",
}
--
GitLab