From 0a35dfaca2894526731400bcbf18c67747284e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=BCbner?= <michael.huebner@cern.ch>
Date: Fri, 6 Mar 2020 16:37:41 +0100
Subject: [PATCH 1/7] Support mu for y-axis in trigger recomm., detect mc
 campaign for this.

---
 .../Root/CommonEfficiencyTool.cxx              |  5 +++++
 .../TauAnalysisTools/Root/HelperFunctions.cxx  | 18 ++++++++++++++++++
 .../Root/TauEfficiencyCorrectionsTool.cxx      | 15 +++++++++++++--
 .../TauAnalysisTools/HelperFunctions.h         |  2 ++
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
index 525178002503..fafeb1013f85 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
@@ -539,6 +539,11 @@ void CommonEfficiencyTool::ReadInputs(TFile& fFile)
         m_fY = &finalTauAbsEta;
         ATH_MSG_DEBUG("using absolute tau eta for y-axis");
       }
+      else if (sTitle == "mu")
+      {
+	m_fY = &average_mu;
+	ATH_MSG_DEBUG("using average mu for y-axis");
+      }
       continue;
     }
 
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
index 195ea03cc3a4..ce92d3e84ad0 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
@@ -633,3 +633,21 @@ e_TruthMatchedParticleType TauAnalysisTools::getTruthParticleType(const xAOD::Di
 
   return eTruthMatchedParticleType;
 }
+
+// This double is needed to save the average/actual mu for the y-axis in CommonEfficiencyTool.
+// The new trigger systematics (from tag 00-03-14 onwards) use mu dependent values.
+// The functions average_mu() and set_mu() are also needed to support this.
+double m_Mu;
+
+//______________________________________________________________________________
+double TauAnalysisTools::average_mu(const xAOD::TauJet& xTau)
+{
+  if(xTau.eta()==0){};
+  return m_Mu;
+}
+
+//______________________________________________________________________________
+void TauAnalysisTools::set_mu(unsigned int mu)
+{
+  m_Mu=mu;
+}
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
index b6159ab083f9..c4306bba81b3 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
@@ -366,8 +366,19 @@ StatusCode TauEfficiencyCorrectionsTool::beginEvent()
 
   const xAOD::EventInfo* xEventInfo = 0;
   ATH_CHECK(evtStore()->retrieve(xEventInfo, m_sEventInfoName ));
