diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonDiTauEfficiencyTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonDiTauEfficiencyTool.cxx
index d17a101916ac495d13205ce2529970da3c15a122..fc8abe8d96f04e04358125e49dfe13ef68085eb7 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 bd4e3628aec659c2c7d07163210e2b31e29f50ab..fb10f4cc8aa46e414e408582b87568171390f23c 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 c3dccae02d22b2d55b46d321ef916b397a4bfd87..27a70722e36eadce03eaacb6fba7adc114e5437a 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 0d95c5ffb065fc62b2b5d27623198b2d12c18d79..29958ae6bf57c0b3052c3d96dac8f98bb69b7827 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 d900144703510875267a84179469151c2f0a51f8..785493d3acdb9a4faf6557b13c581109ee99fdc7 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 5df222c39955158e3baa4bd7384415f2ad829e08..3b5bb820618e9e3863b5868deb6840b03d4240c9 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 cf770cf38f5cd19b73788db500ceeef425107537..40a72e993c45bf6b4e3ef710ab32ed14106b563d 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 8b9fe6965e6310c2bb1bf0cf275eb4d28be85048..cd3e68f2433d82e110c8fc1cccdfde71b1f2b468 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 71a0017c49586acf7fd2add1318103677cc5aea4..24a6b5f0b7c65287e5e7d050bfb98edadddf1a8f 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 5b49cdfbb7ddc95965252b8a4f06d0379a303541..515ce0922fd05254a627d7261be2c5fddc332d66 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 21798c2234853d53e8624e015c7b8e06914ececd..07b50b0d7dbab3207768be61f5ae3c923a708b24 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 12c5a93dc25c19a34b0668367ea58a727c328a0c..49972953448661d6c5af512ed68c697a20f59f13 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 16e46d5eb08ee63e44d773aa15d4cc85959eb226..3c933e70d2b9e1b1c4efd10f474d380390ef117c 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 75969092792b06f0b5dc10810b08efc71a179c2f..c92096c3468341373cdf907d58c9d57010fd7f6a 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 0c4e0cc733830495ab2e1909bb30afa6594b703e..2beb55f7ce3d8f05bcabf7df9519ecf725dbf6d4 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 c9bf8705f9a7eaa536ee2027a35ea5a442eabd74..e1a9aa59e1d8d0e576628b7a50fabcb4a43842b4 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 bf112f16cdf3ecb9291da70179916d32cb3e964c..a0bad5ac78462dde60324e14b9bd918a133a76af 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 e9d8d7c725e09c6c15e0e5e41bedf9c3e2565da0..3c249a52823f58b8d7bafc36b6a8edc9398343d7 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);