From 0c10f307fbd6a05470f2e2076fc3fa7f54566b28 Mon Sep 17 00:00:00 2001
From: Antonio Giannini <antonio.giannini@cern.ch>
Date: Wed, 5 Dec 2018 22:40:44 +0100
Subject: [PATCH] update for MR
Former-commit-id: 83ef886ab919a4dcf673d8c6ee488d61c7cc0527
---
.../src/JetAugmentationTool.cxx | 18 ++++++++----------
.../src/JetAugmentationTool.h | 5 ++---
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.cxx
index 38e8805194d6..8fc8442ba655 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.cxx
@@ -12,8 +12,6 @@
#include "xAODCore/ShallowCopy.h"
#include "JetAnalysisInterfaces/IJetJvtEfficiency.h"
-#include "GaudiKernel/IJobOptionsSvc.h"
-
namespace DerivationFramework {
JetAugmentationTool::JetAugmentationTool(const std::string& t,
@@ -43,8 +41,8 @@ namespace DerivationFramework {
dec_originm(0),
m_jetPtAssociationTool(""),
m_decorateptassociation(false),
- dec_AssociatedNtracks(0), // QGTaggerTool ---
- m_decoratentracks(false),
+ dec_AssociatedNTracks(0), // QGTaggerTool ---
+ m_decorateNTracks(false),
m_trkSelectionTool("")
{
declareInterface<DerivationFramework::IAugmentationTool>(this);
@@ -126,8 +124,8 @@ namespace DerivationFramework {
// set up InDet selection tool
if(!m_trkSelectionTool.empty()) {
CHECK( m_trkSelectionTool.retrieve() );
- m_decoratentracks = true;
- dec_AssociatedNtracks = new SG::AuxElement::Decorator<int>(m_momentPrefix + "QGTagger_NTracks");
+ m_decorateNTracks = true;
+ dec_AssociatedNTracks = new SG::AuxElement::Decorator<int>(m_momentPrefix + "QGTagger_NTracks");
} // now works
@@ -176,9 +174,9 @@ namespace DerivationFramework {
}
// QGTaggerTool ---
- if(m_decoratentracks)
+ if(m_decorateNTracks)
{
- delete dec_AssociatedNtracks;
+ delete dec_AssociatedNTracks;
}
if(m_decorateorigincorrection){
@@ -300,7 +298,7 @@ namespace DerivationFramework {
}
// QGTaggerTool ---
- if(m_decoratentracks)
+ if(m_decorateNTracks)
{
ATH_MSG_DEBUG("Test Decorate QG ");
std::vector<const xAOD::IParticle*> jettracks;
@@ -354,7 +352,7 @@ namespace DerivationFramework {
}// end loop over jettracks
- (*dec_AssociatedNtracks)(jet_orig) = nTracksCount;
+ (*dec_AssociatedNTracks)(jet_orig) = nTracksCount;
}// end if m_decoratentracks
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.h b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.h
index 899b0d083226..bd17409b3d79 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.h
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkJetEtMiss/src/JetAugmentationTool.h
@@ -23,7 +23,6 @@
#include "FTagAnalysisInterfaces/IBTaggingSelectionTool.h"
#include "xAODJet/JetContainer.h"
-using namespace std;
#include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h" // QGTaggerTool
using namespace InDet;
@@ -91,8 +90,8 @@ namespace DerivationFramework {
SG::AuxElement::Decorator< ElementLink<xAOD::JetContainer> >* dec_GhostTruthAssociationLink;
// Ntracks for QGTaggerTool ---
- bool m_decoratentracks;
- SG::AuxElement::Decorator<int>* dec_AssociatedNtracks;
+ bool m_decorateNTracks;
+ SG::AuxElement::Decorator<int>* dec_AssociatedNTracks;
ToolHandle<InDet::IInDetTrackSelectionTool> m_trkSelectionTool;
};
--
GitLab