Skip to content
Snippets Groups Projects
Commit 9def3aaa authored by Paul Thompson's avatar Paul Thompson Committed by Jiri Masik
Browse files

Add Large-R jet AntiKt10UFOCSSKSoftDrop for trigger monitoring (ATLJETMET-1711)

Add Large-R jet AntiKt10UFOCSSKSoftDrop for trigger monitoring (ATLJETMET-1711)
parent 83b8b878
No related branches found
No related tags found
2 merge requests!711172024-05-03: merge of 24.0 into main,!70945Add Large-R jet AntiKt10UFOCSSKSoftDrop for trigger monitoring (ATLJETMET-1711)
......@@ -437,7 +437,7 @@ def CaloTopoClusterCfg(flags, cellsname="AllCalo", clustersname=None, clustersna
from OutputStreamAthenaPool.OutputStreamConfig import addToAOD, addToESD
toESD = [f"xAOD::CaloClusterContainer#{CaloTopoCluster.ClustersOutputName}",
f"xAOD::CaloClusterAuxContainer#{CaloTopoCluster.ClustersOutputName}Aux.",
f"xAOD::CaloClusterAuxContainer#{CaloTopoCluster.ClustersOutputName}Aux.-sigmaWidth",
f"CaloClusterCellLinkContainer#{CaloTopoCluster.ClustersOutputName}_links"]
toAOD = [f"xAOD::CaloClusterContainer#{CaloTopoCluster.ClustersOutputName}",
f"CaloClusterCellLinkContainer#{CaloTopoCluster.ClustersOutputName}_links"]
......
......@@ -12,7 +12,7 @@ def ITkTrackRecoOutputCfg(flags, extensions_list=None):
toESD = []
# excluded track aux data
excludedAuxData = ('-clusterAssociation.-TTVA_AMVFVertices_forReco'
excludedAuxData = ('-clusterAssociation.-TTVA_AMVFVertices_forReco.-AssoClustersUFO'
'.-TTVA_AMVFWeights_forReco')
# remove track decorations used internally by FTAG software
excludedAuxData += '.-'.join([''] + FTAG_AUXDATA)
......
......@@ -29,7 +29,7 @@ def InDetTrackRecoOutputCfg(flags, extensions_list=None):
toESD = []
# excluded track aux data
excludedAuxData = ('-clusterAssociation.-TTVA_AMVFVertices_forReco'
excludedAuxData = ('-clusterAssociation.-TTVA_AMVFVertices_forReco.-AssoClustersUFO'
'.-TTVA_AMVFWeights_forReco')
# remove track decorations used internally by FTAG software
excludedAuxData += '.-'.join([''] + FTAG_AUXDATA)
......
......@@ -228,6 +228,7 @@ def L1CALOCoreCfg(flags, deriv='L1CALO1', **kwargs):
"TauJets":"xAOD::TauJetContainer", "TauJetsAux":"xAOD::TauJetAuxContainer"}
)
AllVariables += ["AntiKt4EMPFlowJets","AntiKt10LCTopoJets","Muons","Photons"]
AllVariables += ["AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets"]
# TauJets require smart slimming in order not to cause issues
SmartCollections += ["TauJets"]
......
# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from JetRecConfig.StandardSmallRJets import AntiKt4EMPFlow, AntiKt4LCTopo, AntiKt4EMTopo, AntiKt4Truth
from JetRecConfig.StandardLargeRJets import AntiKt10LCTopo_noVR
from JetRecConfig.StandardLargeRJets import AntiKt10LCTopo_noVR, AntiKt10UFOCSSKSoftDrop_trigger
from JetRecConfig.JetRecConfig import JetRecCfg
def addTruthPileupJetsToOutputCfg(flags, toAOD=True, toESD=True):
......@@ -64,9 +64,8 @@ def JetRecoSteeringCfg(flags):
result = ComponentAccumulator()
# the Standard list of jets to run :
jetdefs = [AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4LCTopo, AntiKt4Truth, AntiKt10LCTopo_noVR]
jetdefs = [AntiKt4EMTopo, AntiKt4EMPFlow, AntiKt4LCTopo, AntiKt4Truth, AntiKt10LCTopo_noVR, AntiKt10UFOCSSKSoftDrop_trigger]
from JetRecConfig.JetConfigFlags import jetInternalFlags
# We're in Reco job : propagate this info to the runIII jet config
# (see JetConfigFlags.py for motivations on this way of doing)
......@@ -81,6 +80,7 @@ def JetRecoSteeringCfg(flags):
if flags.Output.doWriteAOD and flags.Jet.WriteToAOD:
result.merge(addJetsToOutputCfg(flags, jetdefs, toAOD=True, toESD=False))
if flags.Output.doWriteESD:
jetdefs.remove(AntiKt10UFOCSSKSoftDrop_trigger)
result.merge(addJetsToOutputCfg(flags, jetdefs, toAOD=False, toESD=True))
return result
......@@ -134,7 +134,7 @@ def createEgammaConfigFlags():
egcf.addFlag("Egamma.Keys.Output.ForwardClusters",
'ForwardElectronClusters')
egcf.addFlag("Egamma.Keys.Output.ForwardClustersSuppESD", '-SisterCluster')
egcf.addFlag("Egamma.Keys.Output.ForwardClustersSuppESD", '-SisterCluster.-sigmaWidth')
egcf.addFlag("Egamma.Keys.Output.ForwardClustersSuppAOD",
lambda prevFlags: (
prevFlags.Egamma.Keys.Output.ForwardClustersSuppESD))
......
......@@ -29,7 +29,6 @@ StatusCode JetEfficiencyMonitorAlgorithm::initialize() {
ATH_CHECK(m_gFexSRJetContainerKey.initialize()); //initizlize gfex sr jets
// TOBs may come from trigger bytestream - renounce from scheduler
renounce(m_LRjetKey);
renounce(m_gFexLRJetContainerKey);
renounce(m_gFexSRJetContainerKey);
......@@ -49,7 +48,7 @@ StatusCode JetEfficiencyMonitorAlgorithm::fillHistograms( const EventContext& ct
// Retrieve Offline LR Jets from SG
SG::ReadHandle<xAOD::JetContainer> LRjets(m_LRjetKey,ctx);
if(!LRjets.isValid()){
ATH_MSG_WARNING("Failed to retrieve Offline Large Radius Jet Container");
ATH_MSG_WARNING("Failed to retrieve Offline Large Radius Jet Container "<<m_LRjetKey);
return StatusCode::SUCCESS;
}
// Retrieve gfex SR Jets from SG
......
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