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.

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

Adaptation to enable the use of a new MVAIsolation training #21022

Merged
merged 19 commits into from Nov 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
75e3b6a
Add new payloads for MVAIso 2017v1
mbluj Oct 25, 2017
ac57c2e
Update MVAIso discriminants (oldDMs, R=0.5) to 2017v1 training; add V…
mbluj Oct 25, 2017
3d7569f
Add new VVLoose MVAIso WP to PAT/MiniAOD
mbluj Oct 25, 2017
f409fc9
bugfix
mbluj Oct 25, 2017
00e4b6b
Merge pull request #61 from mbluj/CMSSW_9_4_X_tauMVAIso2017v1
roger-wolf Oct 25, 2017
48c0759
Add protection against a missing tauId source(s)
mbluj Oct 26, 2017
9891822
Merge pull request #62 from mbluj/CMSSW_9_4_X_tauMVAIso2017v1
mbluj Oct 26, 2017
b2d6c67
use nullptr rather than 0 for a null pointer
mbluj Oct 26, 2017
072bcc7
Merge pull request #63 from mbluj/CMSSW_9_4_X_tauMVAIso2017v1
mbluj Oct 26, 2017
4feb9c9
Add protection againist missing (calo) tauId sources
mbluj Oct 26, 2017
b2e7047
Merge pull request #64 from mbluj/CMSSW_9_4_X_tauMVAIso2017v1
mbluj Oct 26, 2017
31cdc5e
add a switch allowing/disallowing skipping missing tauId products in …
mbluj Oct 26, 2017
8ce3d19
Temporary customize to the unit tests that fail due to old input samples
mbluj Oct 26, 2017
aefbc01
Temporary customize to the unit tests that fail due to old input samples
mbluj Oct 26, 2017
847aba7
Merge pull request #65 from mbluj/CMSSW_9_4_X_tauMVAIso2017v1
mbluj Oct 26, 2017
cc795b6
code-checks
mbluj Oct 26, 2017
b1c10da
Merge pull request #66 from mbluj/CMSSW_9_4_X_tauMVAIso2017v1
mbluj Oct 26, 2017
0aa1462
Temporary customize to the unit tests that fail due to old input samples
mbluj Oct 30, 2017
07ebdd3
Merge pull request #67 from mbluj/CMSSW_9_4_X_tauMVAIso2017v1
mbluj Oct 30, 2017
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
17 changes: 15 additions & 2 deletions PhysicsTools/PatAlgos/plugins/PATTauProducer.cc
Expand Up @@ -87,6 +87,7 @@ PATTauProducer::PATTauProducer(const edm::ParameterSet & iConfig):
}
caloTauIDTokens_ = edm::vector_transform(tauIDSrcs_, [this](NameTag const & tag){return mayConsume<reco::CaloTauDiscriminator>(tag.second);});
pfTauIDTokens_ = edm::vector_transform(tauIDSrcs_, [this](NameTag const & tag){return mayConsume<reco::PFTauDiscriminator>(tag.second);});
skipMissingTauID_ = iConfig.getParameter<bool>( "skipMissingTauID" );
// IsoDeposit configurables
if (iConfig.exists("isoDeposits")) {
edm::ParameterSet depconf = iConfig.getParameter<edm::ParameterSet>("isoDeposits");
Expand Down Expand Up @@ -315,6 +316,11 @@ void PATTauProducer::produce(edm::Event & iEvent, const edm::EventSetup & iSetup
edm::Handle<reco::PFTauDiscriminator> pfTauIdDiscr;
iEvent.getByToken(pfTauIDTokens_[i], pfTauIdDiscr);

if(skipMissingTauID_ && !pfTauIdDiscr.isValid()){
edm::LogWarning("DataSource") << "Tau discriminator '" << tauIDSrcs_[i].first
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be made a LogInfo?
The warning shows up for every tau and just pollutes the logs.
A more informative option that will still be printed is to accumulate the number of dropped IDs and print only the first time it happens.

<< "' has not been found in the event. It will not be embedded into the pat::Tau object.";
continue;
}
ids[i].first = tauIDSrcs_[i].first;
ids[i].second = getTauIdDiscriminator(pfTauCollection, idx, pfTauIdDiscr);
} else if ( typeid(*tausRef) == typeid(reco::CaloTau) ) {
Expand All @@ -325,6 +331,11 @@ void PATTauProducer::produce(edm::Event & iEvent, const edm::EventSetup & iSetup
edm::Handle<reco::CaloTauDiscriminator> caloTauIdDiscr;
iEvent.getByToken(caloTauIDTokens_[i], caloTauIdDiscr);

if(skipMissingTauID_ && !caloTauIdDiscr.isValid()){
edm::LogWarning("DataSource") << "Tau discriminator '" << tauIDSrcs_[i].first
<< "' has not been found in the event. It will not be embedded into the pat::Tau object.";
continue;
}
ids[i].first = tauIDSrcs_[i].first;
ids[i].second = getTauIdDiscriminator(caloTauCollection, idx, caloTauIdDiscr);
} else {
Expand Down Expand Up @@ -367,7 +378,7 @@ void PATTauProducer::produce(edm::Event & iEvent, const edm::EventSetup & iSetup
sumPhiTimesEnergy += icand->positionAtECALEntrance().phi()*icand->energy();
sumEtaTimesEnergy += icand->positionAtECALEntrance().eta()*icand->energy();
sumEnergy += icand->energy();
const reco::Track* track = 0;
const reco::Track* track = nullptr;
if ( icand->trackRef().isNonnull() ) track = icand->trackRef().get();
else if ( icand->muonRef().isNonnull() && icand->muonRef()->innerTrack().isNonnull() ) track = icand->muonRef()->innerTrack().get();
else if ( icand->muonRef().isNonnull() && icand->muonRef()->globalTrack().isNonnull() ) track = icand->muonRef()->globalTrack().get();
Expand Down Expand Up @@ -522,7 +533,9 @@ void PATTauProducer::fillDescriptions(edm::ConfigurationDescriptions & descripti
tauIDSourcesPSet.setAllowAnything();
iDesc.addNode( edm::ParameterDescription<edm::InputTag>("tauIDSource", edm::InputTag(), true) xor
edm::ParameterDescription<edm::ParameterSetDescription>("tauIDSources", tauIDSourcesPSet, true)
)->setComment("input with electron ID variables");
)->setComment("input with tau ID variables");
// (Dis)allow to skip missing tauId sources
iDesc.add<bool>("skipMissingTauID", false)->setComment("allow to skip a tau ID variable when not present in the event");

// IsoDeposit configurables
edm::ParameterSetDescription isoDepositsPSet;
Expand Down
6 changes: 3 additions & 3 deletions PhysicsTools/PatAlgos/plugins/PATTauProducer.h
Expand Up @@ -48,9 +48,9 @@ namespace pat {
public:

explicit PATTauProducer(const edm::ParameterSet & iConfig);
~PATTauProducer();
~PATTauProducer() override;

virtual void produce(edm::Event & iEvent, const edm::EventSetup& iSetup) override;
void produce(edm::Event & iEvent, const edm::EventSetup& iSetup) override;

static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);

Expand Down Expand Up @@ -93,7 +93,7 @@ namespace pat {
std::vector<NameTag> tauIDSrcs_;
std::vector<edm::EDGetTokenT<reco::CaloTauDiscriminator> > caloTauIDTokens_;
std::vector<edm::EDGetTokenT<reco::PFTauDiscriminator> > pfTauIDTokens_;

bool skipMissingTauID_;
// tools
GreaterByPt<Tau> pTTauComparator_;

Expand Down
Expand Up @@ -79,6 +79,7 @@
byCombinedIsolationDeltaBetaCorrRaw3Hits = cms.InputTag("hpsPFTauDiscriminationByRawCombinedIsolationDBSumPtCorr3Hits"),
byPhotonPtSumOutsideSignalCone = cms.InputTag("hpsPFTauDiscriminationByPhotonPtSumOutsideSignalCone"),
byIsolationMVArun2v1DBoldDMwLTraw = cms.InputTag("hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw"),
byVVLooseIsolationMVArun2v1DBoldDMwLT = cms.InputTag("hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT"),
byVLooseIsolationMVArun2v1DBoldDMwLT = cms.InputTag("hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT"),
byLooseIsolationMVArun2v1DBoldDMwLT = cms.InputTag("hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT"),
byMediumIsolationMVArun2v1DBoldDMwLT = cms.InputTag("hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT"),
Expand Down Expand Up @@ -133,7 +134,7 @@
againstElectronTightMVA6 = cms.InputTag("hpsPFTauDiscriminationByMVA6TightElectronRejection"),
againstElectronVTightMVA6 = cms.InputTag("hpsPFTauDiscriminationByMVA6VTightElectronRejection"),
),

skipMissingTauID = cms.bool(False), #Allow to skip a tau ID variable when not present in the event"
# mc matching configurables
addGenMatch = cms.bool(True),
embedGenMatch = cms.bool(True),
Expand Down
1 change: 1 addition & 0 deletions PhysicsTools/PatAlgos/python/tools/tauTools.py
Expand Up @@ -118,6 +118,7 @@ def _switchToPFTau(process,
("againstMuonLoose3", "DiscriminationByLooseMuonRejection3"),
("againstMuonTight3", "DiscriminationByTightMuonRejection3"),
("byIsolationMVArun2v1DBoldDMwLTraw", "DiscriminationByIsolationMVArun2v1DBoldDMwLTraw"),
("byVVLooseIsolationMVArun2v1DBoldDMwLT", "DiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT"),
("byVLooseIsolationMVArun2v1DBoldDMwLT", "DiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT"),
("byLooseIsolationMVArun2v1DBoldDMwLT", "DiscriminationByLooseIsolationMVArun2v1DBoldDMwLT"),
("byMediumIsolationMVArun2v1DBoldDMwLT", "DiscriminationByMediumIsolationMVArun2v1DBoldDMwLT"),
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/IntegrationTest_cfg.py
Expand Up @@ -10,6 +10,8 @@
## to run in un-scheduled mode uncomment the following lines
process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
# Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patMiniAOD_standard_cfg.py
Expand Up @@ -5,6 +5,8 @@

process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_PATandPF2PAT_cfg.py
Expand Up @@ -17,6 +17,8 @@
# load the PAT config (for the PAT only part)
process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
3 changes: 3 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_PF2PAT_cfg.py
@@ -1,5 +1,6 @@
## import skeleton process
from PhysicsTools.PatAlgos.patTemplate_cfg import *

# verbose flags for the PF2PAT modules

#process.Tracer = cms.Service("Tracer")
Expand All @@ -10,6 +11,8 @@
postfix = "PFlow"
jetAlgo="AK4"
usePF2PAT(process,runPF2PAT=True, jetAlgo=jetAlgo, runOnMC=True, postfix=postfix)
#Temporary customize to the unit tests that fail due to old input samples
getattr(process,"patTaus"+postfix).skipMissingTauID = True

# to turn on type-1 MET corrections, use the following call
#usePF2PAT(process,runPF2PAT=True, jetAlgo=jetAlgo, runOnMC=True, postfix=postfix, typeIMetCorrections=True)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_addBTagging_cfg.py
Expand Up @@ -4,6 +4,8 @@
## to run in un-scheduled mode uncomment the following lines
process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_addDecayInFlight_cfg.py
Expand Up @@ -6,6 +6,8 @@
# load the PAT config
process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_addJets_cfg.py
Expand Up @@ -5,6 +5,8 @@

process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_addTracks_cfg.py
Expand Up @@ -5,6 +5,8 @@

process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_addTriggerInfo_cfg.py
Expand Up @@ -8,6 +8,8 @@
# Load default PAT
process.load( "PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff" )
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load( "PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff" )
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_addVertexInfo_cfg.py
Expand Up @@ -5,6 +5,8 @@

process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_data_cfg.py
Expand Up @@ -48,6 +48,8 @@
## Processing
process.load( "PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff" )
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load( "PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff" )
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_fastsim_cfg.py
Expand Up @@ -5,6 +5,8 @@

process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_metUncertainties_cfg.py
Expand Up @@ -3,6 +3,8 @@

process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_onlyTaus_cfg.py
Expand Up @@ -6,6 +6,8 @@
## load tau sequences up to selectedPatTaus
process.load("PhysicsTools.PatAlgos.producersLayer1.tauProducer_cff")
patAlgosToolsTask.add(process.makePatTausTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True
process.load("PhysicsTools.PatAlgos.selectionLayer1.tauSelector_cfi")
patAlgosToolsTask.add(process.selectedPatTaus)

Expand Down
2 changes: 2 additions & 0 deletions PhysicsTools/PatAlgos/test/patTuple_standard_cfg.py
Expand Up @@ -5,6 +5,8 @@

process.load("PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff")
patAlgosToolsTask.add(process.patCandidatesTask)
#Temporary customize to the unit tests that fail due to old input samples
process.patTaus.skipMissingTauID = True

process.load("PhysicsTools.PatAlgos.selectionLayer1.selectedPatCandidates_cff")
patAlgosToolsTask.add(process.selectedPatCandidatesTask)
Expand Down
21 changes: 12 additions & 9 deletions RecoTauTag/Configuration/python/HPSPFTaus_cff.py
Expand Up @@ -513,8 +513,8 @@
PFTauProducer = cms.InputTag('hpsPFTauProducer'),
Prediscriminants = requireDecayMode.clone(),
loadMVAfromDB = cms.bool(True),
mvaName = cms.string("RecoTauTag_tauIdMVADBoldDMwLTv1"),
mvaOpt = cms.string("DBoldDMwLT"),
mvaName = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1"),
mvaOpt = cms.string("DBoldDMwLTwGJ"),
srcTauTransverseImpactParameters = cms.InputTag('hpsPFTauTransverseImpactParameters'),
srcChargedIsoPtSum = cms.InputTag('hpsPFTauChargedIsoPtSum'),
srcNeutralIsoPtSum = cms.InputTag('hpsPFTauNeutralIsoPtSum'),
Expand All @@ -530,25 +530,27 @@
toMultiplex = cms.InputTag('hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw'),
key = cms.InputTag('hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw:category'),
loadMVAfromDB = cms.bool(True),
mvaOutput_normalization = cms.string("RecoTauTag_tauIdMVADBoldDMwLTv1_mvaOutput_normalization"),
mvaOutput_normalization = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_mvaOutput_normalization"),
mapping = cms.VPSet(
cms.PSet(
category = cms.uint32(0),
cut = cms.string("RecoTauTag_tauIdMVADBoldDMwLTv1_WPEff90"),
cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff90"),
variable = cms.string("pt")
)
)
)
hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff95")
hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBoldDMwLTv1_WPEff80")
hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff80")
hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBoldDMwLTv1_WPEff70")
hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff70")
hpsPFTauDiscriminationByTightIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
hpsPFTauDiscriminationByTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBoldDMwLTv1_WPEff60")
hpsPFTauDiscriminationByTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff60")
hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBoldDMwLTv1_WPEff50")
hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff50")
hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBoldDMwLTv1_WPEff40")
hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff40")

hpsPFTauDiscriminationByIsolationMVArun2v1DBnewDMwLTraw = hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw.clone(
mvaName = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1"),
Expand Down Expand Up @@ -760,6 +762,7 @@
hpsPFTauFootprintCorrection,
hpsPFTauPhotonPtSumOutsideSignalCone,
hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw,
hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT,
hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT,
hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT,
hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT,
Expand Down
Expand Up @@ -46,6 +46,7 @@
'keep *_hpsPFTauDiscriminationByMVA6TightElectronRejection_*_*',
'keep *_hpsPFTauDiscriminationByMVA6VTightElectronRejection_*_*',
'keep *_hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw_*_*',
'keep *_hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT_*_*',
'keep *_hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT_*_*',
'keep *_hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT_*_*',
'keep *_hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT_*_*',
Expand Down Expand Up @@ -129,6 +130,7 @@
'keep *_hpsPFTauDiscriminationByMVA6TightElectronRejection_*_*',
'keep *_hpsPFTauDiscriminationByMVA6VTightElectronRejection_*_*',
'keep *_hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw_*_*',
'keep *_hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT_*_*',
'keep *_hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT_*_*',
'keep *_hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT_*_*',
'keep *_hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT_*_*',
Expand Down