From c738cf97b1bb2ba2787bb44de95f699248049bf6 Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Wed, 14 Dec 2016 20:12:05 +0100
Subject: [PATCH] Fix standalone compilation of JetQuarkLabel by removing the
empty finalize() method. This is not defined in the base class in standalone
mode. (ParticleJetTools-00-03-56)
* Tagging ParticleJetTools-00-03-56.
* Fix standalone compilation of JetQuarkLabel by removing the
empty finalize() method. This is not defined in the base class in
standalone mode.
* Tagging ParticleJetTools-00-03-55.
* Comply with ATLAS naming conventions.
Former-commit-id: 597eed5951d086cb88e3f95075349feb57fbbbfa
---
.../ParticleJetTools/JetParticleAssociation.h | 2 +-
.../ParticleJetTools/ParticleJetTools/JetQuarkLabel.h | 1 -
.../ParticleJetTools/Root/JetParticleAssociation.cxx | 6 +++---
.../AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx | 4 ----
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetParticleAssociation.h b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetParticleAssociation.h
index 6ec90cd0641..52f99e88af8 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetParticleAssociation.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetParticleAssociation.h
@@ -33,7 +33,7 @@ class JetParticleAssociation : public asg::AsgTool {
private:
std::string m_outputCollectionName;
std::string m_jetCollectionName;
- SG::AuxElement::Decorator<std::vector<ElementLink<xAOD::IParticleContainer> > > *dec;
+ SG::AuxElement::Decorator<std::vector<ElementLink<xAOD::IParticleContainer> > > *m_dec;
};
#endif
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetQuarkLabel.h b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetQuarkLabel.h
index a2e7e5ace1e..26df4eef542 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetQuarkLabel.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetQuarkLabel.h
@@ -40,7 +40,6 @@ class JetQuarkLabel : public asg::AsgTool, virtual public IJetTruthMatching {
JetQuarkLabel(const std::string& name);
virtual ~JetQuarkLabel();
virtual StatusCode initialize() override;
- virtual StatusCode finalize() override;
/* Method to truth tag a jet.
* NB: for this particular algorithm, matchJet is TRUE if the jet is matched
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleAssociation.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleAssociation.cxx
index 249c007ef0d..9c20f15bfad 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleAssociation.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleAssociation.cxx
@@ -19,7 +19,7 @@ JetParticleAssociation::JetParticleAssociation(const string& name)
}
StatusCode JetParticleAssociation::initialize() {
- dec = new SG::AuxElement::Decorator<vector<ElementLink<IParticleContainer> > >(m_outputCollectionName);
+ m_dec = new SG::AuxElement::Decorator<vector<ElementLink<IParticleContainer> > >(m_outputCollectionName);
return StatusCode::SUCCESS;
}
@@ -41,7 +41,7 @@ StatusCode JetParticleAssociation::execute() {
trkacc("BTagTrackToJetAssociator");
for (unsigned int iJet = 0; iJet < jets->size(); iJet++)
- (*dec)(*jets->at(iJet)) = (*matches)[iJet];
+ (*m_dec)(*jets->at(iJet)) = (*matches)[iJet];
delete matches;
@@ -50,6 +50,6 @@ StatusCode JetParticleAssociation::execute() {
StatusCode JetParticleAssociation::finalize() {
- delete dec;
+ delete m_dec;
return StatusCode::SUCCESS;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
index cad19fc6543..81aa1b45da6 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
@@ -49,10 +49,6 @@ StatusCode JetQuarkLabel::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode JetQuarkLabel::finalize() {
- return StatusCode::SUCCESS;
-}
-
bool JetQuarkLabel::matchJet(const xAOD::Jet& myJet,
MatchInfo* info /*= nullptr*/) const
{
--
GitLab