diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
index 6365e9a0e22a5975b8ce99081467037b965d3d05..08029de31b9874506a55ad9c046a9ab50f4da556 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
@@ -1,15 +1,14 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
/**
@class AsgElectronLikelihoodTool
- @brief Electron selector tool to select objects in Asgena using an underlying pure ROOT tool.
+ @brief Electron selector tool to select objects in Athena using an underlying pure ROOT tool.
@author Karsten Koeneke
@date October 2012
-
- 09-APR-2014, convert to ASGTool (Jovan Mitrevski)
+ @update April 2014, converted to ASGTool by Jovan Mitrevski
*/
@@ -73,8 +72,6 @@ AsgElectronLikelihoodTool::AsgElectronLikelihoodTool(std::string myname) :
declareProperty("CutLikelihood4GeV",m_rootTool->m_cutLikelihood4GeV,"Cut on likelihood discriminant, 4 GeV special bin");
// The pileup-correction part of the likelihood cut values - 4 GeV
declareProperty("CutLikelihoodPileupCorrection4GeV",m_rootTool->m_cutLikelihoodPileupCorrection4GeV,"Pileup correction for LH discriminant, 4 GeV special bin");
- // do the conversion cut
- declareProperty("doCutConversion",m_rootTool->m_doCutConversion,"Apply the conversion bit cut");
// do the ambiguity cut
declareProperty("CutAmbiguity" ,m_rootTool->m_cutAmbiguity ,"Apply a cut on the ambiguity bit");
// cut on b-layer
@@ -95,8 +92,6 @@ AsgElectronLikelihoodTool::AsgElectronLikelihoodTool(std::string myname) :
declareProperty("doRemoveTRTPIDAtHighEt",m_rootTool->m_doRemoveTRTPIDAtHighEt,"Turn off TRTPID at high Et");
// use smooth interpolation between LH bins
declareProperty("doSmoothBinInterpolation",m_rootTool->m_doSmoothBinInterpolation,"use smooth interpolation between LH bins");
- // use binning for high ET LH
- declareProperty("useHighETLHBinning",m_rootTool->m_useHighETLHBinning,"Use binning for high ET LH");
// use one extra bin for high ET LH
declareProperty("useOneExtraHighETLHBin",m_rootTool->m_useOneExtraHighETLHBin,"Use one extra bin for high ET LH");
// cut on Wstot above HighETBinThreshold
@@ -206,8 +201,6 @@ StatusCode AsgElectronLikelihoodTool::initialize()
m_rootTool->m_cutLikelihoodPileupCorrection = AsgConfigHelper::HelperDouble("CutLikelihoodPileupCorrection", env);
m_rootTool->m_cutLikelihood4GeV = AsgConfigHelper::HelperDouble("CutLikelihood4GeV",env);
m_rootTool->m_cutLikelihoodPileupCorrection4GeV = AsgConfigHelper::HelperDouble("CutLikelihoodPileupCorrection4GeV", env);
- // do the conversion cut
- m_rootTool->m_doCutConversion = env.GetValue("doCutConversion", false);
// do the ambiguity cut
m_rootTool->m_cutAmbiguity = AsgConfigHelper::HelperInt("CutAmbiguity", env);
// cut on b-layer
@@ -230,7 +223,6 @@ StatusCode AsgElectronLikelihoodTool::initialize()
m_rootTool->m_doSmoothBinInterpolation = env.GetValue("doSmoothBinInterpolation", false);
m_caloOnly = env.GetValue("caloOnly", false);
- m_rootTool->m_useHighETLHBinning = env.GetValue("useHighETLHBinning", false);
m_rootTool->m_useOneExtraHighETLHBin = env.GetValue("useOneExtraHighETLHBin", false);
// cut on Wstot above HighETBinThreshold
m_rootTool->m_cutWstotAtHighET = AsgConfigHelper::HelperDouble("CutWstotAtHighET", env);
@@ -342,7 +334,6 @@ asg::AcceptData AsgElectronLikelihoodTool::accept( const xAOD::Electron* eg, dou
float d0(0.0);
float deltaEta=0, deltaPhiRescaled2=0;
float wstot=0, EoverP=0;
- int convBit(0); // this no longer works
uint8_t ambiguityBit(0);
double ip(0);
@@ -405,11 +396,11 @@ asg::AcceptData AsgElectronLikelihoodTool::accept( const xAOD::Electron* eg, dou
// for now don't cache.
double likelihood = calculate(eg, ip);
- ATH_MSG_VERBOSE( Form("PassVars: LH=%8.5f, eta=%8.5f, et=%8.5f, nSiHitsPlusDeadSensors=%i, nHitsPlusPixDeadSensors=%i, passBLayerRequirement=%i, convBit=%i, ambiguityBit=%i, d0=%8.5f, deltaEta=%8.5f, deltaphires=%5.8f, wstot=%8.5f, EoverP=%8.5f, ip=%8.5f",
+ ATH_MSG_VERBOSE( Form("PassVars: LH=%8.5f, eta=%8.5f, et=%8.5f, nSiHitsPlusDeadSensors=%i, nHitsPlusPixDeadSensors=%i, passBLayerRequirement=%i, ambiguityBit=%i, d0=%8.5f, deltaEta=%8.5f, deltaphires=%5.8f, wstot=%8.5f, EoverP=%8.5f, ip=%8.5f",
likelihood, eta, et,
nSiHitsPlusDeadSensors, nPixHitsPlusDeadSensors,
passBLayerRequirement,
- convBit, ambiguityBit, d0, deltaEta, deltaPhiRescaled2,
+ ambiguityBit, d0, deltaEta, deltaPhiRescaled2,
wstot, EoverP, ip ));
if (!allFound) {
@@ -424,7 +415,6 @@ asg::AcceptData AsgElectronLikelihoodTool::accept( const xAOD::Electron* eg, dou
nSiHitsPlusDeadSensors,
nPixHitsPlusDeadSensors,
passBLayerRequirement,
- convBit,
ambiguityBit,
d0,
deltaEta,
@@ -477,7 +467,6 @@ asg::AcceptData AsgElectronLikelihoodTool::accept( const xAOD::Egamma* eg, doubl
uint8_t nSiHitsPlusDeadSensors(0);
uint8_t nPixHitsPlusDeadSensors(0);
bool passBLayerRequirement(false);
- int convBit(0); // this no longer works
uint8_t ambiguityBit(0);
// Get the pileup or centrality information
@@ -507,11 +496,11 @@ asg::AcceptData AsgElectronLikelihoodTool::accept( const xAOD::Egamma* eg, doubl
notFoundList += "wtots1 ";
}
- ATH_MSG_VERBOSE( Form("PassVars: LH=%8.5f, eta=%8.5f, et=%8.5f, nSiHitsPlusDeadSensors=%i, nPixHitsPlusDeadSensors=%i, passBLayerRequirement=%i, convBit=%i, ambiguityBit=%i, ip=%8.5f, wstot=%8.5f",
+ ATH_MSG_VERBOSE( Form("PassVars: LH=%8.5f, eta=%8.5f, et=%8.5f, nSiHitsPlusDeadSensors=%i, nPixHitsPlusDeadSensors=%i, passBLayerRequirement=%i, ambiguityBit=%i, ip=%8.5f, wstot=%8.5f",
likelihood, eta, et,
nSiHitsPlusDeadSensors, nPixHitsPlusDeadSensors,
passBLayerRequirement,
- convBit, ambiguityBit, ip, wstot));
+ ambiguityBit, ip, wstot));
if (!allFound) {
@@ -526,7 +515,6 @@ asg::AcceptData AsgElectronLikelihoodTool::accept( const xAOD::Egamma* eg, doubl
nSiHitsPlusDeadSensors,
nPixHitsPlusDeadSensors,
passBLayerRequirement,
- convBit,
ambiguityBit,
d0,
deltaEta,
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx
index e5083ff8a972e75ecc59e9ff2a000c01e5f81ab6..dc8390f2626cfbfaab96c099cd0a3e3b4f607c20 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "TElectronLikelihoodTool.h"
@@ -27,11 +27,9 @@
//----------------------------------------------------------------------------------------
Root::TElectronLikelihoodTool::TElectronLikelihoodTool(const char* name) :
asg::AsgMessaging(std::string(name)),
- m_doCutConversion(false),
m_doRemoveF3AtHighEt(false),
m_doRemoveTRTPIDAtHighEt(false),
m_doSmoothBinInterpolation(false),
- m_useHighETLHBinning(false),
m_useOneExtraHighETLHBin(false),
m_highETBinThreshold(125),
m_doPileupTransform(false),
@@ -48,7 +46,6 @@ Root::TElectronLikelihoodTool::TElectronLikelihoodTool(const char* name) :
m_cutPosition_NSilicon(-9),
m_cutPosition_NPixel(-9),
m_cutPosition_NBlayer(-9),
- m_cutPosition_conversion(-9),
m_cutPosition_ambiguity(-9),
m_cutPosition_LH(-9),
m_cutPositionTrackA0(-9),
@@ -110,10 +107,9 @@ StatusCode Root::TElectronLikelihoodTool::initialize()
}
unsigned int number_of_expected_bin_combinedLH ;
- if(m_useHighETLHBinning) number_of_expected_bin_combinedLH = s_fnDiscEtBins*s_fnEtaBins ;
- else if(m_useOneExtraHighETLHBin) number_of_expected_bin_combinedLH = s_fnDiscEtBinsOneExtra*s_fnEtaBins ;
- else number_of_expected_bin_combinedLH = s_fnDiscEtBinsOrig*s_fnEtaBins ;
- unsigned int number_of_expected_bin_combinedOther = s_fnDiscEtBinsOrig*s_fnEtaBins ;
+ if(m_useOneExtraHighETLHBin) number_of_expected_bin_combinedLH = s_fnDiscEtBinsOneExtra*s_fnEtaBins ;
+ else number_of_expected_bin_combinedLH = s_fnDiscEtBins*s_fnEtaBins ;
+ unsigned int number_of_expected_bin_combinedOther = s_fnDiscEtBins*s_fnEtaBins ;
if( m_cutLikelihood.size() != number_of_expected_bin_combinedLH){
@@ -196,10 +192,6 @@ StatusCode Root::TElectronLikelihoodTool::initialize()
m_cutPosition_NBlayer = m_acceptInfo.addCut( "NBlayer", "pass NBlayer" );
if ( m_cutPosition_NBlayer < 0 ) {sc = StatusCode::FAILURE;}
- // Conversion
- m_cutPosition_conversion = m_acceptInfo.addCut( "conversion", "pass conversion" );
- if ( m_cutPosition_conversion < 0 ) {sc = StatusCode::FAILURE;}
-
// Ambiguity
m_cutPosition_ambiguity = m_acceptInfo.addCut( "ambiguity", "pass ambiguity" );
if ( m_cutPosition_ambiguity < 0 ) {sc = StatusCode::FAILURE;}
@@ -277,12 +269,10 @@ StatusCode Root::TElectronLikelihoodTool::initialize()
<< "\n - (bool)CutBL (yes/no) : " << (m_cutBL.size() ? "yes" : "no")
<< "\n - (bool)CutPi (yes/no) : " << (m_cutPi.size() ? "yes" : "no")
<< "\n - (bool)CutSi (yes/no) : " << (m_cutSi.size() ? "yes" : "no")
- << "\n - (bool)doCutConversion (yes/no) : " << (m_doCutConversion ? "yes" : "no")
<< "\n - (bool)CutAmbiguity (yes/no) : " << (m_cutAmbiguity.size() ? "yes" : "no")
<< "\n - (bool)doRemoveF3AtHighEt (yes/no) : " << (m_doRemoveF3AtHighEt ? "yes" : "no")
<< "\n - (bool)doRemoveTRTPIDAtHighEt (yes/no) : " << (m_doRemoveTRTPIDAtHighEt ? "yes" : "no")
<< "\n - (bool)doSmoothBinInterpolation (yes/no) : " << (m_doSmoothBinInterpolation ? "yes" : "no")
- << "\n - (bool)useHighETLHBinning (yes/no) : " << (m_useHighETLHBinning ? "yes" : "no")
<< "\n - (bool)useOneExtraHighETLHBin(yes/no) : " << (m_useOneExtraHighETLHBin ? "yes" : "no")
<< "\n - (double)HighETBinThreshold : " << m_highETBinThreshold
<< "\n - (bool)doPileupTransform (yes/no) : " << (m_doPileupTransform ? "yes" : "no")
@@ -338,10 +328,9 @@ int Root::TElectronLikelihoodTool::loadVarHistograms(std::string vstr,unsigned i
return 1;
}
- // For backwards compatibility:
- // If we are not using the high ET LH binning, we only need to load PDFs
+ // We only need to load PDFs
// up to a certain ET value (40 GeV)
- if(!m_useHighETLHBinning && et > s_fnEtBinsHistOrig-1){
+ if(et > s_fnEtBinsHist-1){
continue;
}
@@ -378,7 +367,6 @@ Root::TElectronLikelihoodTool::accept( double likelihood,
int nSiHitsPlusDeadSensors,
int nPixHitsPlusDeadSensors,
bool passBLayerRequirement,
- int convBit,
uint8_t ambiguityBit,
double d0,
double deltaEta,
@@ -396,7 +384,6 @@ Root::TElectronLikelihoodTool::accept( double likelihood,
vars.nSiHitsPlusDeadSensors = nSiHitsPlusDeadSensors;
vars.nPixHitsPlusDeadSensors = nPixHitsPlusDeadSensors;
vars.passBLayerRequirement = passBLayerRequirement;
- vars.convBit = convBit;
vars.ambiguityBit = ambiguityBit;
vars.d0 = d0;
vars.deltaEta = deltaEta;
@@ -420,7 +407,6 @@ Root::TElectronLikelihoodTool::accept( LikeEnum::LHAcceptVars_t& vars_struct ) c
bool passNSilicon(true);
bool passNPixel(true);
bool passNBlayer(true);
- bool passConversion(true);
bool passAmbiguity(true);
bool passLH(true);
bool passTrackA0(true);
@@ -440,12 +426,12 @@ Root::TElectronLikelihoodTool::accept( LikeEnum::LHAcceptVars_t& vars_struct ) c
//unsigned int ipbin = 0;
// sanity
- if (etbinLH >= s_fnDiscEtBins) {
+ if (etbinLH >= s_fnDiscEtBinsOneExtra) {
ATH_MSG_WARNING( "Cannot evaluate likelihood for Et " << vars_struct.eT<< ". Returning false..");
passKine = false;
}
// sanity
- if (etbinOther >= s_fnDiscEtBinsOrig) {
+ if (etbinOther >= s_fnDiscEtBins) {
ATH_MSG_WARNING( "Cannot evaluate likelihood for Et " << vars_struct.eT<< ". Returning false..");
passKine = false;
}
@@ -455,12 +441,6 @@ Root::TElectronLikelihoodTool::accept( LikeEnum::LHAcceptVars_t& vars_struct ) c
acceptData.setCutResult( m_cutPosition_kinematic, passKine );
if ( !passKine ){ return acceptData; }
- // conversion bit
- if (m_doCutConversion && vars_struct.convBit){
- ATH_MSG_DEBUG("Likelihood macro: Conversion Bit Failed." );
- passConversion = false;
- }
-
// ambiguity bit
if (m_cutAmbiguity.size()) {
if ( !ElectronSelectorHelpers::passAmbiguity((xAOD::AmbiguityTool::AmbiguityType)vars_struct.ambiguityBit,
@@ -579,7 +559,6 @@ Root::TElectronLikelihoodTool::accept( LikeEnum::LHAcceptVars_t& vars_struct ) c
acceptData.setCutResult( m_cutPosition_NSilicon, passNSilicon );
acceptData.setCutResult( m_cutPosition_NPixel, passNPixel );
acceptData.setCutResult( m_cutPosition_NBlayer, passNBlayer );
- acceptData.setCutResult( m_cutPosition_conversion, passConversion );
acceptData.setCutResult( m_cutPosition_ambiguity, passAmbiguity );
acceptData.setCutResult( m_cutPosition_LH, passLH );
acceptData.setCutResult( m_cutPositionTrackA0, passTrackA0 );
@@ -889,28 +868,15 @@ unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtaBin(double eta) cons
unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtHistBin(double eT) const {
const double GeV = 1000;
- if(m_useHighETLHBinning){
- const unsigned int nEtBins = s_fnEtBinsHist;
- const double eTBins[nEtBins] = {7*GeV,10*GeV,15*GeV,20*GeV,30*GeV,40*GeV,100*GeV,6000*GeV};
+ const unsigned int nEtBins = s_fnEtBinsHist;
+ const double eTBins[nEtBins] = {7*GeV,10*GeV,15*GeV,20*GeV,30*GeV,40*GeV,50*GeV};
- for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
- if(eT < eTBins[eTBin])
- return eTBin;
- }
-
- return nEtBins-1; // Return the last bin if > the last bin.
+ for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
+ if(eT < eTBins[eTBin])
+ return eTBin;
}
- else{
- const unsigned int nEtBins = s_fnEtBinsHistOrig;
- const double eTBins[nEtBins] = {7*GeV,10*GeV,15*GeV,20*GeV,30*GeV,40*GeV,50*GeV};
- for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
- if(eT < eTBins[eTBin])
- return eTBin;
- }
-
- return nEtBins-1; // Return the last bin if > the last bin.
- }
+ return nEtBins-1; // Return the last bin if > the last bin.
}
//---------------------------------------------------------------------------------------
@@ -918,22 +884,7 @@ unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtHistBin(double eT) co
unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtDiscBin(double eT, const bool isLHbinning) const{
const double GeV = 1000;
- if(m_useHighETLHBinning && isLHbinning){
- const unsigned int nEtBins = s_fnDiscEtBins;
- const double eTBins[nEtBins] = {10*GeV,15*GeV,20*GeV,25*GeV,30*GeV,35*GeV,40*GeV,45*GeV
- ,100*GeV,150*GeV,200*GeV,250*GeV,300*GeV,350*GeV,400*GeV
- ,450*GeV,500*GeV,600*GeV,700*GeV,800*GeV,900*GeV,1000*GeV
- ,1200*GeV,1400*GeV,1600*GeV,1800*GeV,2000*GeV,2200*GeV
- ,2400*GeV,2600*GeV,2800*GeV,3000*GeV,6000*GeV};
-
- for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
- if(eT < eTBins[eTBin])
- return eTBin;
- }
-
- return nEtBins-1; // Return the last bin if > the last bin.
- }
- else if(m_useOneExtraHighETLHBin && isLHbinning){
+ if(m_useOneExtraHighETLHBin && isLHbinning){
const unsigned int nEtBins = s_fnDiscEtBinsOneExtra;
const double eTBins[nEtBins] = {10*GeV,15*GeV,20*GeV,25*GeV,30*GeV,35*GeV,40*GeV,45*GeV,m_highETBinThreshold*GeV,6000*GeV};
@@ -946,7 +897,7 @@ unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtDiscBin(double eT, co
}
else{
- const unsigned int nEtBins = s_fnDiscEtBinsOrig;
+ const unsigned int nEtBins = s_fnDiscEtBins;
const double eTBins[nEtBins] = {10*GeV,15*GeV,20*GeV,25*GeV,30*GeV,35*GeV,40*GeV,45*GeV,50*GeV};
for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
@@ -964,7 +915,7 @@ unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtDiscBin(double eT, co
// Gets the bin name. Given the HISTOGRAM binning (fnEtBinsHist)
void Root::TElectronLikelihoodTool::getBinName(char* buffer, int etbin,int etabin, int ipbin, std::string iptype) const{
double eta_bounds[9] = {0.0,0.6,0.8,1.15,1.37,1.52,1.81,2.01,2.37};
- int et_bounds[s_fnEtBinsHist] = {4,7,10,15,20,30,40,100};
+ int et_bounds[s_fnEtBinsHist] = {4,7,10,15,20,30,40};
if (!iptype.empty()){
snprintf(buffer, 200,"%s%det%02deta%0.2f", iptype.c_str(), int(fIpBounds[ipbin]), et_bounds[etbin], eta_bounds[etabin]);
}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
index b1b548c680c450118ee31cd618a51505f92f9eb3..5f0017183e2bf28d51f485989a918432b1eafe3f 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
@@ -109,7 +109,6 @@ namespace LikeEnum {
int nSiHitsPlusDeadSensors;
int nPixHitsPlusDeadSensors;
bool passBLayerRequirement;
- int convBit;
uint8_t ambiguityBit;
double d0;
double deltaEta;
@@ -185,7 +184,7 @@ namespace Root {
double eta, double eT,
int nSiHitsPlusDeadSensors, int nPixHitsPlusDeadSensors,
bool passBLayerRequirement,
- int convBit, uint8_t ambiguityBit, double d0, double deltaEta, double deltaphires,
+ uint8_t ambiguityBit, double d0, double deltaEta, double deltaphires,
double wstot, double EoverP, double ip ) const;
/** Return dummy accept with only info */
asg::AcceptData accept() const { return asg::AcceptData(&m_acceptInfo); }
@@ -251,8 +250,6 @@ namespace Root {
std::vector<double> m_cutDeltaEta;
// /** @brief do cut on delta phi bit*/
std::vector<double> m_cutDeltaPhiRes;
- /** @brief do cut on conversion bit*/
- bool m_doCutConversion;
/** @brief do cut on ambiguity bit*/
std::vector<int> m_cutAmbiguity;
/** @brief do remove f3 variable from likelihood at high Et (>80 GeV)*/
@@ -261,8 +258,6 @@ namespace Root {
bool m_doRemoveTRTPIDAtHighEt;
/** @brief do smooth interpolation between bins */
bool m_doSmoothBinInterpolation;
- /** @brief use binning for high ET LH*/
- bool m_useHighETLHBinning;
/** @brief use one extra bin for high ET LH*/
bool m_useOneExtraHighETLHBin;
/** @brief ET threshold for using high ET cuts and bin */
@@ -352,9 +347,6 @@ namespace Root {
/// The position of the NBlayer cut bit in the AcceptInfo return object
int m_cutPosition_NBlayer;
- /// The position of the conversion cut bit in the AcceptInfo return object
- int m_cutPosition_conversion;
-
/// The position of the ambiguity cut bit in the AcceptInfo return object
int m_cutPosition_ambiguity;
@@ -377,10 +369,8 @@ namespace Root {
int m_cutPositionEoverPAtHighET;
static const double fIpBounds[IP_BINS+1];
- static const unsigned int s_fnEtBinsHist = 8; // number of hists stored for LH with many high ET bins (useHighETLHBinning), including 4GeV bin
- static const unsigned int s_fnDiscEtBins = 33; // number of discs stored for LH with many high ET bins (useHighETLHBinning), excluding 4GeV bin
- static const unsigned int s_fnEtBinsHistOrig = 7; // number of hists stored for original LH, including 4GeV bin (for backwards compatibility)
- static const unsigned int s_fnDiscEtBinsOrig = 9; // number of discs stored for original LH, excluding 4GeV bin (for backwards compatibility)
+ static const unsigned int s_fnEtBinsHist = 7; // number of hists stored for original LH, including 4GeV bin (for backwards compatibility)
+ static const unsigned int s_fnDiscEtBins = 9; // number of discs stored for original LH, excluding 4GeV bin (for backwards compatibility)
static const unsigned int s_fnDiscEtBinsOneExtra = 10; // number of discs stored for original LH plus one for HighETBinThreshold (useOneExtraHighETLHBin), excluding 4GeV bin
static const unsigned int s_fnEtaBins = 10;
static const unsigned int s_fnVariables = 13;
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodMenuDefs.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodMenuDefs.py
index 00900caa12fa28e62a2b17bb3ff0b2981c99132b..f82c4e27eed7b4c50682da1efedb0b386a0487e2 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodMenuDefs.py
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/ElectronLikelihoodMenuDefs.py
@@ -1,8 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# default configuration of the ElectronLikelihoodMenuDefs
-#
-
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+
import cppyy
try :
cppyy.loadDictionary('ElectronPhotonSelectorToolsDict')
@@ -19,7 +16,6 @@ std.vector('int')
# Import a needed helper
from PATCore.HelperUtils import *
-
def ElectronLikelihoodCUSTOMMediumConfig(theTool) :
'''
This is for the custom implementation of the MediumLLH definitions.
@@ -33,9 +29,6 @@ def ElectronLikelihoodCUSTOMMediumConfig(theTool) :
# PdfFileName
theTool.inputPDFFileName = "ElectronPhotonSelectorTools/v1/ElectronLikelihoodPdfs.root"
- # do cut on conversion
- theTool.doCutConversion = 0
-
# do remove f3 at high Et
theTool.doRemoveF3AtHighEt = 0
@@ -88,9 +81,6 @@ def ElectronLikelihoodCUSTOMMediumNoGSFConfig(theTool) :
# PdfFileName
theTool.inputPDFFileName = "ElectronPhotonSelectorTools/v1/ElectronLikelihoodPdfs.root"
- # do cut on conversion
- theTool.doCutConversion = 0
-
# do remove f3 at high Et
theTool.doRemoveF3AtHighEt = 0