Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring of anti-electron tauID #30581

Merged
merged 6 commits into from Jul 20, 2020
Merged

Refactoring of anti-electron tauID #30581

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f6ee4c
templated version of anti-e MVA6 tauID
mbluj Jun 23, 2020
96840b8
Remove old type-specific anti-e MVA6 tauID and use auto-generated con…
mbluj Jun 23, 2020
2ab132b
Intialise members of helper structs, small fixes and cleaning
mbluj Jul 3, 2020
aff43e1
Code quality fixes
mbluj Jul 7, 2020
4ee40aa
namespace to protect anti-e MVA6 variable blocks
mbluj Jul 9, 2020
aa84916
small improvements
mbluj Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion PhysicsTools/NanoAOD/python/taus_updatedMVAIds_cff.py
View file
Open in desktop
Expand Up @@ -168,10 +168,12 @@
### Define new anit-e discriminants (2018)
antiElectronDiscrMVA6_version = "MVA"
## Raw
from RecoTauTag.RecoTau.PATTauDiscriminationAgainstElectronMVA6_cfi import patTauDiscriminationAgainstElectronMVA6
from RecoTauTag.RecoTau.patTauDiscriminationAgainstElectronMVA6_cfi import patTauDiscriminationAgainstElectronMVA6
from RecoTauTag.RecoTau.TauDiscriminatorTools import noPrediscriminants
patTauDiscriminationByElectronRejectionMVA62018Raw = patTauDiscriminationAgainstElectronMVA6.clone(
PATTauProducer = 'slimmedTaus',
Prediscriminants = noPrediscriminants, #already selected for MiniAOD
srcElectrons = 'slimmedElectrons',
vetoEcalCracks = False, #keep tau candidates in EB-EE cracks
mvaName_NoEleMatch_wGwoGSF_BL = 'RecoTauTag_antiElectron'+antiElectronDiscrMVA6_version+'_NoEleMatch_wGwoGSF_BL',
mvaName_NoEleMatch_wGwoGSF_EC = 'RecoTauTag_antiElectron'+antiElectronDiscrMVA6_version+'_NoEleMatch_wGwoGSF_EC',
Expand Down Expand Up @@ -247,7 +249,9 @@
antiElectronDiscrMVA6v1_version = "MVA6v1"
## Raw
patTauDiscriminationByElectronRejectionMVA62015Raw = patTauDiscriminationAgainstElectronMVA6.clone(
PATTauProducer = 'slimmedTaus',
Prediscriminants = noPrediscriminants, #already selected for MiniAOD
srcElectrons = 'slimmedElectrons',
vetoEcalCracks = True, #don't keep tau candidates in EB-EE cracks for v1
mvaName_NoEleMatch_wGwoGSF_BL = 'RecoTauTag_antiElectron'+antiElectronDiscrMVA6v1_version+'_gbr_NoEleMatch_wGwoGSF_BL',
mvaName_NoEleMatch_wGwoGSF_EC = 'RecoTauTag_antiElectron'+antiElectronDiscrMVA6v1_version+'_gbr_NoEleMatch_wGwoGSF_EC',
Expand Down
3 changes: 2 additions & 1 deletion RecoTauTag/Configuration/python/HPSPFTaus_cff.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
from RecoTauTag.RecoTau.PFRecoTauDiscriminationByIsolation_cfi import *
from RecoTauTag.RecoTau.PFRecoTauDiscriminationByLeadingTrackFinding_cfi import *
from RecoTauTag.RecoTau.PFRecoTauDiscriminationAgainstElectron_cfi import *
from RecoTauTag.RecoTau.PFRecoTauDiscriminationAgainstElectronMVA6_cfi import *
from RecoTauTag.RecoTau.pfRecoTauDiscriminationAgainstElectronMVA6_cfi import *
from RecoTauTag.RecoTau.pfRecoTauDiscriminationAgainstElectronDeadECAL_cfi import *
from RecoTauTag.RecoTau.PFRecoTauDiscriminationAgainstMuon_cfi import *
from RecoTauTag.RecoTau.pfRecoTauDiscriminationAgainstMuon2Container_cfi import *
Expand Down Expand Up @@ -220,6 +220,7 @@
## ByMVA6rawElectronRejection
hpsPFTauDiscriminationByMVA6rawElectronRejection = pfRecoTauDiscriminationAgainstElectronMVA6.clone(
PFTauProducer = cms.InputTag('hpsPFTauProducer'),
srcElectrons = cms.InputTag('gedGsfElectrons'),
Prediscriminants = requireDecayMode.clone(),
loadMVAfromDB = cms.bool(True),
vetoEcalCracks = cms.bool(False),
Expand Down
163 changes: 74 additions & 89 deletions RecoTauTag/RecoTau/interface/AntiElectronIDMVA6.h
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
// Helper Class for applying MVA anti-electron discrimination
//
// Authors: F.Colombo, C.Veelken
// M. Bluj (template version)
//--------------------------------------------------------------------------------------------------

#ifndef RECOTAUTAG_RECOTAU_AntiElectronIDMVA6_H
Expand Down Expand Up @@ -32,98 +33,82 @@

#include <vector>

struct TauVars {
mbluj marked this conversation as resolved.
Show resolved Hide resolved
float pt = 0;
float etaAtEcalEntrance = 0;
float phi = 0;
float leadChargedPFCandPt = 0;
float leadChargedPFCandEtaAtEcalEntrance = 0;
float emFraction = 0;
float leadPFChargedHadrHoP = 0;
float leadPFChargedHadrEoP = 0;
float visMassIn = 0;
float dCrackEta = 0;
float dCrackPhi = 0;
float hasGsf = 0;
};
struct TauGammaVecs {
std::vector<float> gammasdEtaInSigCone;
std::vector<float> gammasdPhiInSigCone;
std::vector<float> gammasPtInSigCone;
std::vector<float> gammasdEtaOutSigCone;
std::vector<float> gammasdPhiOutSigCone;
std::vector<float> gammasPtOutSigCone;
};
struct TauGammaMoms {
int signalPFGammaCandsIn = 0;
int signalPFGammaCandsOut = 0;
float gammaEtaMomIn = 0;
float gammaEtaMomOut = 0;
float gammaPhiMomIn = 0;
float gammaPhiMomOut = 0;
float gammaEnFracIn = 0;
float gammaEnFracOut = 0;
};
struct ElecVars {
float eta = 0;
float phi = 0;
float eTotOverPin = 0;
float chi2NormGSF = 0;
float chi2NormKF = 0;
float gsfNumHits = 0;
float kfNumHits = 0;
float gsfTrackResol = 0;
float gsfTracklnPt = 0;
float pIn = 0;
float pOut = 0;
float eEcal = 0;
float deltaEta = 0;
float deltaPhi = 0;
float mvaInSigmaEtaEta = 0;
float mvaInHadEnergy = 0;
float mvaInDeltaEta = 0;
};

template <class TauType, class ElectronType>
class AntiElectronIDMVA6 {
public:
AntiElectronIDMVA6(const edm::ParameterSet&);
~AntiElectronIDMVA6();

void beginEvent(const edm::Event&, const edm::EventSetup&);

double MVAValue(Float_t TauPt,
Float_t TauEtaAtEcalEntrance,
Float_t TauPhi,
Float_t TauLeadChargedPFCandPt,
Float_t TauLeadChargedPFCandEtaAtEcalEntrance,
Float_t TauEmFraction,
Float_t TauLeadPFChargedHadrHoP,
Float_t TauLeadPFChargedHadrEoP,
Float_t TauVisMassIn,
Float_t TaudCrackEta,
Float_t TaudCrackPhi,
Float_t TauHasGsf,
Int_t TauSignalPFGammaCandsIn,
Int_t TauSignalPFGammaCandsOut,
const std::vector<Float_t>& GammasdEtaInSigCone,
const std::vector<Float_t>& GammasdPhiInSigCone,
const std::vector<Float_t>& GammasPtInSigCone,
const std::vector<Float_t>& GammasdEtaOutSigCone,
const std::vector<Float_t>& GammasdPhiOutSigCone,
const std::vector<Float_t>& GammasPtOutSigCone,
Float_t ElecEta,
Float_t ElecPhi,
Float_t ElecEtotOverPin,
Float_t ElecChi2NormGSF,
Float_t ElecChi2NormKF,
Float_t ElecGSFNumHits,
Float_t ElecKFNumHits,
Float_t ElecGSFTrackResol,
Float_t ElecGSFTracklnPt,
Float_t ElecPin,
Float_t ElecPout,
Float_t ElecEecal,
Float_t ElecDeltaEta,
Float_t ElecDeltaPhi,
Float_t ElecMvaInSigmaEtaEta,
Float_t ElecMvaInHadEnergy,
Float_t ElecMvaInDeltaEta);

double MVAValue(Float_t TauPt,
Float_t TauEtaAtEcalEntrance,
Float_t TauPhi,
Float_t TauLeadChargedPFCandPt,
Float_t TauLeadChargedPFCandEtaAtEcalEntrance,
Float_t TauEmFraction,
Float_t TauLeadPFChargedHadrHoP,
Float_t TauLeadPFChargedHadrEoP,
Float_t TauVisMassIn,
Float_t TaudCrackEta,
Float_t TaudCrackPhi,
Float_t TauHasGsf,
Int_t TauSignalPFGammaCandsIn,
Int_t TauSignalPFGammaCandsOut,
Float_t TauGammaEtaMomIn,
Float_t TauGammaEtaMomOut,
Float_t TauGammaPhiMomIn,
Float_t TauGammaPhiMomOut,
Float_t TauGammaEnFracIn,
Float_t TauGammaEnFracOut,
Float_t ElecEta,
Float_t ElecPhi,
Float_t ElecEtotOverPin,
Float_t ElecChi2NormGSF,
Float_t ElecChi2NormKF,
Float_t ElecGSFNumHits,
Float_t ElecKFNumHits,
Float_t ElecGSFTrackResol,
Float_t ElecGSFTracklnPt,
Float_t ElecPin,
Float_t ElecPout,
Float_t ElecEecal,
Float_t ElecDeltaEta,
Float_t ElecDeltaPhi,
Float_t ElecMvaInSigmaEtaEta,
Float_t ElecMvaInHadEnergy,
Float_t ElecMvaInDeltaEta);
double MVAValue(const TauVars& tauVars, const TauGammaVecs& tauGammaVecs, const ElecVars& elecVars);

// this function can be called for all categories
double MVAValue(const reco::PFTau& thePFTau, const reco::GsfElectron& theGsfEle);
// this function can be called for category 1 only !!
double MVAValue(const reco::PFTau& thePFTau);
double MVAValue(const TauVars& tauVars, const TauGammaMoms& tauGammaMoms, const ElecVars& elecVars);

// this function can be called for all categories
double MVAValue(const pat::Tau& theTau, const pat::Electron& theEle);
double MVAValue(const TauType& theTau, const ElectronType& theEle);
// this function can be called for category 1 only !!
double MVAValue(const pat::Tau& theTau);
double MVAValue(const TauType& theTau);

// overloaded method with explicit tau type to avoid partial imlementation of full class
TauVars getTauVarsTypeSpecific(const reco::PFTau& theTau);
TauVars getTauVarsTypeSpecific(const pat::Tau& theTau);
TauVars getTauVars(const TauType& theTau);
TauGammaVecs getTauGammaVecs(const TauType& theTau);
ElecVars getElecVars(const ElectronType& theEle);

// track extrapolation to ECAL entrance (used to re-calculate variables that might not be available on miniAOD)
bool atECalEntrance(const reco::Candidate* part, math::XYZPoint& pos);

Expand All @@ -147,14 +132,14 @@ class AntiElectronIDMVA6 {

bool usePhiAtEcalEntranceExtrapolation_;

Float_t* Var_NoEleMatch_woGwoGSF_Barrel_;
Float_t* Var_NoEleMatch_wGwoGSF_Barrel_;
Float_t* Var_woGwGSF_Barrel_;
Float_t* Var_wGwGSF_Barrel_;
Float_t* Var_NoEleMatch_woGwoGSF_Endcap_;
Float_t* Var_NoEleMatch_wGwoGSF_Endcap_;
Float_t* Var_woGwGSF_Endcap_;
Float_t* Var_wGwGSF_Endcap_;
float* Var_NoEleMatch_woGwoGSF_Barrel_;
float* Var_NoEleMatch_wGwoGSF_Barrel_;
float* Var_woGwGSF_Barrel_;
float* Var_wGwGSF_Barrel_;
float* Var_NoEleMatch_woGwoGSF_Endcap_;
float* Var_NoEleMatch_wGwoGSF_Endcap_;
float* Var_woGwGSF_Endcap_;
float* Var_wGwGSF_Endcap_;

const GBRForest* mva_NoEleMatch_woGwoGSF_BL_;
const GBRForest* mva_NoEleMatch_wGwoGSF_BL_;
Expand Down