diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
index 2b20d1c2da03ca9f7973ea2e311927c08978e6bd..622180fc83de1db4eb23653e18a33a420620b5e8 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyCorrectionsTool.cxx
@@ -46,7 +46,6 @@ TauEfficiencyCorrectionsTool::TauEfficiencyCorrectionsTool( const std::string& s
declareProperty( "UseHighPtUncert", m_bUseHighPtUncert = false );
declareProperty( "JetIDLevel", m_iJetIDLevel = (int)JETIDNONE );
declareProperty( "EleIDLevel", m_iEleIDLevel = (int)ELEIDNONE );
- declareProperty( "TriggerPeriodBinning", m_iTriggerPeriodBinning = (int)PeriodBinningAll );
declareProperty( "MCCampaign", m_sMCCampaign = "" ); // MC16a, MC16d or MC16e
declareProperty( "isAFII", m_sAFII = false );
declareProperty( "SkipTruthMatchCheck", m_bSkipTruthMatchCheck = false );
@@ -287,7 +286,6 @@ void TauEfficiencyCorrectionsTool::printConfig() const
ATH_MSG_DEBUG( " UseHighPtUncert " << m_bUseHighPtUncert );
ATH_MSG_DEBUG( " JetIDLevel " << m_iJetIDLevel );
ATH_MSG_DEBUG( " EleIDLevel " << m_iEleIDLevel );
- ATH_MSG_DEBUG( " TriggerPeriodBinning " << m_iTriggerPeriodBinning );
ATH_MSG_DEBUG( " MCCampaign " << m_sMCCampaign );
ATH_MSG_DEBUG( " isAFII " << m_sAFII );
}
@@ -537,7 +535,6 @@ StatusCode TauEfficiencyCorrectionsTool::initializeTools_2022_prerec()
ATH_CHECK(tTool->setProperty("VarName", m_sVarNameTriggerHadTau));
ATH_CHECK(tTool->setProperty("SkipTruthMatchCheck", m_bSkipTruthMatchCheck));
ATH_CHECK(tTool->setProperty("WP", ConvertTriggerIDToString(m_iJetIDLevel)));
- ATH_CHECK(tTool->setProperty("PeriodBinning", (int)m_iTriggerPeriodBinning));
}
else {
ATH_MSG_WARNING("unsupported EfficiencyCorrectionsType with enum " << iEfficiencyCorrectionType);
@@ -677,7 +674,6 @@ StatusCode TauEfficiencyCorrectionsTool::initializeTools_2019_summer()
ATH_CHECK(tTool->setProperty("VarName", m_sVarNameTriggerHadTau));
ATH_CHECK(tTool->setProperty("SkipTruthMatchCheck", m_bSkipTruthMatchCheck));
ATH_CHECK(tTool->setProperty("WP", ConvertTriggerIDToString(m_iJetIDLevel)));
- ATH_CHECK(tTool->setProperty("PeriodBinning", (int)m_iTriggerPeriodBinning));
}
else {
ATH_MSG_WARNING("unsupported EfficiencyCorrectionsType with enum " << iEfficiencyCorrectionType);
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyTriggerTool.cxx b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyTriggerTool.cxx
index cdf65828a690cea2c19b734cf728e4779654149a..abd1eb63e65556a51789254ede99982cd14877af 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyTriggerTool.cxx
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/Root/TauEfficiencyTriggerTool.cxx
@@ -17,10 +17,8 @@ using namespace TauAnalysisTools;
//______________________________________________________________________________
TauEfficiencyTriggerTool::TauEfficiencyTriggerTool(const std::string& sName)
: CommonEfficiencyTool ( sName )
- , m_ePeriod(PeriodUnknown)
{
m_mSystematics = {};
- declareProperty( "PeriodBinning", m_ePeriodBinning = (int)PeriodBinningUnknown );
declareProperty( "MinRunNumber", m_iMinRunNumber = 0 );
declareProperty( "MaxRunNumber", m_iMaxRunNumber = 0 );
}
@@ -80,7 +78,7 @@ CP::CorrectionCode TauEfficiencyTriggerTool::getEfficiencyScaleFactor(const xAOD
// get standard scale factor
CP::CorrectionCode tmpCorrectionCode;
- tmpCorrectionCode = getValue(m_sSFHistName+"_"+convertPeriodToStr()+"_"+m_sWP+sProng,
+ tmpCorrectionCode = getValue(m_sSFHistName+"_all_"+m_sWP+sProng,
xTau,
dEfficiencyScaleFactor);
// return correction code if histogram is not available
@@ -104,7 +102,7 @@ CP::CorrectionCode TauEfficiencyTriggerTool::getEfficiencyScaleFactor(const xAOD
// get uncertainty value
double dUncertaintySyst = 0.;
- tmpCorrectionCode = getValue(it->second+sDirection+"_"+convertPeriodToStr()+"_"+m_sWP+sProng,
+ tmpCorrectionCode = getValue(it->second+sDirection+"_all_"+m_sWP+sProng,
xTau,
dUncertaintySyst);
@@ -190,41 +188,3 @@ bool TauEfficiencyTriggerTool::isSupportedRunNumber(int iRunNumber) const
return true;
}
-//=================================PRIVATE-PART=================================
-//______________________________________________________________________________
-StatusCode TauEfficiencyTriggerTool::setRunNumber(int iRunNumber)
-{
- if(iRunNumber>=276073 and iRunNumber<=276954)
- m_ePeriod = PeriodD;
- else if(iRunNumber>=278727 and iRunNumber<=279928)
- m_ePeriod = PeriodE;
- else if(iRunNumber>=279932 and iRunNumber<=280422)
- m_ePeriod = PeriodF;
- else if(iRunNumber>=280423 and iRunNumber<=281075)
- m_ePeriod = PeriodG;
- else if(iRunNumber>=281317 and iRunNumber<=281385)
- m_ePeriod = PeriodH2;
- else if(iRunNumber==281411)
- m_ePeriod = PeriodH3;
- else if(iRunNumber>=282625 and iRunNumber<=284484)
- m_ePeriod = PeriodJ;
- else
- {
- ATH_MSG_ERROR("Run number "<<iRunNumber<<" is currently not supported");
- m_ePeriod = PeriodUnknown;
- return StatusCode::FAILURE;
- }
- return StatusCode::SUCCESS;
-}
-
-//=================================PRIVATE-PART=================================
-//______________________________________________________________________________
-std::string TauEfficiencyTriggerTool::convertPeriodToStr() const
-{
- if (m_ePeriodBinning == PeriodBinningAll)
- return "all";
- else {
- ATH_MSG_WARNING("Period binning not supported");
- return "";
- }
-}
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/Enums.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/Enums.h
index 24e4521726da8ae50aba6411a0bc5e35ea19bf34..0ccb8cda281c5edaf91997abdd3f172db29d1546 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/Enums.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/Enums.h
@@ -100,27 +100,6 @@ namespace TauAnalysisTools
TruthHadronicDiTau = 6
};
- // FIXME: do we want to keep this?
- enum DataPeriod
- {
- PeriodUnknown = 0,
- PeriodD = 1,
- PeriodE = 2,
- PeriodF = 3,
- PeriodG = 4,
- PeriodH2 = 5,
- PeriodH3 = 6,
- PeriodI = 7,
- PeriodJ = 8
- };
-
- // FIXME: do we want to keep this?
- enum DataPeriodBinning
- {
- PeriodBinningUnknown = 0,
- PeriodBinningAll = 1,
- };
-
struct ROOT6_NamespaceAutoloadHook{};
}
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyCorrectionsTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyCorrectionsTool.h
index e1871c0caa0a7d231f5673300ace74ceb215a12e..d2952a3722e05ad20cbe87e5dbe1c2b77d2f1d0b 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyCorrectionsTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyCorrectionsTool.h
@@ -122,7 +122,6 @@ private:
bool m_bReadRandomRunNumber;
int m_iJetIDLevel;
int m_iEleIDLevel;
- int m_iTriggerPeriodBinning;
std::string m_sMCCampaign;
bool m_sAFII;
bool m_firstEvent = false;
diff --git a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyTriggerTool.h b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyTriggerTool.h
index 73f2afb910c9e623912cd7ded0403ea2e06323d7..a66a46de6b72a57ff87eba68bd8083b256cc5ed0 100644
--- a/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyTriggerTool.h
+++ b/PhysicsAnalysis/TauID/TauAnalysisTools/TauAnalysisTools/TauEfficiencyTriggerTool.h
@@ -45,15 +45,9 @@ public:
virtual StatusCode applySystematicVariation ( const CP::SystematicSet& sSystematicSet);
- virtual StatusCode setRunNumber(int iRunNumber);
-
bool isSupportedRunNumber(int iRunNumber) const;
protected:
- std::string convertPeriodToStr() const;
-
- DataPeriod m_ePeriod;
- int m_ePeriodBinning;
int m_iMinRunNumber;
int m_iMaxRunNumber;