From dd8bba5ca7bab8ff43ff2de51ee07334d3f7746b Mon Sep 17 00:00:00 2001
From: David Kirchmeier <david.kirchmeier@cern.ch>
Date: Tue, 11 Sep 2018 13:39:12 +0200
Subject: [PATCH] new systematics for tau ID and electron veto
Former-commit-id: 7740f9add5a20fbb341aa842b8beadfa95fd53e3
---
.../Root/CommonEfficiencyTool.cxx | 2 +-
.../Root/TauEfficiencyCorrectionsTool.cxx | 2 +-
.../TauAnalysisTools/SharedFilesVersion.h | 2 +-
.../test/ut_TauCorrections_test.cxx | 16 ++++++++--------
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
index 282320d7484..3fef5be4554 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/CommonEfficiencyTool.cxx
@@ -559,7 +559,7 @@ void CommonEfficiencyTool::generateSystematicSets()
// test if NP starts with a capital letter indicating that this should be recommended
bool bIsRecommended = false;
- if (isupper(sNP.at(0)))
+ if (isupper(sNP.at(0)) || isupper(sNP.at(1)))
bIsRecommended = true;
// make sNP uppercase and build final NP entry name
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
index aac8c304ce8..c80369d873a 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
@@ -508,7 +508,7 @@ StatusCode TauEfficiencyCorrectionsTool::initializeTools_2018_summer()
else if (iEfficiencyCorrectionType == SFEleOLRElectron)
{
// only set vars if they differ from "", which means they have been configured by the user
- if (m_sInputFilePathEleOLRElectron.empty()) m_sInputFilePathEleOLRElectron = sDirectory+"EleOLR_TrueElectron_2017-moriond.root";
+ if (m_sInputFilePathEleOLRElectron.empty()) m_sInputFilePathEleOLRElectron = sDirectory+"EleOLR_TrueElectron_2018-summer.root";
if (m_sVarNameEleOLRElectron.length() == 0) m_sVarNameEleOLRElectron = "TauScaleFactorEleOLRElectron";
asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>* tTool = new asg::AnaToolHandle<ITauEfficiencyCorrectionsTool>("TauAnalysisTools::CommonEfficiencyTool/EleOLRElectronTool", this);
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SharedFilesVersion.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/SharedFilesVersion.h
index 43e7a7d4942..762e1bf727b 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-05";
+static const char *const sSharedFilesVersion = "00-03-07";
#endif // TAUANALYSISTOOLS_SHAREDFILESVERSION_H
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauCorrections_test.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauCorrections_test.cxx
index 672e9631a7a..ea691c77794 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauCorrections_test.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/test/ut_TauCorrections_test.cxx
@@ -158,8 +158,8 @@ int main()
{"TauScaleFactorReconstructionHadTau", 1. },
{"TAUS_TRUEHADTAU_EFF_RECO_TOTAL__1up", 0.00885311},
{"TAUS_TRUEHADTAU_EFF_RECO_HIGHPT__1up", 0. },
- {"TauScaleFactorJetIDHadTau", 0.970 },
- {"TAUS_TRUEHADTAU_EFF_JETID_TOTAL__1up", 0.039 },
+ {"TauScaleFactorJetIDHadTau", 1.030 },
+ {"TAUS_TRUEHADTAU_EFF_JETID_SYST__1up", 0.0563107 },
{"TAUS_TRUEHADTAU_EFF_JETID_HIGHPT__1up", 0. }
});
@@ -174,8 +174,8 @@ int main()
{"TauScaleFactorReconstructionHadTau", 1. },
{"TAUS_TRUEHADTAU_EFF_RECO_TOTAL__1up", 0.0155508 },
{"TAUS_TRUEHADTAU_EFF_RECO_HIGHPT__1up", 0. },
- {"TauScaleFactorJetIDHadTau", 1.050 },
- {"TAUS_TRUEHADTAU_EFF_JETID_TOTAL__1up", 0.077 },
+ {"TauScaleFactorJetIDHadTau", 1.150 },
+ {"TAUS_TRUEHADTAU_EFF_JETID_SYST__1up", 0.0965217 },
{"TAUS_TRUEHADTAU_EFF_JETID_HIGHPT__1up", 0. }
});
@@ -190,8 +190,8 @@ int main()
{"TauScaleFactorReconstructionHadTau", 1. },
{"TAUS_TRUEHADTAU_EFF_RECO_TOTAL__1up", 0.00591177},
{"TAUS_TRUEHADTAU_EFF_RECO_HIGHPT__1up", 0. },
- {"TauScaleFactorJetIDHadTau", 0.970 },
- {"TAUS_TRUEHADTAU_EFF_JETID_TOTAL__1up", 0.039 },
+ {"TauScaleFactorJetIDHadTau", 1.094 },
+ {"TAUS_TRUEHADTAU_EFF_JETID_SYST__1up", 0.0703839 },
{"TAUS_TRUEHADTAU_EFF_JETID_HIGHPT__1up", 0.0282150 }
});
@@ -250,10 +250,10 @@ int main()
CHECKSAME( (sfVar-sfNominalReco)/sfNominalReco, mVals["TAUS_TRUEHADTAU_EFF_RECO_HIGHPT__1up"] );
// check ID uncertainties
- CHECK( TauEffCorrTool.applySystematicVariation(mSysSet["TAUS_TRUEHADTAU_EFF_JETID_TOTAL__1up"]) );
+ CHECK( TauEffCorrTool.applySystematicVariation(mSysSet["TAUS_TRUEHADTAU_EFF_JETID_SYST__1up"]) );
CHECK( TauEffCorrTool.applyEfficiencyScaleFactor(*xTau) );
sfVar = xTau->auxdata< double >("TauScaleFactorJetIDHadTau");
- CHECKSAME( (sfVar-sfNominalID)/sfNominalID, mVals["TAUS_TRUEHADTAU_EFF_JETID_TOTAL__1up"] );
+ CHECKSAME( (sfVar-sfNominalID)/sfNominalID, mVals["TAUS_TRUEHADTAU_EFF_JETID_SYST__1up"] );
CHECK( TauEffCorrTool.applySystematicVariation(mSysSet["TAUS_TRUEHADTAU_EFF_JETID_HIGHPT__1up"]) );
CHECK( TauEffCorrTool.applyEfficiencyScaleFactor(*xTau) );
--
GitLab