Skip to content
Snippets Groups Projects
Commit 0c10f307 authored by Antonio Giannini's avatar Antonio Giannini
Browse files

update for MR

Former-commit-id: 83ef886ab919a4dcf673d8c6ee488d61c7cc0527
parent b9399635
No related branches found
No related tags found
No related merge requests found
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
#include "xAODCore/ShallowCopy.h" #include "xAODCore/ShallowCopy.h"
#include "JetAnalysisInterfaces/IJetJvtEfficiency.h" #include "JetAnalysisInterfaces/IJetJvtEfficiency.h"
#include "GaudiKernel/IJobOptionsSvc.h"
namespace DerivationFramework { namespace DerivationFramework {
JetAugmentationTool::JetAugmentationTool(const std::string& t, JetAugmentationTool::JetAugmentationTool(const std::string& t,
...@@ -43,8 +41,8 @@ namespace DerivationFramework { ...@@ -43,8 +41,8 @@ namespace DerivationFramework {
dec_originm(0), dec_originm(0),
m_jetPtAssociationTool(""), m_jetPtAssociationTool(""),
m_decorateptassociation(false), m_decorateptassociation(false),
dec_AssociatedNtracks(0), // QGTaggerTool --- dec_AssociatedNTracks(0), // QGTaggerTool ---
m_decoratentracks(false), m_decorateNTracks(false),
m_trkSelectionTool("") m_trkSelectionTool("")
{ {
declareInterface<DerivationFramework::IAugmentationTool>(this); declareInterface<DerivationFramework::IAugmentationTool>(this);
...@@ -126,8 +124,8 @@ namespace DerivationFramework { ...@@ -126,8 +124,8 @@ namespace DerivationFramework {
// set up InDet selection tool // set up InDet selection tool
if(!m_trkSelectionTool.empty()) { if(!m_trkSelectionTool.empty()) {
CHECK( m_trkSelectionTool.retrieve() ); CHECK( m_trkSelectionTool.retrieve() );
m_decoratentracks = true; m_decorateNTracks = true;
dec_AssociatedNtracks = new SG::AuxElement::Decorator<int>(m_momentPrefix + "QGTagger_NTracks"); dec_AssociatedNTracks = new SG::AuxElement::Decorator<int>(m_momentPrefix + "QGTagger_NTracks");
} // now works } // now works
...@@ -176,9 +174,9 @@ namespace DerivationFramework { ...@@ -176,9 +174,9 @@ namespace DerivationFramework {
} }
// QGTaggerTool --- // QGTaggerTool ---
if(m_decoratentracks) if(m_decorateNTracks)
{ {
delete dec_AssociatedNtracks; delete dec_AssociatedNTracks;
} }
if(m_decorateorigincorrection){ if(m_decorateorigincorrection){
...@@ -300,7 +298,7 @@ namespace DerivationFramework { ...@@ -300,7 +298,7 @@ namespace DerivationFramework {
} }
// QGTaggerTool --- // QGTaggerTool ---
if(m_decoratentracks) if(m_decorateNTracks)
{ {
ATH_MSG_DEBUG("Test Decorate QG "); ATH_MSG_DEBUG("Test Decorate QG ");
std::vector<const xAOD::IParticle*> jettracks; std::vector<const xAOD::IParticle*> jettracks;
...@@ -354,7 +352,7 @@ namespace DerivationFramework { ...@@ -354,7 +352,7 @@ namespace DerivationFramework {
}// end loop over jettracks }// end loop over jettracks
(*dec_AssociatedNtracks)(jet_orig) = nTracksCount; (*dec_AssociatedNTracks)(jet_orig) = nTracksCount;
}// end if m_decoratentracks }// end if m_decoratentracks
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "FTagAnalysisInterfaces/IBTaggingSelectionTool.h" #include "FTagAnalysisInterfaces/IBTaggingSelectionTool.h"
#include "xAODJet/JetContainer.h" #include "xAODJet/JetContainer.h"
using namespace std;
#include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h" // QGTaggerTool #include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h" // QGTaggerTool
using namespace InDet; using namespace InDet;
...@@ -91,8 +90,8 @@ namespace DerivationFramework { ...@@ -91,8 +90,8 @@ namespace DerivationFramework {
SG::AuxElement::Decorator< ElementLink<xAOD::JetContainer> >* dec_GhostTruthAssociationLink; SG::AuxElement::Decorator< ElementLink<xAOD::JetContainer> >* dec_GhostTruthAssociationLink;
// Ntracks for QGTaggerTool --- // Ntracks for QGTaggerTool ---
bool m_decoratentracks; bool m_decorateNTracks;
SG::AuxElement::Decorator<int>* dec_AssociatedNtracks; SG::AuxElement::Decorator<int>* dec_AssociatedNTracks;
ToolHandle<InDet::IInDetTrackSelectionTool> m_trkSelectionTool; ToolHandle<InDet::IInDetTrackSelectionTool> m_trkSelectionTool;
}; };
......
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