-  m_iMu = xEventInfo->averageInteractionsPerCrossing();
-
+  if (xEventInfo->runNumber()==284500)
+  {
+    m_iMu = xEventInfo->averageInteractionsPerCrossing();
+    set_mu(m_iMu);
+  }
+  else if (xEventInfo->runNumber()==300000 || xEventInfo->runNumber()==310000)
+  {
+    m_iMu = xEventInfo->actualInteractionsPerCrossing();
+    set_mu(m_iMu);
+  }
+  else
+    ANA_MSG_WARNING( "Could not determine MC campaign from run number! The mu dependent systematic of the trigger scale factors should not be trusted." );
+  
   if (m_bReadRandomRunNumber)
   {
     // Reset the number at the beginning of event
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/HelperFunctions.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/HelperFunctions.h
index d27d8b768f5b..888a3add2cf4 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/HelperFunctions.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/HelperFunctions.h
@@ -68,6 +68,8 @@ void truthHadrons(const xAOD::TauJet* xTau, std::vector<const xAOD::TruthParticl
 
 e_TruthMatchedParticleType getTruthParticleType(const xAOD::TauJet& xTau);
 e_TruthMatchedParticleType getTruthParticleType(const xAOD::DiTauJet& xDiTau);
+double average_mu(const xAOD::TauJet& xTau);
+void set_mu(unsigned int mu);
 }
 
 #endif // not TAUANALYSISTOOLS_HELPERFUNCTIONS_H
-- 
GitLab


From dc21a8ab4d911ca10dbb9026ba8c0e921840283b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=BCbner?= <michael.huebner@cern.ch>
Date: Fri, 6 Mar 2020 16:39:21 +0100
Subject: [PATCH 2/7] Adapt logic of trigger input file to new scheme (trigger
 type vs year).

---
 .../Root/TauEfficiencyCorrectionsTool.cxx     | 137 +++++-------------
 1 file changed, 36 insertions(+), 101 deletions(-)

diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
index c4306bba81b3..17641ecef220 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
@@ -711,122 +711,57 @@ StatusCode TauEfficiencyCorrectionsTool::initializeTools_2019_summer()
 
     else if (iEfficiencyCorrectionType == SFTriggerHadTau)
     {
-      if (!m_bReadRandomRunNumber && m_tPRWTool.empty())   // use single setup
+      std::string id;
+      if ((m_iIDLevel >= 2 && m_iIDLevel <= 4) || (m_iIDLevel >= 11 && m_iIDLevel <= 15)) id = "BDT";
+      if (m_iIDLevel >= 19 && m_iIDLevel <= 22) id = "RNN";
+      // only set vars if they differ from "", which means they have been configured by the user
+      if (m_sInputFilePathTriggerHadTau.empty())
       {
-        // only set vars if they differ from "", which means they have been configured by the user
-        if (m_sInputFilePathTriggerHadTau.empty())
+        if (m_sTriggerName.empty()) ATH_MSG_FATAL("Property \"Trigger\" was not set, please provide a trigger name.");
+        if (m_bUseTriggerInclusiveEta) 
         {
-          if (m_sTriggerName.empty()) ATH_MSG_FATAL("Property \"Trigger\" was not set, please provide a trigger name.");
-          if (m_bUseTriggerInclusiveEta) 
+	  // Determine the full input file name from the given trigger name.
+	  // Triggers having "mediumRNN_tracktwoMVA are only part of 2018aftTS1.
+	  // Every other trigger having "tracktwoEF" is only part of 2018.
+	  // Every other trigger having "tau160_medium1" is only part of 2016.
+	  // Every other trigger having "tau160" is only part of 2017/2018.
+	  // Lastly check for other possible triggers, if this is not fulfilled the passed trigger is not supported.
+          if (m_sTriggerName.find("mediumRNN_tracktwoMVA") != std::string::npos)
+            m_sInputFilePathTriggerHadTau = sDirectory+"Trigger/"+id+"/Trigger_TrueHadTau_2019-summer_data2018aftTS1_"+GetTriggerSFMeasrementString()+m_sTriggerName+".root";
+          else if (m_sTriggerName.find("tracktwoEF") != std::string::npos)
           {
-            if (m_sTriggerYear == "2015")
-              m_sInputFilePathTriggerHadTau = sDirectory+"Trigger/Trigger_TrueHadTau_2017-moriond_data2015_"+m_sTriggerName+"_etainc.root";
-            else if (m_sTriggerYear == "2016")
-            {
-              m_sInputFilePathTriggerHadTau = sDirectory+"Trigger/Trigger_TrueHadTau_2017-moriond_data2016"+GetTriggerSFMeasrementString()+m_sTriggerName+"_etainc.root";
-            }
-            else if (m_sTriggerYear == "2017")
-            {
-              m_sInputFilePathTriggerHadTau = sDirectory+"Trigger/Trigger_TrueHadTau_2017-moriond_data2017"+GetTriggerSFMeasrementString()+m_sTriggerName+"_etainc.root";
-            }
-            else 
-              ATH_MSG_ERROR("trigger recommendations are only provided for year 2015, 2016 and 2017. Please set property \"TriggerYear\" accordingly.");
+            m_sInputFilePathTriggerHadTau = sDirectory+"Trigger/"+id+"/Trigger_TrueHadTau_2019-summer_data2018"+GetTriggerSFMeasrementString()+m_sTriggerName+".root";
           }
-          else
+          else if (m_sTriggerName.find("tau160_medium1") != std::string::npos)
           {
-            ATH_MSG_ERROR("eta exclusive scale factors not available");
-            return StatusCode::FAILURE;
+            m_sInputFilePathTriggerHadTau = sDirectory+"Trigger/"+id+"/Trigger_TrueHadTau_2019-summer_data2016"+GetTriggerSFMeasrementString()+m_sTriggerName+".root";
           }
-        }
-        if (m_sVarNameTriggerHadTau.length() == 0) m_sVarNameTriggerHadTau = "TauScaleFactorTriggerHadTau";
-
-        asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>* tTool = new asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>("TauAnalysisTools::TauEfficiencyTriggerTool/TriggerHadTauTool", this);
-        m_vTriggerEfficiencyTools.push_back(tTool);
-        ATH_CHECK(tTool->setProperty("InputFilePath", m_sInputFilePathTriggerHadTau));
-        ATH_CHECK(tTool->setProperty("VarName", m_sVarNameTriggerHadTau));
-        ATH_CHECK(tTool->setProperty("SkipTruthMatchCheck", m_bSkipTruthMatchCheck));
-        ATH_CHECK(tTool->setProperty("WP", ConvertTriggerIDToString(m_iIDLevel)));
-        ATH_CHECK(tTool->setProperty("PeriodBinning", (int)m_iTriggerPeriodBinning));
-      }
-      else // setup multiple tools
-      {
-        if (m_sVarNameTriggerHadTau.length() == 0) m_sVarNameTriggerHadTau = "TauScaleFactorTriggerHadTau";
-
-        // 2015 data
-        std::string sInputFilePathTriggerHadTau("");
-        if (m_sTriggerName != "HLT_tau160_medium1_tracktwo")
-        {
-          // only set vars if they differ from "", which means they have been configured by the user
-          if (m_sInputFilePathTriggerHadTau.empty())
+          else if ((m_sTriggerName.find("tau160") != std::string::npos) || (m_sTriggerName.find("tau60") != std::string::npos))
           {
-            if (m_sTriggerName.empty()) ATH_MSG_FATAL("Property \"Trigger\" was not set, please provide a trigger name.");
-            if (m_bUseTriggerInclusiveEta) sInputFilePathTriggerHadTau = sDirectory+"Trigger/Trigger_TrueHadTau_2017-moriond_data2015_"+m_sTriggerName+"_etainc.root";
-            else
-            {
-              ATH_MSG_ERROR("eta exclusive scale factors not available");
-              return StatusCode::FAILURE;
-            }
+            m_sInputFilePathTriggerHadTau = sDirectory+"Trigger/"+id+"/Trigger_TrueHadTau_2019-summer_data1718"+GetTriggerSFMeasrementString()+m_sTriggerName+".root";
           }
-          else
-            sInputFilePathTriggerHadTau = m_sInputFilePathTriggerHadTau;
-
-          asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>* tTool_2015 = new asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>("TauAnalysisTools::TauEfficiencyTriggerTool/TriggerHadTauTool_2015", this);
-          m_vTriggerEfficiencyTools.push_back(tTool_2015);
-          ATH_CHECK(tTool_2015->setProperty("InputFilePath", sInputFilePathTriggerHadTau));
-          ATH_CHECK(tTool_2015->setProperty("VarName", m_sVarNameTriggerHadTau));
-          ATH_CHECK(tTool_2015->setProperty("SkipTruthMatchCheck", m_bSkipTruthMatchCheck));
-          ATH_CHECK(tTool_2015->setProperty("WP", ConvertTriggerIDToString(m_iIDLevel)));
-          ATH_CHECK(tTool_2015->setProperty("PeriodBinning", (int)m_iTriggerPeriodBinning));
-          ATH_CHECK(tTool_2015->setProperty("MaxRunNumber", 284484));
-        }
-
-        // 2016 data
-        if (m_sInputFilePathTriggerHadTau.empty())
-        {
-          if (m_sTriggerName.empty()) ATH_MSG_FATAL("Property \"Trigger\" was not set, please provide a trigger name.");
-          if (m_bUseTriggerInclusiveEta) sInputFilePathTriggerHadTau = sDirectory+"Trigger/Trigger_TrueHadTau_2017-moriond_data2016"+GetTriggerSFMeasrementString()+m_sTriggerName+"_etainc.root";
-          else
+          else if ((m_sTriggerName.find("tau125") != std::string::npos) || (m_sTriggerName.find("tau25") != std::string::npos) || (m_sTriggerName.find("tau35") != std::string::npos) || (m_sTriggerName.find("tau50") != std::string::npos) || (m_sTriggerName.find("tau80") != std::string::npos) )
           {
-            ATH_MSG_ERROR("eta exclusive scale factors not available");
-            return StatusCode::FAILURE;
+            m_sInputFilePathTriggerHadTau = sDirectory+"Trigger/"+id+"/Trigger_TrueHadTau_2019-summer_data161718"+GetTriggerSFMeasrementString()+m_sTriggerName+".root";
           }
+          else 
+            ATH_MSG_ERROR("Your chosen trigger does not seem to be supported. Please set property \"TriggerName\" accordingly.");
         }
         else
-          sInputFilePathTriggerHadTau = m_sInputFilePathTriggerHadTau;
-
-        asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>* tTool_2016 = new asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>("TauAnalysisTools::TauEfficiencyTriggerTool/TriggerHadTauTool_2016", this);
-        m_vTriggerEfficiencyTools.push_back(tTool_2016);
-        ATH_CHECK(tTool_2016->setProperty("InputFilePath", sInputFilePathTriggerHadTau));
-        ATH_CHECK(tTool_2016->setProperty("VarName", m_sVarNameTriggerHadTau));
-        ATH_CHECK(tTool_2016->setProperty("SkipTruthMatchCheck", m_bSkipTruthMatchCheck));
-        ATH_CHECK(tTool_2016->setProperty("WP", ConvertTriggerIDToString(m_iIDLevel)));
-        ATH_CHECK(tTool_2016->setProperty("PeriodBinning", (int)m_iTriggerPeriodBinning));
-        ATH_CHECK(tTool_2016->setProperty("MinRunNumber", 296939));
-        ATH_CHECK(tTool_2016->setProperty("MaxRunNumber", 311481));
-
-        // 2017 data
-        if (m_sInputFilePathTriggerHadTau.empty())
         {
-          if (m_sTriggerName.empty()) ATH_MSG_FATAL("Property \"Trigger\" was not set, please provide a trigger name.");
-          if (m_bUseTriggerInclusiveEta) sInputFilePathTriggerHadTau = sDirectory+"Trigger/Trigger_TrueHadTau_2017-moriond_data2017"+GetTriggerSFMeasrementString()+m_sTriggerName+"_etainc.root";
-          else
-          {
-            ATH_MSG_ERROR("eta exclusive scale factors not available");
-            return StatusCode::FAILURE;
-          }
+          ATH_MSG_ERROR("eta exclusive scale factors not available");
+          return StatusCode::FAILURE;
         }
-        else
-          sInputFilePathTriggerHadTau = m_sInputFilePathTriggerHadTau;
-
-        asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>* tTool_2017 = new asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>("TauAnalysisTools::TauEfficiencyTriggerTool/TriggerHadTauTool_2017", this);
-        m_vTriggerEfficiencyTools.push_back(tTool_2017);
-        ATH_CHECK(tTool_2017->setProperty("InputFilePath", sInputFilePathTriggerHadTau));
-        ATH_CHECK(tTool_2017->setProperty("VarName", m_sVarNameTriggerHadTau));
-        ATH_CHECK(tTool_2017->setProperty("SkipTruthMatchCheck", m_bSkipTruthMatchCheck));
-        ATH_CHECK(tTool_2017->setProperty("WP", ConvertTriggerIDToString(m_iIDLevel)));
-        ATH_CHECK(tTool_2017->setProperty("PeriodBinning", (int)m_iTriggerPeriodBinning));
-        ATH_CHECK(tTool_2017->setProperty("MinRunNumber", 324320));
       }
+      if (m_sVarNameTriggerHadTau.length() == 0) m_sVarNameTriggerHadTau = "TauScaleFactorTriggerHadTau";
+
+      asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>* tTool = new asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>("TauAnalysisTools::TauEfficiencyTriggerTool/TriggerHadTauTool", this);
+      m_vTriggerEfficiencyTools.push_back(tTool);
+      ATH_CHECK(tTool->setProperty("InputFilePath", m_sInputFilePathTriggerHadTau));
+      ATH_CHECK(tTool->setProperty("VarName", m_sVarNameTriggerHadTau));
+      ATH_CHECK(tTool->setProperty("SkipTruthMatchCheck", m_bSkipTruthMatchCheck));
+      ATH_CHECK(tTool->setProperty("WP", ConvertTriggerIDToString(m_iIDLevel)));
+      ATH_CHECK(tTool->setProperty("PeriodBinning", (int)m_iTriggerPeriodBinning));
     }
     else
     {
-- 
GitLab


From 73fa0fe2abc67e0ef54d9b06a4b17ea534e327e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=BCbner?= <michael.huebner@cern.ch>
Date: Fri, 6 Mar 2020 18:13:25 +0100
Subject: [PATCH 3/7] Use local variable instead of member variable to set mu
 for axes.

---
 .../Root/TauEfficiencyCorrectionsTool.cxx                | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
index 17641ecef220..5e7a6f687a16 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
@@ -366,15 +366,16 @@ StatusCode TauEfficiencyCorrectionsTool::beginEvent()
 
   const xAOD::EventInfo* xEventInfo = 0;
   ATH_CHECK(evtStore()->retrieve(xEventInfo, m_sEventInfoName ));
+  m_iMu = xEventInfo->averageInteractionsPerCrossing();
   if (xEventInfo->runNumber()==284500)
   {
-    m_iMu = xEventInfo->averageInteractionsPerCrossing();
-    set_mu(m_iMu);
+    unsigned int tmp_mu = xEventInfo->averageInteractionsPerCrossing();
+    set_mu(tmp_mu);
   }
   else if (xEventInfo->runNumber()==300000 || xEventInfo->runNumber()==310000)
   {
-    m_iMu = xEventInfo->actualInteractionsPerCrossing();
-    set_mu(m_iMu);
+    unsigned int tmp_mu = xEventInfo->actualInteractionsPerCrossing();
+    set_mu(tmp_mu);
   }
   else
     ANA_MSG_WARNING( "Could not determine MC campaign from run number! The mu dependent systematic of the trigger scale factors should not be trusted." );
-- 
GitLab


From c01392ea14246f0a77efd752aa047961f900e6a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=BCbner?= <michael.huebner@cern.ch>
Date: Mon, 9 Mar 2020 15:54:16 +0100
Subject: [PATCH 4/7] Fix missing closing parentheses.

---
 .../TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
index 354346ac1a05..326713c356ce 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
@@ -548,6 +548,7 @@ void CommonEfficiencyTool::ReadInputs(TFile& fFile)
       {
 	m_fY = &average_mu;
 	ATH_MSG_DEBUG("using average mu for y-axis");
+      }
       else if (sTitle == "truth |eta|")
       {
         m_fY = &truthTauAbsEta;
-- 
GitLab


From 9a95e29185b635d7b1e35cbe0db2cff75883522d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=BCbner?= <michael.huebner@cern.ch>
Date: Mon, 9 Mar 2020 15:54:34 +0100
Subject: [PATCH 5/7] Update shared files version for new trigger scale
 factors.

---
 .../TauAnalysisTools/TauAnalysisTools/SharedFilesVersion.h      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SharedFilesVersion.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SharedFilesVersion.h
index 099af9c515bd..d72bcfe591dc 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SharedFilesVersion.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SharedFilesVersion.h
@@ -6,6 +6,6 @@
 #define TAUANALYSISTOOLS_SHAREDFILESVERSION_H
 
 /// Version of the calibration files
-static const char *const sSharedFilesVersion = "00-03-13";
+static const char *const sSharedFilesVersion = "00-03-14";
 
 #endif // TAUANALYSISTOOLS_SHAREDFILESVERSION_H
-- 
GitLab


From 44a06eb8133de0752737ddaa4a77e95736c15810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=BCbner?= <michael.huebner@cern.ch>
Date: Mon, 9 Mar 2020 16:31:57 +0100
Subject: [PATCH 6/7] Add RNN WPs to string conversion function.

---
 .../Root/TauEfficiencyCorrectionsTool.cxx                | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
index 27b217c7f2a9..d3fc6979d0db 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
@@ -1925,6 +1925,15 @@ std::string TauEfficiencyCorrectionsTool::ConvertTriggerIDToString(const int& iL
   case JETIDBDTTIGHT:
     return "tight";
     break;
+  case JETIDRNNLOOSE:
+    return "loose";
+    break;
+  case JETIDRNNMEDIUM:
+    return "medium";
+    break;
+  case JETIDRNNTIGHT:
+    return "tight";
+    break;
   default:
     assert(false && "No valid Trigger ID level passed. Breaking up ...");
     break;
-- 
GitLab


From a4abcaa9ae64138e461f799d5aa33e1281377408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=BCbner?= <michael.huebner@cern.ch>
Date: Tue, 10 Mar 2020 09:43:40 +0100
Subject: [PATCH 7/7] Remove unnecessary operation in average_mu().

---
 .../TauID/TauAnalysisTools/Root/HelperFunctions.cxx            | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
index fe67bd697c41..b620d3ee05ef 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/HelperFunctions.cxx
@@ -666,9 +666,8 @@ e_TruthMatchedParticleType TauAnalysisTools::getTruthParticleType(const xAOD::Di
 double m_Mu;
 
 //______________________________________________________________________________
-double TauAnalysisTools::average_mu(const xAOD::TauJet& xTau)
+double TauAnalysisTools::average_mu(const xAOD::TauJet& /*xTau*/)
 {
-  if(xTau.eta()==0){};
   return m_Mu;
 }
 
-- 
GitLab