From 4afde784fc06bdfeb0fe874977bc7fb4c70e28b9 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 16 Oct 2019 16:15:21 +0200
Subject: [PATCH] TauAnalysisTools: Fix cppcheck warnings.
- Shadowing of member names between base and derived classes.
- std::string should be passed by const reference, not value.
- Prefer initializing members in init clauses.
---
.../Root/CommonDiTauEfficiencyTool.cxx | 34 +++++++++----------
.../Root/CommonEfficiencyTool.cxx | 6 ++--
.../Root/CommonSmearingTool.cxx | 6 ++--
.../TauAnalysisTools/Root/SelectionCuts.cxx | 6 ++--
.../Root/TauEfficiencyContJetIDTool.cxx | 4 +--
.../Root/TauEfficiencyEleIDTool.cxx | 4 +--
.../Root/TauEfficiencyJetIDTool.cxx | 4 +--
.../Root/TauEfficiencyTriggerTool.cxx | 4 +--
.../Root/TauSelectionTool.cxx | 10 +++---
.../CommonDiTauEfficiencyTool.h | 12 +++----
.../TauAnalysisTools/CommonEfficiencyTool.h | 4 +--
.../TauAnalysisTools/CommonSmearingTool.h | 4 +--
.../TauAnalysisTools/SelectionCuts.h | 2 +-
.../TauEfficiencyContJetIDTool.h | 4 +--
.../TauAnalysisTools/TauEfficiencyEleIDTool.h | 4 +--
.../TauAnalysisTools/TauEfficiencyJetIDTool.h | 4 +--
.../TauEfficiencyTriggerTool.h | 4 +--
.../TauAnalysisTools/TauSelectionTool.h | 10 +++---
18 files changed, 61 insertions(+), 65 deletions(-)
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonDiTauEfficiencyTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonDiTauEfficiencyTool.cxx
index d17a101916a..fc8abe8d96f 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonDiTauEfficiencyTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonDiTauEfficiencyTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Framework include(s):
@@ -16,12 +16,12 @@
using namespace TauAnalysisTools;
//______________________________________________________________________________
-CommonDiTauEfficiencyTool::CommonDiTauEfficiencyTool(std::string sName)
+CommonDiTauEfficiencyTool::CommonDiTauEfficiencyTool(const std::string& sName)
: CommonEfficiencyTool( sName )
- , m_fX(&DiTauPt)
- , m_fY(&DiTauEta)
- , m_bSFIsAvailable(false)
- , m_bSFIsAvailableChecked(false)
+ , m_fDiX(&DiTauPt)
+ , m_fDiY(&DiTauEta)
+ , m_bDiSFIsAvailable(false)
+ , m_bDiSFIsAvailableChecked(false)
{
}
@@ -107,7 +107,7 @@ CP::CorrectionCode CommonDiTauEfficiencyTool::getEfficiencyScaleFactor(const xAO
Get scale factor from getEfficiencyScaleFactor and decorate it to the
tau. Note that this can only be done if the variable name is not already used,
e.g. if the variable was already decorated on a previous step (enured by the
- m_bSFIsAvailableChecked check).
+ m_bDiSFIsAvailableChecked check).
Technical note: cannot use `static SG::AuxElement::Decorator` as we will have
multiple instances of this tool with different decoration names.
@@ -117,18 +117,18 @@ CP::CorrectionCode CommonDiTauEfficiencyTool::applyEfficiencyScaleFactor(const x
{
double dSf = 0.;
- if (!m_bSFIsAvailableChecked)
+ if (!m_bDiSFIsAvailableChecked)
{
- m_bSFIsAvailable = xDiTau.isAvailable< double >(m_sVarName);
- // m_bSFIsAvailable = xDiTau.isAvailable< double >("bliblablubb");
- m_bSFIsAvailableChecked = true;
- if (m_bSFIsAvailable)
+ m_bDiSFIsAvailable = xDiTau.isAvailable< double >(m_sVarName);
+ // m_bDiSFIsAvailable = xDiTau.isAvailable< double >("bliblablubb");
+ m_bDiSFIsAvailableChecked = true;
+ if (m_bDiSFIsAvailable)
{
ATH_MSG_DEBUG(m_sVarName << " decoration is available on first ditau processed, switched of applyEfficiencyScaleFactor for further ditaus.");
ATH_MSG_DEBUG("If an application of efficiency scale factors needs to be redone, please pass a shallow copy of the original ditau.");
}
}
- if (m_bSFIsAvailable)
+ if (m_bDiSFIsAvailable)
return CP::CorrectionCode::Ok;
// retreive scale factor
@@ -146,8 +146,8 @@ void CommonDiTauEfficiencyTool::ReadInputs(TFile* fFile)
m_mSF->clear();
// initialize function pointer
- m_fX = &DiTauPt;
- m_fY = &DiTauEta;
+ m_fDiX = &DiTauPt;
+ m_fDiY = &DiTauEta;
TKey *kKey;
TIter itNext(fFile->GetListOfKeys());
@@ -201,8 +201,8 @@ CP::CorrectionCode CommonDiTauEfficiencyTool::getValue(const std::string& sHistN
tTupleObjectFunc tTuple = (*m_mSF)[sHistName];
// get pt and eta (for x and y axis respectively)
- double dPt = m_fX(xDiTau);
- double dEta = m_fY(xDiTau);
+ double dPt = m_fDiX(xDiTau);
+ double dEta = m_fDiY(xDiTau);
// finally obtain efficiency scale factor from TH1F/TH1D/TF1, by calling the
// function pointer stored in the tuple from the scale factor map
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
index bd4e3628aec..fb10f4cc8aa 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Framework include(s):
@@ -64,7 +64,7 @@ using namespace TauAnalysisTools;
*/
//______________________________________________________________________________
-CommonEfficiencyTool::CommonEfficiencyTool(std::string sName)
+CommonEfficiencyTool::CommonEfficiencyTool(const std::string& sName)
: asg::AsgTool( sName )
, m_mSF(0)
, m_sSystematicSet(0)
@@ -78,8 +78,6 @@ CommonEfficiencyTool::CommonEfficiencyTool(std::string sName)
, m_bPtTauEtaCalibIsAvailable(false)
, m_bPtTauEtaCalibIsAvailableIsChecked(false)
{
- m_mSystematics = {};
-
declareProperty( "InputFilePath", m_sInputFilePath = "" );
declareProperty( "VarName", m_sVarName = "" );
declareProperty( "WP", m_sWP = "" );
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonSmearingTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonSmearingTool.cxx
index c3dccae02d2..27a70722e36 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonSmearingTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonSmearingTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Framework include(s):
@@ -67,7 +67,7 @@ using namespace TauAnalysisTools;
*/
//______________________________________________________________________________
-CommonSmearingTool::CommonSmearingTool(std::string sName)
+CommonSmearingTool::CommonSmearingTool(const std::string& sName)
: asg::AsgMetadataTool( sName )
, m_mSF(0)
, m_sSystematicSet(0)
@@ -85,8 +85,6 @@ CommonSmearingTool::CommonSmearingTool(std::string sName)
, m_bPtTauEtaCalibIsAvailable(false)
, m_bPtTauEtaCalibIsAvailableIsChecked(false)
{
- m_mSystematics = {};
-
declareProperty("InputFilePath", m_sInputFilePath = "" );
declareProperty("SkipTruthMatchCheck", m_bSkipTruthMatchCheck = false );
declareProperty("ApplyFading", m_bApplyFading = true );
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/SelectionCuts.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/SelectionCuts.cxx
index 0d95c5ffb06..29958ae6bf5 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/SelectionCuts.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/SelectionCuts.cxx
@@ -15,7 +15,7 @@
using namespace TauAnalysisTools;
//______________________________________________________________________________
-SelectionCut::SelectionCut(std::string sName, TauAnalysisTools::TauSelectionTool* tTST)
+SelectionCut::SelectionCut(const std::string& sName, TauAnalysisTools::TauSelectionTool* tTST)
: m_sName(sName)
, m_hHistCutPre(0)
, m_hHistCut(0)
@@ -533,9 +533,9 @@ bool SelectionCutBDTEleScore::accept(const xAOD::TauJet& xTau,
//____________________________SelectionCutEleBDTWP______________________________
//______________________________________________________________________________
SelectionCutEleBDTWP::SelectionCutEleBDTWP(TauSelectionTool* tTST)
- : SelectionCut("CutEleBDTWP", tTST)
+ : SelectionCut("CutEleBDTWP", tTST),
+ m_sEleBDTDecorationName ("BDTEleScoreSigTrans")
{
- m_sEleBDTDecorationName = "BDTEleScoreSigTrans";
m_hHistCutPre = CreateControlPlot("hEleBDTWP_pre","EleBDTWP_pre;; events",6,-.5,5.5);
m_hHistCut = CreateControlPlot("hEleBDTWP_cut","EleBDTWP_cut;; events",6,-.5,5.5);
// only proceed if histograms are defined
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyContJetIDTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyContJetIDTool.cxx
index d9001447035..785493d3acd 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyContJetIDTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyContJetIDTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "TauAnalysisTools/TauEfficiencyContJetIDTool.h"
@@ -9,7 +9,7 @@ using namespace TauAnalysisTools;
//==================================PUBLIC-PART=================================
//______________________________________________________________________________
-TauEfficiencyContJetIDTool::TauEfficiencyContJetIDTool(std::string sName) :
+TauEfficiencyContJetIDTool::TauEfficiencyContJetIDTool(const std::string& sName) :
CommonEfficiencyTool(sName)
{
m_sSystematicSet = new CP::SystematicSet();
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyEleIDTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyEleIDTool.cxx
index 5df222c3995..3b5bb820618 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyEleIDTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyEleIDTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "TauAnalysisTools/TauEfficiencyEleIDTool.h"
@@ -9,7 +9,7 @@ using namespace TauAnalysisTools;
//=================================PUBLIC-PART==================================
//______________________________________________________________________________
-TauEfficiencyEleIDTool::TauEfficiencyEleIDTool(std::string sName)
+TauEfficiencyEleIDTool::TauEfficiencyEleIDTool(const std::string& sName)
: CommonEfficiencyTool(sName)
, m_sWorkingPoint_1p("")
, m_sWorkingPoint_3p("")
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyJetIDTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyJetIDTool.cxx
index cf770cf38f5..40a72e993c4 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyJetIDTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyJetIDTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "TauAnalysisTools/TauEfficiencyJetIDTool.h"
@@ -9,7 +9,7 @@ using namespace TauAnalysisTools;
//=================================PUBLIC-PART==================================
//______________________________________________________________________________
-TauEfficiencyJetIDTool::TauEfficiencyJetIDTool(std::string sName)
+TauEfficiencyJetIDTool::TauEfficiencyJetIDTool(const std::string& sName)
: CommonEfficiencyTool(sName)
{
}
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyTriggerTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyTriggerTool.cxx
index 8b9fe6965e6..cd3e68f2433 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyTriggerTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyTriggerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Framework include(s):
@@ -18,7 +18,7 @@
using namespace TauAnalysisTools;
//______________________________________________________________________________
-TauEfficiencyTriggerTool::TauEfficiencyTriggerTool(std::string sName)
+TauEfficiencyTriggerTool::TauEfficiencyTriggerTool(const std::string& sName)
: CommonEfficiencyTool ( sName )
, m_ePeriod(PeriodUnknown)
{
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
index 71a0017c495..24a6b5f0b7c 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauSelectionTool.cxx
@@ -577,7 +577,7 @@ void TauSelectionTool::FillValueVector(std::vector<T>& vRegion, U tVal)
//______________________________________________________________________________
template<typename T>
-void TauSelectionTool::PrintConfigRegion(std::string sCutName, std::vector<T>& vRegion)
+void TauSelectionTool::PrintConfigRegion(const std::string& sCutName, std::vector<T>& vRegion)
{
unsigned int iNumRegion = vRegion.size()/2;
for( unsigned int iRegion = 0; iRegion < iNumRegion; iRegion++ )
@@ -588,7 +588,7 @@ void TauSelectionTool::PrintConfigRegion(std::string sCutName, std::vector<T>& v
//______________________________________________________________________________
template<typename T>
-void TauSelectionTool::PrintConfigValue(std::string sCutName, std::vector<T>& vRegion)
+void TauSelectionTool::PrintConfigValue(const std::string& sCutName, std::vector<T>& vRegion)
{
for (auto tVal : vRegion)
ATH_MSG_DEBUG( sCutName<<": " << tVal );
@@ -596,13 +596,13 @@ void TauSelectionTool::PrintConfigValue(std::string sCutName, std::vector<T>& vR
//______________________________________________________________________________
template<typename T>
-void TauSelectionTool::PrintConfigValue(std::string sCutName, T& tVal)
+void TauSelectionTool::PrintConfigValue(const std::string& sCutName, T& tVal)
{
ATH_MSG_DEBUG( sCutName<<": " << tVal );
}
//______________________________________________________________________________
-int TauSelectionTool::convertStrToJetIDWP(std::string sJetIDWP)
+int TauSelectionTool::convertStrToJetIDWP(const std::string& sJetIDWP)
{
if (sJetIDWP == "JETIDNONE") return int(JETIDNONE);
else if (sJetIDWP == "JETIDBDTVERYLOOSE") return int(JETIDBDTVERYLOOSE); // new in rel21
@@ -626,7 +626,7 @@ int TauSelectionTool::convertStrToJetIDWP(std::string sJetIDWP)
}
//______________________________________________________________________________
-int TauSelectionTool::convertStrToEleBDTWP(std::string sEleBDTWP)
+int TauSelectionTool::convertStrToEleBDTWP(const std::string& sEleBDTWP)
{
if (sEleBDTWP == "ELEIDNONE") return int(ELEIDNONE);
else if (sEleBDTWP == "ELEIDBDTLOOSE") return int(ELEIDBDTLOOSE);
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonDiTauEfficiencyTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonDiTauEfficiencyTool.h
index 5b49cdfbb7d..515ce0922fd 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonDiTauEfficiencyTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonDiTauEfficiencyTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUANALYSISTOOLS_COMMONDITAUEFFICIENCYTOOL_H
@@ -43,7 +43,7 @@ class CommonDiTauEfficiencyTool
public:
- CommonDiTauEfficiencyTool(std::string sName);
+ CommonDiTauEfficiencyTool(const std::string& sName);
~CommonDiTauEfficiencyTool();
@@ -53,8 +53,8 @@ public:
virtual CP::CorrectionCode getEfficiencyScaleFactor(const xAOD::DiTauJet& xDiTau, double& dEfficiencyScaleFactor);
virtual CP::CorrectionCode applyEfficiencyScaleFactor(const xAOD::DiTauJet& xDiTau);
- double (*m_fX)(const xAOD::DiTauJet& xDiTau);
- double (*m_fY)(const xAOD::DiTauJet& xDiTau);
+ double (*m_fDiX)(const xAOD::DiTauJet& xDiTau);
+ double (*m_fDiY)(const xAOD::DiTauJet& xDiTau);
void ReadInputs(TFile* fFile);
@@ -65,8 +65,8 @@ public:
e_TruthMatchedParticleType checkTruthMatch(const xAOD::DiTauJet& xDiTau) const;
- bool m_bSFIsAvailable;
- bool m_bSFIsAvailableChecked;
+ bool m_bDiSFIsAvailable;
+ bool m_bDiSFIsAvailableChecked;
};
} // namespace TauAnalysisTools
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonEfficiencyTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonEfficiencyTool.h
index 21798c22348..07b50b0d7db 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonEfficiencyTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonEfficiencyTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUANALYSISTOOLS_COMMONEFFICIENCYTOOL_H
@@ -51,7 +51,7 @@ class CommonEfficiencyTool
public:
- CommonEfficiencyTool(std::string sName);
+ CommonEfficiencyTool(const std::string& sName);
~CommonEfficiencyTool();
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonSmearingTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonSmearingTool.h
index 12c5a93dc25..49972953448 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonSmearingTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/CommonSmearingTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUANALYSISTOOLS_COMMONSMEARINGTOOL_H
@@ -54,7 +54,7 @@ class CommonSmearingTool
public:
- CommonSmearingTool(std::string sName);
+ CommonSmearingTool(const std::string& sName);
~CommonSmearingTool();
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SelectionCuts.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SelectionCuts.h
index 16e46d5eb08..3c933e70d2b 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SelectionCuts.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SelectionCuts.h
@@ -37,7 +37,7 @@ class SelectionCut
{
public:
- SelectionCut(std::string sName, TauAnalysisTools::TauSelectionTool* tTST);
+ SelectionCut(const std::string& sName, TauAnalysisTools::TauSelectionTool* tTST);
virtual ~SelectionCut();
void writeControlHistograms();
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyContJetIDTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyContJetIDTool.h
index 75969092792..c92096c3468 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyContJetIDTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyContJetIDTool.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUANALYSISTOOLS_TAUEFFICIENCYCONTJETIDTOOL_H
@@ -30,7 +30,7 @@ class TauEfficiencyContJetIDTool : public CommonEfficiencyTool
public:
- TauEfficiencyContJetIDTool(std::string sName);
+ TauEfficiencyContJetIDTool(const std::string& sName);
~TauEfficiencyContJetIDTool();
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyEleIDTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyEleIDTool.h
index 0c4e0cc7338..2beb55f7ce3 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyEleIDTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyEleIDTool.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUANALYSISTOOLS_TAUEFFICIENCYELEIDTOOL_H
@@ -30,7 +30,7 @@ class TauEfficiencyEleIDTool : public CommonEfficiencyTool
public:
- TauEfficiencyEleIDTool(std::string sName);
+ TauEfficiencyEleIDTool(const std::string& sName);
virtual ~TauEfficiencyEleIDTool();
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyJetIDTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyJetIDTool.h
index c9bf8705f9a..e1a9aa59e1d 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyJetIDTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyJetIDTool.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUANALYSISTOOLS_TAUEFFICIENCYJETIDTOOL_H
@@ -30,7 +30,7 @@ class TauEfficiencyJetIDTool : public CommonEfficiencyTool
public:
- TauEfficiencyJetIDTool(std::string sName);
+ TauEfficiencyJetIDTool(const std::string& sName);
virtual ~TauEfficiencyJetIDTool();
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyTriggerTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyTriggerTool.h
index bf112f16cdf..a0bad5ac784 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyTriggerTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyTriggerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TAUANALYSISTOOLS_TAUEFFICIENCYTRIGGERTOOL_H
@@ -51,7 +51,7 @@ class TauEfficiencyTriggerTool
public:
- TauEfficiencyTriggerTool(std::string sName);
+ TauEfficiencyTriggerTool(const std::string& sName);
StatusCode initialize();
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauSelectionTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauSelectionTool.h
index e9d8d7c725e..3c249a52823 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauSelectionTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauSelectionTool.h
@@ -132,11 +132,11 @@ private:
template<typename T, typename U>
void FillValueVector(std::vector<T>& vRegion, U tVal);
template<typename T>
- void PrintConfigRegion(std::string sCutName, std::vector<T>& vRegion);
+ void PrintConfigRegion(const std::string& sCutName, std::vector<T>& vRegion);
template<typename T>
- void PrintConfigValue(std::string sCutName, std::vector<T>& vRegion);
+ void PrintConfigValue(const std::string& sCutName, std::vector<T>& vRegion);
template<typename T>
- void PrintConfigValue(std::string sCutName, T& sVal);
+ void PrintConfigValue(const std::string& sCutName, T& sVal);
// bitmask of tau selection cuts
int m_iSelectionCuts;
@@ -200,8 +200,8 @@ private:
std::map<SelectionCuts, TauAnalysisTools::SelectionCut*> m_cMap;
void setupCutFlowHistogram();
- int convertStrToJetIDWP(std::string sJetIDWP);
- int convertStrToEleBDTWP(std::string sEleBDTWP);
+ int convertStrToJetIDWP(const std::string& sJetIDWP);
+ int convertStrToEleBDTWP(const std::string& sEleBDTWP);
std::string convertJetIDWPToStr(int iJetIDWP);
std::string convertEleBDTWPToStr(int iEleBDTWP);
--
GitLab