diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py
index 33a51f702f0d3cdb784a57c3b8378b3bfaa18c94..fced1946c799429e2a72676a8aed4a3bb4b03fbf 100644
--- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py
+++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py
@@ -74,7 +74,9 @@ def makeSequenceOld (dataType, algSeq, vars, forCompare) :
# Include, and then set up the jet analysis algorithm sequence:
from JetAnalysisAlgorithms.JetAnalysisSequence import makeJetAnalysisSequence
jetContainer = 'AntiKt4EMPFlowJets'
- jetSequence = makeJetAnalysisSequence( dataType, jetContainer, enableCutflow=True, enableKinematicHistograms=True, shallowViewOutput = False )
+ jetSequence = makeJetAnalysisSequence( dataType, jetContainer,
+ runJvtUpdate = True, runNNJvtUpdate = True,
+ enableCutflow=True, enableKinematicHistograms=True, shallowViewOutput = False )
from FTagAnalysisAlgorithms.FTagAnalysisSequence import makeFTagAnalysisSequence
makeFTagAnalysisSequence( jetSequence, dataType, jetContainer, noEfficiency = True, legacyRecommendations = True,
@@ -493,7 +495,7 @@ def makeSequenceBlocks (dataType, algSeq, vars, forCompare) :
# Include, and then set up the jet analysis algorithm sequence:
from JetAnalysisAlgorithms.JetAnalysisConfig import makeJetAnalysisConfig
jetContainer = 'AntiKt4EMPFlowJets'
- makeJetAnalysisConfig( configSeq, 'AnaJets', jetContainer )
+ makeJetAnalysisConfig( configSeq, 'AnaJets', jetContainer, runJvtUpdate = True, runNNJvtUpdate = True )
vars += ['OutJets_%SYS%.pt -> jet_pt_%SYS%',
'OutJets_NOSYS.phi -> jet_phi',
'OutJets_NOSYS.eta -> jet_eta', ]
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithmsDict.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithmsDict.h
index dcaea58543cf6cbc6e03a64b2f0c103245230505..c598d90be184cc57e7a58d99523739fa5e8b0c4a 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithmsDict.h
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithmsDict.h
@@ -15,5 +15,6 @@
#include <JetAnalysisAlgorithms/JetUncertaintiesAlg.h>
#include <JetAnalysisAlgorithms/JvtEfficiencyAlg.h>
#include <JetAnalysisAlgorithms/JvtUpdateAlg.h>
+#include <JetAnalysisAlgorithms/JetDecoratorAlg.h>
#endif
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetCalibrationAlg.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetCalibrationAlg.h
index 311f8c5a1fde6f32936eb0079c503f1cff4e8124..5d9e12501ed057c0664ccd846453d1fe0f4c34ab 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetCalibrationAlg.h
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetCalibrationAlg.h
@@ -44,7 +44,7 @@ namespace CP
/// \brief the jet collection we run on
private:
SysCopyHandle<xAOD::JetContainer> m_jetHandle {
- this, "jets", "AntiKt4EMTopoJets", "the jet collection to run on"};
+ this, "jets", "", "the jet collection to run on"};
};
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetDecoratorAlg.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetDecoratorAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..d5f0cd1a11b02f8a137abc36ac0432a8d67bc9ed
--- /dev/null
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetDecoratorAlg.h
@@ -0,0 +1,51 @@
+/*
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Teng Jian Khoo
+
+
+#ifndef JET_ANALYSIS_ALGORITHMS__JET_DECORATOR_ALG_H
+#define JET_ANALYSIS_ALGORITHMS__JET_DECORATOR_ALG_H
+
+#include <AnaAlgorithm/AnaAlgorithm.h>
+#include <JetInterface/IJetDecorator.h>
+#include <SystematicsHandles/SysCopyHandle.h>
+#include <SystematicsHandles/SysListHandle.h>
+#include <xAODJet/JetContainer.h>
+
+namespace CP
+{
+ /// \brief an algorithm for calling \ref IJetUpdateJvt
+
+ class JetDecoratorAlg final : public EL::AnaAlgorithm
+ {
+ /// \brief the standard constructor
+ public:
+ JetDecoratorAlg (const std::string& name,
+ ISvcLocator* pSvcLocator);
+
+
+ public:
+ StatusCode initialize () override;
+
+ public:
+ StatusCode execute () override;
+
+ /// \brief the update tool
+ private:
+ ToolHandle<IJetDecorator> m_decorator{this, "decorator", "", "the decorator tool we apply to the jet collection"};
+
+ /// \brief the systematics list we run
+ private:
+ SysListHandle m_systematicsList {this};
+
+ /// \brief the jet collection we run on
+ private:
+ SysCopyHandle<xAOD::JetContainer> m_jetHandle {
+ this, "jets", "", "the jet collection to run on"};
+
+ };
+}
+
+#endif
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetGhostMuonAssociationAlg.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetGhostMuonAssociationAlg.h
index 66951ced52797c91cb2d83a64fd81dfeb807b47f..42da03c8fe6e7db4f47dd112ad98890698449eed 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetGhostMuonAssociationAlg.h
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetGhostMuonAssociationAlg.h
@@ -38,7 +38,7 @@ namespace CP
/// \brief the jet collection we run on
private:
SysCopyHandle<xAOD::JetContainer> m_jetHandle {
- this, "jets", "AntiKt4EMTopoJets", "the jet collection to run on"};
+ this, "jets", "", "the jet collection to run on"};
};
}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetModifierAlg.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetModifierAlg.h
index 548e29202b20e43bcf490fe4f78265e15720ad75..5b3b3abe2ca8f7491261a3c27f925099d76fbb62 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetModifierAlg.h
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetModifierAlg.h
@@ -45,7 +45,7 @@ namespace CP
/// \brief the jet collection we run on
private:
SysCopyHandle<xAOD::JetContainer> m_jetHandle {
- this, "jets", "AntiKt4EMTopoJets", "the jet collection to run on"};
+ this, "jets", "", "the jet collection to run on"};
/// \brief the helper for OutOfValidity results
private:
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JvtEfficiencyAlg.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JvtEfficiencyAlg.h
index 43cfd51535861bc6470b5019e3602d8a9db1d4dd..dcf429e20f26c5a5683a96c73845c0b4bd0d9118 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JvtEfficiencyAlg.h
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JvtEfficiencyAlg.h
@@ -49,7 +49,7 @@ namespace CP
/// \brief the jet collection we run on
private:
SysReadHandle<xAOD::JetContainer> m_jetHandle {
- this, "jets", "AntiKt4EMTopoJets", "the jet collection to run on"};
+ this, "jets", "", "the jet collection to run on"};
/// \brief the preselection we apply to our input
private:
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JvtUpdateAlg.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JvtUpdateAlg.h
index e13a3c784115b4a02fc030e47ec383ec2c0a5cb0..be567c701a648037e5c86a39f8b4c1cf0f8979ce 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JvtUpdateAlg.h
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JvtUpdateAlg.h
@@ -46,7 +46,7 @@ namespace CP
/// \brief the jet collection we run on
private:
SysCopyHandle<xAOD::JetContainer> m_jetHandle {
- this, "jets", "AntiKt4EMTopoJets", "the jet collection to run on"};
+ this, "jets", "", "the jet collection to run on"};
/// \brief the preselection we apply to our input
private:
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/selection.xml b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/selection.xml
index ba900eeb5e6e5e603c194936395126500785ba99..9f459bb1bbd8073b9d4eeab16612f4e1230f83e6 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/selection.xml
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/selection.xml
@@ -7,5 +7,6 @@
<class name="CP::JetUncertaintiesAlg" />
<class name="CP::JvtEfficiencyAlg" />
<class name="CP::JvtUpdateAlg" />
+ <class name="CP::JetDecoratorAlg" />
</lcgdict>
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetDecoratorAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetDecoratorAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..1ad6919626ade548e5ea42af57e8076c2e02910f
--- /dev/null
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetDecoratorAlg.cxx
@@ -0,0 +1,53 @@
+/*
+ Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Teng Jian Khoo
+
+
+//
+// includes
+//
+
+#include <JetAnalysisAlgorithms/JetDecoratorAlg.h>
+
+//
+// method implementations
+//
+
+namespace CP
+{
+ JetDecoratorAlg ::
+ JetDecoratorAlg (const std::string& name,
+ ISvcLocator* pSvcLocator)
+ : AnaAlgorithm (name, pSvcLocator)
+ {
+ }
+
+
+
+ StatusCode JetDecoratorAlg ::
+ initialize ()
+ {
+
+ ANA_CHECK (m_decorator.retrieve());
+ ANA_CHECK (m_jetHandle.initialize (m_systematicsList));
+ ANA_CHECK (m_systematicsList.initialize());
+ return StatusCode::SUCCESS;
+ }
+
+
+
+ StatusCode JetDecoratorAlg ::
+ execute ()
+ {
+ for (const auto& sys : m_systematicsList.systematicsVector())
+ {
+ xAOD::JetContainer *jets = nullptr;
+ ANA_CHECK (m_jetHandle.getCopy(jets, sys));
+ ANA_CHECK (m_decorator->decorate(*jets));
+ }
+
+ return StatusCode::SUCCESS;
+ }
+}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtUpdateAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtUpdateAlg.cxx
index ed7e8261f0e38207fd4aa53f3b7a23d1d490caba..681cb0709ad99f233d638abea9afaaad53da3c87 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtUpdateAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JvtUpdateAlg.cxx
@@ -58,6 +58,8 @@ namespace CP
ANA_CHECK (m_jetHandle.getCopy (jets, sys));
for (xAOD::Jet *jet : *jets)
{
+ // Set default value for jets that fail preselection
+ (*m_decorationAccessor) (*jet) = -1.;
if (m_preselection.getBool (*jet, sys))
{
// manually update jvt decoration using the tool
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisAlgorithmsTest.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisAlgorithmsTest.py
index eb2c6490b0968aa381c42cd774c2916aaf6d2484..d7bd70360a4076ddc1f83f3b56ad1999d29a63bb 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisAlgorithmsTest.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisAlgorithmsTest.py
@@ -30,9 +30,25 @@ def makeSequence (dataType, jetContainer="AntiKt4EMPFlowJets") :
pileupSequence.configure( inputName = {}, outputName = {} )
print( pileupSequence ) # For debugging
+ from AsgAnalysisAlgorithms.EventSelectionAnalysisSequence import \
+ makeEventSelectionAnalysisSequence
+
+ evtselSequence = makeEventSelectionAnalysisSequence(dataType)
+ evtselSequence.configure( inputName = {}, outputName = {} )
+ print( evtselSequence )
+
# Include, and then set up the jet analysis algorithm sequence:
from JetAnalysisAlgorithms.JetAnalysisSequence import makeJetAnalysisSequence
- jetSequence = makeJetAnalysisSequence( dataType, jetContainer, enableCutflow=True, enableKinematicHistograms=True )
+ jvtopts = dict(runJvtUpdate=True, runFJvtUpdate=True)
+ if jetContainer=="AntiKt4EMPFlowJets":
+ jvtopts.update(dict(runNNJvtUpdate=True))
+
+ jetSequence = makeJetAnalysisSequence(
+ dataType, jetContainer,
+ enableCutflow=True, enableKinematicHistograms=True,
+ **jvtopts
+ )
+
jetSequence.configure( inputName = jetContainer, outputName = 'AnalysisJetsBase_%SYS%' )
print( jetSequence ) # For debugging
@@ -45,6 +61,7 @@ def makeSequence (dataType, jetContainer="AntiKt4EMPFlowJets") :
# Add the sequences to the job:
algSeq += pileupSequence
+ algSeq += evtselSequence
algSeq += jetSequence
algSeq += jvtSequence
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py
index dbc9dd11fd2630fba0c60d780270beb1ef7362e1..f034167c55e3360e984d8402391eb8d91d4eb75d 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisConfig.py
@@ -61,6 +61,7 @@ class SmallRJetAnalysisConfig (ConfigBlock) :
if self.postfix != '' and self.postfix[0] != '_' :
self.postfix = '_' + self.postfix
self.runJvtUpdate = False
+ self.runNNJvtUpdate = False
self.runFJvtUpdate = False
self.runJvtSelection = True
self.runFJvtSelection = False
@@ -141,6 +142,17 @@ class SmallRJetAnalysisConfig (ConfigBlock) :
alg.jetsOut = config.copyName (self.containerName)
alg.preselection = config.getPreselection (self.containerName, '')
+ if self.runNNJvtUpdate:
+ assert self.jetInput=="EMPFlow", "NN JVT only defined for PFlow jets"
+ alg = config.createAlgorithm( 'CP::JetDecoratorAlg', 'NNJvtUpdateAlg'+self.postfix )
+ config.addPrivateTool( 'decorator', 'JetPileupTag::JetVertexNNTagger' )
+ # Set this actually to the *output* collection
+ alg.jets = config.readName (self.containerName)
+ alg.jetsOut = config.copyName (self.containerName)
+ alg.decorator.JetContainer = alg.jetsOut
+ alg.decorator.SuppressInputDependence=True
+ alg.decorator.SuppressOutputDependence=True
+
if self.runFJvtUpdate :
alg = config.createAlgorithm( 'CP::JetModifierAlg', 'JetModifierAlg'+self.postfix )
config.addPrivateTool( 'modifierTool', 'JetForwardJvtTool')
@@ -422,7 +434,7 @@ def makeJetAnalysisConfig( seq, containerName, jetCollection, postfix = '',
def makeSmallRJetAnalysisConfig( seq, containerName, jetCollection,
jetInput, postfix = '',
- runJvtUpdate = False, runFJvtUpdate = False,
+ runJvtUpdate = False, runNNJvtUpdate = False, runFJvtUpdate = False,
runJvtSelection = True, runFJvtSelection = False,
runJvtEfficiency = True, runFJvtEfficiency = False,
reduction = "Global", JEROption = "Simple"):
@@ -434,6 +446,7 @@ def makeSmallRJetAnalysisConfig( seq, containerName, jetCollection,
jetInput -- The type of input used, read from the collection name.
postfix -- String to be added to the end of all public names.
runJvtUpdate -- Determines whether or not to update JVT on the jets
+ runNNJvtUpdate -- Determines whether or not to update NN JVT on the jets
runFJvtUpdate -- Determines whether or not to update forward JVT on the jets
runJvtSelection -- Determines whether or not to run JVT selection on the jets
runFJvtSelection -- Determines whether or not to run forward JVT selection on the jets
@@ -450,6 +463,7 @@ def makeSmallRJetAnalysisConfig( seq, containerName, jetCollection,
config = SmallRJetAnalysisConfig (containerName, jetCollection, jetInput, postfix)
config.runJvtUpdate = runJvtUpdate
+ config.runNNJvtUpdate = runNNJvtUpdate
config.runFJvtUpdate = runFJvtUpdate
config.runJvtSelection = runJvtSelection
config.runFJvtSelection = runFJvtSelection
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisSequence.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisSequence.py
index 412be4393e2c08c0fd2fb207d5d26daf5c854683..addfe53a93088bc71f8afbcd8565bc5d2502c3e0 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisSequence.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetAnalysisSequence.py
@@ -144,7 +144,7 @@ def makeJetAnalysisSequence( dataType, jetCollection, postfix = '',
def makeSmallRJetAnalysisSequence( seq, dataType, jetCollection,
jetInput, postfix = '',
- runJvtUpdate = False, runFJvtUpdate = False,
+ runJvtUpdate = False, runNNJvtUpdate = False, runFJvtUpdate = False,
runJvtSelection = True, runFJvtSelection = False,
runJvtEfficiency = True, runFJvtEfficiency = False,
reduction = "Global", JEROption = "Simple"):
@@ -157,6 +157,7 @@ def makeSmallRJetAnalysisSequence( seq, dataType, jetCollection,
jetInput -- The type of input used, read from the collection name.
postfix -- String to be added to the end of all public names.
runJvtUpdate -- Determines whether or not to update JVT on the jets
+ runNNJvtUpdate -- Determines whether or not to update NN JVT on the jets
runFJvtUpdate -- Determines whether or not to update forward JVT on the jets
runJvtSelection -- Determines whether or not to run JVT selection on the jets
runFJvtSelection -- Determines whether or not to run forward JVT selection on the jets
@@ -176,6 +177,9 @@ def makeSmallRJetAnalysisSequence( seq, dataType, jetCollection,
raise ValueError(
"Unsupported input type '{0}' for R=0.4 jets!".format(jetInput) )
+ if runNNJvtUpdate:
+ assert jetInput=="EMPFlow", "NN JVT only defined for PFlow jets"
+
# Prepare the jet calibration algorithm
alg = createAlgorithm( 'CP::JetCalibrationAlg', 'JetCalibrationAlg'+postfix )
addPrivateTool( alg, 'calibrationTool', 'JetCalibrationTool' )
@@ -229,8 +233,21 @@ def makeSmallRJetAnalysisSequence( seq, dataType, jetCollection,
alg = createAlgorithm( 'CP::JvtUpdateAlg', 'JvtUpdateAlg'+postfix )
addPrivateTool( alg, 'jvtTool', 'JetVertexTaggerTool' )
alg.jvtTool.JetContainer = jetCollection
+ alg.jvtTool.SuppressInputDependence=True
+
seq.append( alg, inputPropName = 'jets', outputPropName = 'jetsOut', stageName = 'selection' )
+ if runNNJvtUpdate :
+ alg = createAlgorithm( 'CP::JetDecoratorAlg', 'NNJvtUpdateAlg'+postfix )
+ addPrivateTool( alg, 'decorator', 'JetPileupTag::JetVertexNNTagger' )
+ # Set this actually to the *output* collection
+ alg.decorator.JetContainer = jetCollection
+ alg.decorator.SuppressInputDependence=True
+ alg.decorator.SuppressOutputDependence=True
+
+ seq.append(alg, inputPropName = 'jets', outputPropName = 'jetsOut', stageName = 'selection')
+ seq.addDecorAwareTool(tool=alg.decorator,parent=alg,outputPropName='JetContainer')
+
if runFJvtUpdate :
alg = createAlgorithm( 'CP::JetModifierAlg', 'JetModifierAlg'+postfix )
addPrivateTool( alg, 'modifierTool', 'JetForwardJvtTool')
@@ -240,6 +257,7 @@ def makeSmallRJetAnalysisSequence( seq, dataType, jetCollection,
alg.modifierTool.UseTightOP = 1 # 1 = Tight, 0 = Loose
alg.modifierTool.EtaThresh = 2.5 # Eta dividing central from forward jets
alg.modifierTool.ForwardMaxPt = 120.0e3 #Max Pt to define fwdJets for JVT
+ alg.modifierTool.JetContainer = jetCollection
seq.append( alg, inputPropName = 'jets', outputPropName = 'jetsOut', stageName = 'selection' )
pass
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetJvtAnalysisSequence.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetJvtAnalysisSequence.py
index 687480d6fbb2f7f64a9df0649723384dfc14dda6..51e93d4618954abdd4ebaa29db56d3f31b42942f 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetJvtAnalysisSequence.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/python/JetJvtAnalysisSequence.py
@@ -9,6 +9,7 @@ def makeJetJvtAnalysisSequence( dataType, jetCollection,
enableFJvt = False,
globalSF = True,
runSelection = True,
+ runNNJvt = False,
shallowViewOutput = True,
enableCutflow = False ):
"""Create a jet JVT analysis algorithm sequence
@@ -28,6 +29,9 @@ def makeJetJvtAnalysisSequence( dataType, jetCollection,
if runSelection and not globalSF :
raise ValueError ("per-event scale factors needs to be computed when doing a JVT selection")
+ if runNNJvt:
+ assert (not globalSF), "SFs not yet available for NN JVT"
+
# Create the analysis algorithm sequence object:
seq = AnaAlgSequence( "JetJVTAnalysisSequence" )
@@ -56,7 +60,8 @@ def makeJetJvtAnalysisSequence( dataType, jetCollection,
inputPropName = { 'jets' : 'particles' } )
if runSelection:
- seq.addMetaConfigDefault ("selectionDecorNames", ['jvt_selection', 'fjvt_selection'] if enableFJvt else ['jvt_selection'])
+ jvt_name = 'NNJvtPass' if runNNJvt else 'jvt_selection'
+ seq.addMetaConfigDefault ("selectionDecorNames", [ jvt_name, 'fjvt_selection'] if enableFJvt else ['jvt_selection'])
seq.addMetaConfigDefault ("selectionDecorCount", [1, 1] if enableFJvt else [1])
# Set up an algorithm used to create jet JVT selection cutflow:
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_eljob.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_eljob.py
index ecebac7c1e18cac28b47a998a3fbefb1f8308549..989551cdd0c5223e30bb604830a75d75225032dd 100755
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_eljob.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_eljob.py
@@ -33,7 +33,7 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"mc": 'ASG_TEST_FILE_MC',
"afii": 'ASG_TEST_FILE_MC_AFII'}
-jetContainer = "AntiKt4EMTopoJets"
+jetContainer = "AntiKt4EMPFlowJets"
if dataType not in ["data", "mc", "afii"] :
raise ValueError ("invalid data type: " + dataType)
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py
index de9ba9c438964bea1c539784e1bc42b0cee36ce8..0cfb05ae1002d57e71538d5e7ee9d404bc268b61 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/share/JetAnalysisAlgorithmsTest_PFlow_jobOptions.py
@@ -1,6 +1,6 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
#
-# @author Nils Krumnack
+# @author Nils Krumnack, Teng Jian Khoo
# User options, which can be set from command line after a "-" character
# athena EgammaAlgorithmsTest_jobOptions.py - --myOption ...
@@ -21,7 +21,7 @@ inputfile = {"data": 'ASG_TEST_FILE_DATA',
"mc": 'ASG_TEST_FILE_MC',
"afii": 'ASG_TEST_FILE_MC_AFII'}
-jetContainer = "AntiKt4EMTopoJets"
+jetContainer = "AntiKt4EMPFlowJets"
# Set up the reading of the input file:
import AthenaPoolCnvSvc.ReadAthenaPool
@@ -42,5 +42,16 @@ ServiceMgr.THistSvc.Output += [
"ANALYSIS DATAFILE='JetAnalysisAlgorithmsTestPFlow." + dataType + ".hist.root' OPT='RECREATE'"
]
+# Workaround for running the event selection algs on MC with multiple event weights
+from AthenaCommon.Configurable import ConfigurableRun3Behavior
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+from EventBookkeeperTools.EventBookkeeperToolsConfig import CutFlowSvcCfg
+
+with ConfigurableRun3Behavior():
+ cfg = CutFlowSvcCfg(ConfigFlags)
+
+from AthenaConfiguration.LegacySupport import conf2toConfigurable, appendCAtoAthena
+appendCAtoAthena(cfg)
+
# Reduce the printout from Athena:
include( "AthAnalysisBaseComps/SuppressLogging.py" )
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/src/components/JetAnalysisAlgorithms_entries.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/src/components/JetAnalysisAlgorithms_entries.cxx
index c80cbf1f892f73b9b09590087912e175146d2019..ad65ed38d9b7a4f18378131d32985bc4fcfdfd4f 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/src/components/JetAnalysisAlgorithms_entries.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/src/components/JetAnalysisAlgorithms_entries.cxx
@@ -7,6 +7,7 @@
#include <JetAnalysisAlgorithms/JetUncertaintiesAlg.h>
#include <JetAnalysisAlgorithms/JvtEfficiencyAlg.h>
#include <JetAnalysisAlgorithms/JvtUpdateAlg.h>
+#include <JetAnalysisAlgorithms/JetDecoratorAlg.h>
DECLARE_COMPONENT (CP::JetCalibrationAlg)
DECLARE_COMPONENT (CP::JetGhostMuonAssociationAlg)
@@ -15,3 +16,4 @@ DECLARE_COMPONENT (CP::JetSelectionAlg)
DECLARE_COMPONENT (CP::JetUncertaintiesAlg)
DECLARE_COMPONENT (CP::JvtEfficiencyAlg)
DECLARE_COMPONENT (CP::JvtUpdateAlg)
+DECLARE_COMPONENT (CP::JetDecoratorAlg)
diff --git a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/python/AnaAlgSequence.py b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/python/AnaAlgSequence.py
index f96396f9069b79ae6a28cc0310f23337213cd5ea..4119be1852b4a809a6ac045fceff33900bc39f69 100644
--- a/PhysicsAnalysis/D3PDTools/AnaAlgorithm/python/AnaAlgSequence.py
+++ b/PhysicsAnalysis/D3PDTools/AnaAlgorithm/python/AnaAlgSequence.py
@@ -9,6 +9,9 @@ from AnaAlgorithm.AlgSequence import AlgSequence
from AnaAlgorithm.AnaAlgorithmMeta import AnaAlgorithmMeta
from AnaAlgorithm.DualUseConfig import createAlgorithm
+def getFullName(comp):
+ return f"{comp.getType()}/{comp.getName()}"
+
class AnaAlgSequence( AlgSequence ):
"""Analysis algorithm sequence
@@ -39,6 +42,9 @@ class AnaAlgSequence( AlgSequence ):
# Special members for GaudiConfig2 types
self._isGaudiConfig2 = False
self._gaudiConfig2List = []
+ # For tools that need to be aware of their parent's
+ # input/output properties (for DecorHandle management)
+ self._algToDecorToolMap = {}
return
@@ -51,6 +57,14 @@ class AnaAlgSequence( AlgSequence ):
def getGaudiConfig2Components(self):
return self._gaudiConfig2List
+ # Some tools (e.g. IJetDecorator instances) hold a container name to handle
+ # Read/WriteDecorHandles correctly
+ # These need to receive the corresponding input/output properties that
+ # their parents do, so add in a map from parent to child and propagate
+ def addDecorAwareTool(self, tool, parent, inputPropName=None, outputPropName=None):
+ assert inputPropName or outputPropName, "Either input or output name should be provided for decor-aware tools"
+ self._algToDecorToolMap[getFullName(parent)] = (tool, inputPropName, outputPropName)
+
def configure( self, inputName, outputName,
hiddenLayerPrefix = "" ):
"""Perform a post-configuration on the analysis algorithm sequence
@@ -144,6 +158,11 @@ class AnaAlgSequence( AlgSequence ):
if inputLabel not in currentInputs:
continue
setattr( alg, inputPropName, currentInputs[ inputLabel ] )
+
+ if getFullName(alg) in self._algToDecorToolMap:
+ tool, inputPropName, outputPropName = self._algToDecorToolMap[getFullName(alg)]
+ if inputPropName:
+ setattr( tool, inputPropName, currentInputs[ inputLabel ] )
pass
# Set up the output name(s):
@@ -167,6 +186,11 @@ class AnaAlgSequence( AlgSequence ):
tmpIndex[ outputLabel ] += 1
setattr( alg, outputPropName, currentInputs[ outputLabel ] )
+ if getFullName(alg) in self._algToDecorToolMap:
+ tool, inputPropName, outputPropName = self._algToDecorToolMap[getFullName(alg)]
+ if outputPropName:
+ setattr( tool, outputPropName, currentInputs[ outputLabel ] )
+
pass
pass
@@ -187,6 +211,12 @@ class AnaAlgSequence( AlgSequence ):
for outputLabel, outputKey in meta.outputPropName.items():
if outputLabel in currentOutputs:
setattr( alg, outputKey, currentOutputs[ outputLabel ] )
+
+ if getFullName(alg) in self._algToDecorToolMap:
+ tool, inputPropName, outputPropName = self._algToDecorToolMap[getFullName(alg)]
+ if outputPropName:
+ setattr( tool, outputPropName, currentInputs[ outputLabel ] )
+
del currentOutputs[ outputLabel ]
pass
pass
@@ -199,6 +229,11 @@ class AnaAlgSequence( AlgSequence ):
if inputLabel in currentOutputs:
setattr( alg, inputKey, currentOutputs[ inputLabel ] )
+ if getFullName(alg) in self._algToDecorToolMap:
+ tool, inputPropName, outputPropName = self._algToDecorToolMap[getFullName(alg)]
+ if inputPropName:
+ setattr( tool, inputPropName, currentInputs[ inputLabel ] )
+
pass
return
diff --git a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexNNTagger.h b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexNNTagger.h
index 6665ee5beaef174ca852c3e3679243fd43505538..213761651278bf16b4ead960147e0efbf9dfb397 100644
--- a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexNNTagger.h
+++ b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetVertexNNTagger.h
@@ -20,6 +20,8 @@
#include <vector>
#include <utility>
#include <memory>
+#include <functional>
+#include <optional>
#include "AsgTools/PropertyWrapper.h"
#include "AsgTools/AsgTool.h"
@@ -58,7 +60,7 @@ namespace JetPileupTag {
// Determine pt, eta bin of jet
std::pair<size_t,size_t> get_kinematic_bin(const xAOD::Jet& jet) const;
// Retrieve hard scatter vertex for its index
- const xAOD::Vertex* findHSVertex() const;
+ std::optional<std::reference_wrapper<const xAOD::Vertex> > findHSVertex(const xAOD::VertexContainer& vertices) const;
// Evaluate JVT from Rpt and JVFcorr
float evaluateJvt(float rpt, float jvfcorr, size_t ptbin, size_t etabin) const;
@@ -77,6 +79,7 @@ namespace JetPileupTag {
// Generically needed for moment tools
Gaudi::Property<std::string> m_jetContainerName{this,"JetContainer", "", "SG key for the input jet container"};
Gaudi::Property<bool> m_suppressInputDeps{this, "SuppressInputDependence", false, "Will JVFCorr and SumPtTrk be created in the same algorithm that uses this tool?"};
+ Gaudi::Property<bool> m_suppressOutputDeps{this, "SuppressOutputDependence", false, "Ignore creating the output decoration dependency for data flow; for analysis"};
// NN configuration
Gaudi::Property<std::string> m_NNConfigDir{this,"NNConfigDir", "JetPileupTag/NNJvt/2022-03-22", "PathResolver-accessible directory holding config files"};
diff --git a/Reconstruction/Jet/JetMomentTools/Root/JetMomentToolsDict.h b/Reconstruction/Jet/JetMomentTools/Root/JetMomentToolsDict.h
index 41adc0908319fd03244fb69742719a975a2e2628..8cf7e51c4559b76a3ba79abcb5271299f3f22d3d 100644
--- a/Reconstruction/Jet/JetMomentTools/Root/JetMomentToolsDict.h
+++ b/Reconstruction/Jet/JetMomentTools/Root/JetMomentToolsDict.h
@@ -20,6 +20,7 @@
#include "JetMomentTools/JetTrackSumMomentsTool.h"
#include "JetMomentTools/JetVertexFractionTool.h"
#include "JetMomentTools/JetVertexTaggerTool.h"
+#include "JetMomentTools/JetVertexNNTagger.h"
#include "JetMomentTools/JetWidthTool.h"
#include "JetMomentTools/JetQGTaggerVariableTool.h"
#include "JetMomentTools/JetEMScaleMomTool.h"
diff --git a/Reconstruction/Jet/JetMomentTools/Root/JetVertexNNTagger.cxx b/Reconstruction/Jet/JetMomentTools/Root/JetVertexNNTagger.cxx
index 30821a7e63e782519f26660baf0c392984d0bd62..ac9d3f2fa5505483fca2b87302542c973265a21a 100644
--- a/Reconstruction/Jet/JetMomentTools/Root/JetVertexNNTagger.cxx
+++ b/Reconstruction/Jet/JetMomentTools/Root/JetVertexNNTagger.cxx
@@ -108,8 +108,22 @@ namespace JetPileupTag {
m_passJvtKey = m_jetContainerName + "." + m_passJvtKey.key();
ATH_CHECK(m_vertexContainer_key.initialize());
- ATH_CHECK(m_jvfCorrKey.initialize(m_suppressInputDeps));
- ATH_CHECK(m_sumPtTrkKey.initialize(m_suppressInputDeps));
+#ifndef XAOD_STANDALONE
+ if(m_suppressInputDeps) {
+ // The user has promised that this will be produced by the same alg.
+ // Tell the scheduler to ignore it to avoid circular dependencies.
+ renounce(m_jvfCorrKey);
+ renounce(m_sumPtTrkKey);
+ }
+ if(m_suppressOutputDeps) {
+ // For analysis applications, may not enforce scheduling via data deps
+ renounce(m_jvtKey);
+ renounce(m_rptKey);
+ renounce(m_passJvtKey);
+ }
+#endif
+ ATH_CHECK(m_jvfCorrKey.initialize());
+ ATH_CHECK(m_sumPtTrkKey.initialize());
ATH_CHECK(m_jvtKey.initialize());
ATH_CHECK(m_rptKey.initialize());
ATH_CHECK(m_passJvtKey.initialize());
@@ -159,44 +173,39 @@ namespace JetPileupTag {
}
- const xAOD::Vertex* JetVertexNNTagger::findHSVertex() const
+ std::optional<std::reference_wrapper<const xAOD::Vertex> > JetVertexNNTagger::findHSVertex(const xAOD::VertexContainer& vertices) const
{
- // Get input vertex collection
- SG::ReadHandle<xAOD::VertexContainer> vertexHandle = SG::makeHandle (m_vertexContainer_key);
- if (!vertexHandle.isValid()){
- return nullptr;
- ATH_MSG_ERROR("Invalid VertexContainer datahandle: " << m_vertexContainer_key.key());
- }
- const xAOD::VertexContainer* vertices = vertexHandle.cptr();
- ATH_MSG_DEBUG("Successfully retrieved VertexContainer: " << m_vertexContainer_key.key());
- if (vertices->size() == 0 ) {
- ATH_MSG_WARNING("There are no vertices in the container. Exiting");
- return nullptr;
+ for ( const xAOD::Vertex* vertex : vertices ) {
+ if(vertex->vertexType() == xAOD::VxType::PriVtx) {
+ ATH_MSG_VERBOSE("JetVertexTaggerTool " << name() << " Found HS vertex at index: "<< vertex->index());
+ return std::cref(*vertex);
+ }
}
-
- for ( size_t iVertex = 0; iVertex < vertices->size(); ++iVertex ) {
- if(vertices->at(iVertex)->vertexType() == xAOD::VxType::PriVtx) {
-
- ATH_MSG_VERBOSE("JetVertexTaggerTool " << name() << " Found HS vertex at index: "<< iVertex);
- return vertices->at(iVertex);
+ if (vertices.size()==1) {
+ ATH_MSG_VERBOSE("JetVertexTaggerTool " << name() << " Found no HS vertex, return dummy");
+ if (vertices.back()->vertexType() == xAOD::VxType::NoVtx) {
+ return std::cref(*vertices.back());
}
}
- ATH_MSG_VERBOSE("There is no vertex of type PriVx. Taking default vertex.");
- return vertices->at(0);
+ ATH_MSG_VERBOSE("No vertex found in container.");
+ return {};
}
StatusCode JetVertexNNTagger::decorate(const xAOD::JetContainer& jetCont) const
{
- const xAOD::Vertex* HSvertex = findHSVertex();
- if(HSvertex==nullptr) {
- ATH_MSG_WARNING("Invalid primary vertex found, will not continue decorating with JVT.");
- return StatusCode::FAILURE;
- }
// Grab vertices for index bookkeeping
SG::ReadHandle<xAOD::VertexContainer> vertexHandle = SG::makeHandle (m_vertexContainer_key);
- const xAOD::VertexContainer* vertices = vertexHandle.cptr();
+ const xAOD::VertexContainer& vertices = *vertexHandle;
+ ATH_MSG_DEBUG("Successfully retrieved VertexContainer: " << m_vertexContainer_key.key());
+
+ std::optional<std::reference_wrapper<const xAOD::Vertex> > HSvertex_ref = findHSVertex(vertices);
+ if(!HSvertex_ref.has_value()) {
+ ATH_MSG_WARNING("Invalid primary vertex found, will not continue decorating with JVT.");
+ return StatusCode::FAILURE;
+ }
+ const xAOD::Vertex& HSvertex = HSvertex_ref->get();
SG::ReadDecorHandle<xAOD::JetContainer, float> jvfCorrHandle(m_jvfCorrKey);
SG::ReadDecorHandle<xAOD::JetContainer, std::vector<float> > sumPtTrkHandle(m_sumPtTrkKey);
@@ -205,38 +214,48 @@ namespace JetPileupTag {
SG::WriteDecorHandle<xAOD::JetContainer, char> passJvtHandle(m_passJvtKey);
for(const xAOD::Jet* jet : jetCont) {
- // Calculate RpT and JVFCorr
- // Default JVFcorr to -1 when no tracks are associated.
- float jvfcorr = jvfCorrHandle(*jet);
- std::vector<float> sumpttrk = sumPtTrkHandle(*jet);
- float rpt = sumpttrk[HSvertex->index() - (*vertices)[0]->index()]/jet->pt();
-
size_t ptbin, etabin;
std::tie(ptbin,etabin) = get_kinematic_bin(*jet);
- ATH_MSG_VERBOSE("Jet with pt " << jet->pt() << ", eta " << jet->eta() );
- ATH_MSG_VERBOSE(" --> ptbin " << ptbin << ", etabin " << etabin);
- ATH_MSG_VERBOSE(" --> inputs: corrJVF " << jvfcorr << ", rpt " << rpt );
-
- // Default variable values, in case of invalid kinematic ranges
- float jvt = -1.;
- char jet_passjvt = false;
- // If desired, can combine with explicit max pt, abs(eta) values
- // Left off for now
- if(ptbin==m_ptbin_edges.size() || etabin==m_etabin_edges.size() || jet->pt()>m_maxpt_for_cut) {
- ATH_MSG_VERBOSE("Jet outside kinematic ranges, setting default values and automatic pass.");
- jet_passjvt = true;
+
+ if(HSvertex.vertexType()==xAOD::VxType::PriVtx) {
+ // Calculate RpT and JVFCorr
+ // Default JVFcorr to -1 when no tracks are associated.
+ float jvfcorr = jvfCorrHandle(*jet);
+ std::vector<float> sumpttrk = sumPtTrkHandle(*jet);
+ float rpt = sumpttrk[HSvertex.index() - vertices[0]->index()]/jet->pt();
+
+ ATH_MSG_VERBOSE("Jet with pt " << jet->pt() << ", eta " << jet->eta() );
+ ATH_MSG_VERBOSE(" --> ptbin " << ptbin << ", etabin " << etabin);
+ ATH_MSG_VERBOSE(" --> inputs: corrJVF " << jvfcorr << ", rpt " << rpt );
+
+ // Default variable values, in case of invalid kinematic ranges
+ float jvt = -1.;
+ char jet_passjvt = false;
+ // If desired, can combine with explicit max pt, abs(eta) values
+ // Left off for now
+ if(ptbin==m_ptbin_edges.size() || etabin==m_etabin_edges.size() || jet->pt()>m_maxpt_for_cut) {
+ ATH_MSG_VERBOSE("Jet outside kinematic ranges, setting default values and automatic pass.");
+ jet_passjvt = true;
+ }
+ else {
+ jvt = evaluateJvt(rpt, jvfcorr, ptbin, etabin);
+ float jvtcut = getJvtCut(ptbin, etabin);
+ ATH_MSG_VERBOSE("JVT cut for ptbin " << ptbin << ", etabin " << etabin << " = " << jvtcut);
+ jet_passjvt = jvt > jvtcut;
+ ATH_MSG_VERBOSE("Evaluated JVT = " << jvt << ", jet " << (jet_passjvt ? "passes" :"fails") << " working point" );
+ }
+
+ // Decorate jet
+ rptHandle(*jet) = rpt;
+ jvtHandle(*jet) = jvt;
+ passJvtHandle(*jet) = jet_passjvt;
} else {
- jvt = evaluateJvt(rpt, jvfcorr, ptbin, etabin);
- float jvtcut = getJvtCut(ptbin, etabin);
- ATH_MSG_VERBOSE("JVT cut for ptbin " << ptbin << ", etabin " << etabin << " = " << jvtcut);
- jet_passjvt = jvt > jvtcut;
- ATH_MSG_VERBOSE("Evaluated JVT = " << jvt << ", jet " << (jet_passjvt ? "passes" :"fails") << " working point" );
- }
+ // Decorate jet with dummy values
+ rptHandle(*jet) = 0.;
+ jvtHandle(*jet) = -1.;
+ passJvtHandle(*jet) = true;
+ } // No valid vertex
- // Decorate jet
- rptHandle(*jet) = rpt;
- jvtHandle(*jet) = jvt;
- passJvtHandle(*jet) = jet_passjvt;
}
return StatusCode::SUCCESS;
diff --git a/Reconstruction/Jet/JetMomentTools/Root/LinkDef.h b/Reconstruction/Jet/JetMomentTools/Root/LinkDef.h
index e893f68c72928edd9e777ee0a738a42c915fd194..be7151435f7f42c5499413ef64ebe592709072d0 100644
--- a/Reconstruction/Jet/JetMomentTools/Root/LinkDef.h
+++ b/Reconstruction/Jet/JetMomentTools/Root/LinkDef.h
@@ -15,6 +15,7 @@
#include "JetMomentTools/JetTrackSumMomentsTool.h"
#include "JetMomentTools/JetVertexFractionTool.h"
#include "JetMomentTools/JetVertexTaggerTool.h"
+#include "JetMomentTools/JetVertexNNTagger.h"
#include "JetMomentTools/JetWidthTool.h"
#include "JetMomentTools/JetCaloEnergies.h"
#include "JetMomentTools/JetQGTaggerVariableTool.h"
@@ -38,6 +39,7 @@
#pragma link C++ class JetTrackSumMomentsTool+;
#pragma link C++ class JetVertexFractionTool+;
#pragma link C++ class JetVertexTaggerTool+;
+#pragma link C++ class JetPileupTag::JetVertexNNTagger+;
#pragma link C++ class JetWidthTool+;
#pragma link C++ class JetCaloEnergies+;
#pragma link C++ class JetQGTaggerVariableTool+;
diff --git a/Reconstruction/Jet/JetMomentTools/Root/selection.xml b/Reconstruction/Jet/JetMomentTools/Root/selection.xml
index 0d800b0157fb9bec3c3ef9500411d644045b2c26..d2d66568aecb5d34f5fd19ff1e4a518eff4ddd9c 100644
--- a/Reconstruction/Jet/JetMomentTools/Root/selection.xml
+++ b/Reconstruction/Jet/JetMomentTools/Root/selection.xml
@@ -15,6 +15,7 @@
<class name="JetTrackSumMomentsTool"/>
<class name="JetVertexFractionTool"/>
<class name="JetVertexTaggerTool"/>
+<class name="JetPileupTag::JetVertexNNTagger"/>
<class name="JetWidthTool"/>
<class name="JetQGTaggerVariableTool"/>
<class name="JetEMScaleMomTool"/>