From b360b332e725607a8cfba0ee070d41a16d755e23 Mon Sep 17 00:00:00 2001
From: christos <christos@cern.ch>
Date: Mon, 10 Sep 2018 23:25:12 +0100
Subject: [PATCH] fix unit test
---
.../ElectronChargeEfficiencyCorrectionTool.h | 22 ++++---
...ElectronChargeEfficiencyCorrectionTool.cxx | 66 +------------------
2 files changed, 15 insertions(+), 73 deletions(-)
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/ElectronChargeEfficiencyCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/ElectronChargeEfficiencyCorrectionTool.h
index cf8b5ddd9176..eadfd81d47bd 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/ElectronChargeEfficiencyCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/ElectronEfficiencyCorrection/ElectronChargeEfficiencyCorrectionTool.h
@@ -7,7 +7,7 @@
#include "AsgTools/AsgTool.h"
//#include "ElectronChargeEfficiencyCorrectionTool/IElectronChargeEfficiencyCorrectionTool.h"
-#include "AsgAnalysisInterfaces/IEfficiencyScaleFactorTool.h"
+#include "EgammaAnalysisInterfaces/IAsgElectronEfficiencyCorrectionTool.h"
#include "PATInterfaces/ISystematicsTool.h"
#include "TH2.h"
// #include "xAODTruth/TruthParticle.h"
@@ -28,10 +28,10 @@ namespace xAOD {
namespace CP {
class ElectronChargeEfficiencyCorrectionTool
- : virtual public CP::IEfficiencyScaleFactorTool,
+ : virtual public IAsgElectronEfficiencyCorrectionTool,
public asg::AsgTool
{
- ASG_TOOL_CLASS2(ElectronChargeEfficiencyCorrectionTool, CP::IEfficiencyScaleFactorTool, CP:: ISystematicsTool)
+ ASG_TOOL_CLASS(ElectronChargeEfficiencyCorrectionTool, IAsgElectronEfficiencyCorrectionTool)
public:
@@ -57,10 +57,10 @@ namespace CP {
virtual StatusCode finalize();
/// Retrieve the Scale factor
- virtual CP::CorrectionCode getEfficiencyScaleFactor(const xAOD::IParticle& part, double& sf) const;
+ virtual CP::CorrectionCode getEfficiencyScaleFactor(const xAOD::Electron& inputObject, double& sf) const;
/// Decorate the electron
- virtual CP::CorrectionCode applyEfficiencyScaleFactor(const xAOD::IParticle& part) const;
+ virtual CP::CorrectionCode applyEfficiencyScaleFactor(const xAOD::Electron& inputObject) const;
/// Systematics
// void applySysVariation();
@@ -78,11 +78,15 @@ namespace CP {
CP::SystematicCode registerSystematics();
- /// returns: the currently applied systematics
- const CP::SystematicSet& appliedSystematics() const {
- return *m_appliedSystematics;
+ /// returns: the currently applied systematics
+ const CP::SystematicSet& appliedSystematics() const {
+ return *m_appliedSystematics;
+ }
+
+ int systUncorrVariationIndex( const xAOD::Electron&) const {
+ ATH_MSG_WARNING("systUncorrVariationIndex is not implemented in ElectronChargeEfficiencyCorrectionTool");
+ return -999;
}
-
//
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/ElectronChargeEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/ElectronChargeEfficiencyCorrectionTool.cxx
index cda599834d4f..78a682333fdc 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/ElectronChargeEfficiencyCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/ElectronChargeEfficiencyCorrectionTool.cxx
@@ -328,13 +328,7 @@ StatusCode CP::ElectronChargeEfficiencyCorrectionTool::finalize()
//
CP::CorrectionCode
-CP::ElectronChargeEfficiencyCorrectionTool::getEfficiencyScaleFactor(const xAOD::IParticle& part, double& sf) const {
- ATH_MSG_DEBUG("In CP::ElectronChargeEfficiencyCorrectionTool::getEfficiencyScaleFactor(const xAOD::IParticle& part, double& sf) const");
- if ( part.type() != xAOD::Type::Electron ){
- ATH_MSG_ERROR("This function requires an electron to be passed. Failing!");
- return CP::CorrectionCode::Error;
- }
- const xAOD::Electron& ele = static_cast<const xAOD::Electron&>(part);
+CP::ElectronChargeEfficiencyCorrectionTool::getEfficiencyScaleFactor(const xAOD::Electron& ele, double& sf) const {
// initialize the SF at 1
sf = 1.0;
@@ -527,7 +521,7 @@ CP::ElectronChargeEfficiencyCorrectionTool::getEfficiencyScaleFactor(const xAOD:
CP::CorrectionCode
-CP::ElectronChargeEfficiencyCorrectionTool::applyEfficiencyScaleFactor(const xAOD::IParticle& part) const {
+CP::ElectronChargeEfficiencyCorrectionTool::applyEfficiencyScaleFactor(const xAOD::Electron& part) const {
ATH_MSG_DEBUG("In CP::ElectronChargeEfficiencyCorrectionTool::applyEfficiencyScaleFactor(const xAOD::IParticle& part) const");
double sf = 0.0;
CP::CorrectionCode result = this->getEfficiencyScaleFactor(part,sf);
@@ -537,62 +531,6 @@ CP::ElectronChargeEfficiencyCorrectionTool::applyEfficiencyScaleFactor(const xAO
}
-
-//// Giulia: This one won't exist!! ################################################ Kristin: But ok to just comment out for the moment
-
-// //---------------------------------------------------------------------------------------
-// // Get the efficiency for data only
-// //---------------------------------------------------------------------------------------
-
-// CP::CorrectionCode CP::ElectronChargeEfficiencyCorrectionTool::getDataEfficiency(const xAOD::Electron& ele, float& rate) {
-
-// const double ele_pt = ele.pt()*m_gevmev;
-// const double ele_eta = fabs(ele.eta());
-// rate = 999.;
-
-// float syst_err(-1.0);
-// float stat_err(-1.0);
-// float retVal(0.0);
-
-// retVal= this->getChargeFlipRate(ele_eta, ele_pt, m_correctionRates_data[0], rate);
-// if ( retVal != 0 ) return CP::CorrectionCode::OutOfValidityRange;
-
-// //.......sys.......
-// retVal = this->getChargeFlipRate( ele_eta, ele_pt, m_correctionRates_data[1], syst_err);
-// if ( retVal != 0 ) return CP::CorrectionCode::OutOfValidityRange;
-
-// //.......stat.......
-// retVal = this->getChargeFlipRate( ele_eta, ele_pt, m_correctionRates_data[2], stat_err);
-// if ( retVal != 0 ) return CP::CorrectionCode::OutOfValidityRange;
-
-// float total=sqrt( syst_err*syst_err + stat_err*stat_err );
-
-// ATH_MSG_VERBOSE("Rates---- data: " << rate);
-
-
-// // Systematics ------------------------------------------------------------------------------------------------------
-// if ( m_mySysConf.size() >1 ) ATH_MSG_ERROR("m_mySysConf.size() >1 !! By now just one systematic implemented!!");
-
-// if ( m_mySysConf.empty() ) ATH_MSG_VERBOSE("mySysConf is empty. NOMINAL value for rate!!!--->" << rate);
-
-// else if (*(m_mySysConf.begin()) == SystematicVariation ("ELE_ChargeMisID_STAT", 1)) {rate*=(1+(stat_err*0.01)); ATH_MSG_VERBOSE("Rate data after STATup = " << rate); }
-// else if (*(m_mySysConf.begin()) == SystematicVariation ("ELE_ChargeMisID_STAT", -1)) {rate*=(1-(stat_err*0.01)); ATH_MSG_VERBOSE("Rate data after STATdown = " << rate); }
-
-// else if (*(m_mySysConf.begin()) == SystematicVariation ("ELE_ChargeMisID_SYS" , 1)) {rate*=(1+(syst_err*0.01)); ATH_MSG_VERBOSE("Rate data after SYSup = " << rate); }
-// else if (*(m_mySysConf.begin()) == SystematicVariation ("ELE_ChargeMisID_SYS" , -1)) {rate*=(1-(syst_err*0.01)); ATH_MSG_VERBOSE("Rate data after SYSdown = " << rate); }
-
-// else if (*(m_mySysConf.begin()) == SystematicVariation ("ELE_ChargeMisID_TOT" , 1)) {rate*=(1+(total*0.01)); ATH_MSG_VERBOSE("Rate data after TOTup = " << rate); }
-// else if (*(m_mySysConf.begin()) == SystematicVariation ("ELE_ChargeMisID_TOT" , -1)) {rate*=(1-(total*0.01)); ATH_MSG_VERBOSE("Rate data after TOTdown = " << rate); }
-
-// else ATH_MSG_ERROR("No systematic string found");
-
-
-// return CP::CorrectionCode::Ok;
-// }
-
-
-
-
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Get the charge of the original electron
// Giulia: not needed anymore!
--
GitLab