Merge pull request #18244 from cms-tau-pog/CMSSW_9_1_X_tau-pog_miniAO…

…D-tauMVAs

Developments to provide facilitated access to new TauID information (all high level changes)

DataFormats/PatCandidates/src/classes_def_objects.xml

@@ -550,6 +550,7 @@
 
   <class name="std::pair<pat::TauRef, float>"/>
   <class name="std::vector<std::pair<pat::TauRef, float> >" />
+  <class name="edm::RefProd<std::vector<pat::Tau> >"/>
 
   </selection>
  <exclusion>

DataFormats/PatCandidates/src/classes_objects.h

@@ -190,7 +190,8 @@ namespace DataFormats_PatCandidates {
   edm::Wrapper<pat::PATTauDiscriminator>           pattdiscr_w;
 
   std::pair<pat::TauRef, float>                              pattdiscr_p;
-  std::vector<std::pair<pat::TauRef, float> >                pattdiscr_v;    
+  std::vector<std::pair<pat::TauRef, float> >                pattdiscr_v; 
+  edm::RefProd<std::vector<pat::Tau> >                       patt_rp;   
   };
 
 }

PhysicsTools/PatAlgos/plugins/PATTauIDEmbedder.cc

@@ -0,0 +1,83 @@
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/PatCandidates/interface/PATTauDiscriminator.h"
+#include "DataFormats/PatCandidates/interface/Tau.h"
+#include "FWCore/Utilities/interface/transform.h"
+
+class PATTauIDEmbedder : public edm::stream::EDProducer<>
+{
+public:
+
+	explicit PATTauIDEmbedder(const edm::ParameterSet&);
+	~PATTauIDEmbedder(){};
+
+	void produce(edm::Event&, const edm::EventSetup&);
+
+private:
+
+//--- configuration parameters
+	edm::EDGetTokenT<pat::TauCollection> src_;
+	typedef std::pair<std::string, edm::InputTag> NameTag;
+	std::vector<NameTag> tauIDSrcs_;
+	std::vector<edm::EDGetTokenT<pat::PATTauDiscriminator> > patTauIDTokens_;
+};
+
+PATTauIDEmbedder::PATTauIDEmbedder(const edm::ParameterSet& cfg)
+{
+  src_ = consumes<pat::TauCollection>(cfg.getParameter<edm::InputTag>("src"));
+  // read the different tau ID names
+  edm::ParameterSet idps = cfg.getParameter<edm::ParameterSet>("tauIDSources");
+  std::vector<std::string> names = idps.getParameterNamesForType<edm::InputTag>();
+  for (std::vector<std::string>::const_iterator it = names.begin(), ed = names.end(); it != ed; ++it) {
+    tauIDSrcs_.push_back(NameTag(*it, idps.getParameter<edm::InputTag>(*it)));
+  }
+  // but in any case at least once
+  if (tauIDSrcs_.empty()) throw cms::Exception("Configuration") <<
+    "PATTauProducer: id addTauID is true, you must specify:\n" <<
+    "\tPSet tauIDSources = { \n" <<
+    "\t\tInputTag <someName> = <someTag>   // as many as you want \n " <<
+    "\t}\n";
+  patTauIDTokens_ = edm::vector_transform(tauIDSrcs_, [this](NameTag const & tag){return mayConsume<pat::PATTauDiscriminator>(tag.second);});
+
+  produces<std::vector<pat::Tau> >();
+}
+
+void PATTauIDEmbedder::produce(edm::Event& evt, const edm::EventSetup& es)
+{
+  edm::Handle<pat::TauCollection> inputTaus;
+  evt.getByToken(src_, inputTaus);
+
+  auto outputTaus = std::make_unique<std::vector<pat::Tau> >();
+  outputTaus->reserve(inputTaus->size());
+
+  int tau_idx = 0;
+  for(pat::TauCollection::const_iterator inputTau = inputTaus->begin(); inputTau != inputTaus->end(); ++inputTau, ++tau_idx){
+    pat::Tau outputTau(*inputTau);
+    pat::TauRef inputTauRef(inputTaus, tau_idx);
+    size_t nTauIds = inputTau->tauIDs().size();
+    std::vector<pat::Tau::IdPair> tauIds(nTauIds+tauIDSrcs_.size());
+
+    for(size_t i = 0; i < nTauIds; ++i){
+      tauIds[i] = inputTau->tauIDs().at(i);
+    }
+
+    edm::Handle<pat::PATTauDiscriminator> tauDiscr;
+    for(size_t i = 0; i < tauIDSrcs_.size(); ++i){
+      evt.getByToken(patTauIDTokens_[i], tauDiscr);      
+      tauIds[nTauIds+i].first = tauIDSrcs_[i].first;
+      tauIds[nTauIds+i].second = (*tauDiscr)[inputTauRef];
+    }
+
+    outputTau.setTauIDs(tauIds);
+    outputTaus->push_back(outputTau);
+  }
+
+  evt.put(std::move(outputTaus));
+}
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+DEFINE_FWK_MODULE(PATTauIDEmbedder);

PhysicsTools/PatAlgos/plugins/PATTauProducer.cc

@@ -72,27 +72,15 @@ PATTauProducer::PATTauProducer(const edm::ParameterSet & iConfig):
   // tau ID configurables
   addTauID_ = iConfig.getParameter<bool>( "addTauID" );
   if ( addTauID_ ) {
-    // it might be a single tau ID
-    if (iConfig.existsAs<edm::InputTag>("tauIDSource")) {
-      tauIDSrcs_.push_back(NameTag("", iConfig.getParameter<edm::InputTag>("tauIDSource")));
-    }
-    // or there might be many of them
-    if (iConfig.existsAs<edm::ParameterSet>("tauIDSources")) {
-      // please don't configure me twice
-      if (!tauIDSrcs_.empty()){
-	throw cms::Exception("Configuration") << "PATTauProducer: you can't specify both 'tauIDSource' and 'tauIDSources'\n";
-      }
-      // read the different tau ID names
-      edm::ParameterSet idps = iConfig.getParameter<edm::ParameterSet>("tauIDSources");
-      std::vector<std::string> names = idps.getParameterNamesForType<edm::InputTag>();
-      for (std::vector<std::string>::const_iterator it = names.begin(), ed = names.end(); it != ed; ++it) {
-	tauIDSrcs_.push_back(NameTag(*it, idps.getParameter<edm::InputTag>(*it)));
-      }
+    // read the different tau ID names
+    edm::ParameterSet idps = iConfig.getParameter<edm::ParameterSet>("tauIDSources");
+    std::vector<std::string> names = idps.getParameterNamesForType<edm::InputTag>();
+    for (std::vector<std::string>::const_iterator it = names.begin(), ed = names.end(); it != ed; ++it) {
+      tauIDSrcs_.push_back(NameTag(*it, idps.getParameter<edm::InputTag>(*it)));
     }
     // but in any case at least once
     if (tauIDSrcs_.empty()) throw cms::Exception("Configuration") <<
       "PATTauProducer: id addTauID is true, you must specify either:\n" <<
-      "\tInputTag tauIDSource = <someTag>\n" << "or\n" <<
       "\tPSet tauIDSources = { \n" <<
       "\t\tInputTag <someName> = <someTag>   // as many as you want \n " <<
       "\t}\n";

RecoTauTag/Configuration/python/loadRecoTauTagMVAsFromPrepDB_cfi.py

@@ -35,6 +35,10 @@
     'tauIdMVADBdR03oldDMwLT' : "tauIdMVADBdR03oldDMwLT",
     'tauIdMVAPWdR03oldDMwLT' : "tauIdMVAPWdR03oldDMwLT"
 }
+tauIdDiscrMVA_trainings_run2_2016 = {
+    'tauIdMVAIsoDBoldDMwLT2016' : "tauIdMVAIsoDBoldDMwLT2016",
+    'tauIdMVAIsoDBnewDMwLT2016' : "tauIdMVAIsoDBnewDMwLT2016"
+}
 tauIdDiscrMVA_WPs = {
     'tauIdMVAoldDMwoLT' : {
         'Eff90' : "oldDMwoLTEff90",
@@ -119,6 +123,24 @@
         'Eff40' : "PWdR03oldDMwLTEff40"
     }
 }
+tauIdDiscrMVA_WPs_run2_2016 = {
+    'tauIdMVAIsoDBoldDMwLT2016' : {
+	'Eff90' : "DBoldDMwLT2016Eff90",
+	'Eff80' : "DBoldDMwLT2016Eff80",
+	'Eff70' : "DBoldDMwLT2016Eff70",
+	'Eff60' : "DBoldDMwLT2016Eff60",
+	'Eff50' : "DBoldDMwLT2016Eff50",
+	'Eff40' : "DBoldDMwLT2016Eff40"
+    },
+    'tauIdMVAIsoDBnewDMwLT2016' : {
+	'Eff90' : "DBnewDMwLT2016Eff90",
+	'Eff80' : "DBnewDMwLT2016Eff80",
+	'Eff70' : "DBnewDMwLT2016Eff70",
+	'Eff60' : "DBnewDMwLT2016Eff60",
+	'Eff50' : "DBnewDMwLT2016Eff50",
+	'Eff40' : "DBnewDMwLT2016Eff40"
+    }
+}
 tauIdDiscrMVA_mvaOutput_normalizations = {
     'tauIdMVAoldDMwoLT' : "mvaOutput_normalization_oldDMwoLT",
     'tauIdMVAoldDMwLT'  : "mvaOutput_normalization_oldDMwLT",
@@ -133,6 +155,10 @@
     'tauIdMVADBdR03oldDMwLT' : "mvaOutput_normalization_DBdR03oldDMwLT",
     'tauIdMVAPWdR03oldDMwLT' : "mvaOutput_normalization_PWdR03oldDMwLT"
 }
+tauIdDiscrMVA_mvaOutput_normalizations_run2_2016 = {
+    'tauIdMVAIsoDBoldDMwLT2016' : "mvaOutput_normalization_DBoldDMwLT2016",
+    'tauIdMVAIsoDBnewDMwLT2016' : "mvaOutput_normalization_DBnewDMwLT2016"
+}
 tauIdDiscrMVA_version = "v1"
 for training, gbrForestName in tauIdDiscrMVA_trainings.items():
     loadRecoTauTagMVAsFromPrepDB.toGet.append(
@@ -180,6 +206,29 @@
             label = cms.untracked.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, tauIdDiscrMVA_version))
         )
     )
+for training, gbrForestName in tauIdDiscrMVA_trainings_run2_2016.items():
+    loadRecoTauTagMVAsFromPrepDB.toGet.append(
+	cms.PSet(
+	    record = cms.string('GBRWrapperRcd'),
+	    tag = cms.string("RecoTauTag_%s%s" % (gbrForestName, tauIdDiscrMVA_version)),
+	    label = cms.untracked.string("RecoTauTag_%s%s" % (gbrForestName, tauIdDiscrMVA_version))
+	)
+    )
+    for WP in tauIdDiscrMVA_WPs_run2_2016[training].keys():
+        loadRecoTauTagMVAsFromPrepDB.toGet.append(
+	    cms.PSet(
+		record = cms.string('PhysicsTGraphPayloadRcd'),
+		tag = cms.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, tauIdDiscrMVA_version, WP)),
+		label = cms.untracked.string("RecoTauTag_%s%s_WP%s" % (gbrForestName, tauIdDiscrMVA_version, WP))
+	    )
+	)
+    loadRecoTauTagMVAsFromPrepDB.toGet.append(
+	cms.PSet(
+	    record = cms.string('PhysicsTFormulaPayloadRcd'),
+	    tag = cms.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, tauIdDiscrMVA_version)),
+	    label = cms.untracked.string("RecoTauTag_%s%s_mvaOutput_normalization" % (gbrForestName, tauIdDiscrMVA_version))
+	)
+    )
 
 # register anti-electron discriminator MVA
 antiElectronDiscrMVA5_categories = {

RecoTauTag/Configuration/test/ZTT-validation.txt

@@ -1,2 +1 @@
-/store/relval/CMSSW_9_0_0_pre4/RelValTTbar_13/GEN-SIM-RECO/PUpmx25ns_90X_mcRun2_asymptotic_v1-v1/10000/5C714DBC-65EE-E611-BCFB-0CC47A78A426.root
-/store/relval/CMSSW_9_0_0_pre4/RelValTTbar_13/GEN-SIM-RECO/PUpmx25ns_90X_mcRun2_asymptotic_v1-v1/10000/A40BB4B4-65EE-E611-A3C2-0CC47A7C3412.root
+/store/relval/CMSSW_8_0_0/RelValTTbar_13/GEN-SIM-RECO/PU25ns_80X_mcRun2_asymptotic_v4-v1/10000/42D6DF66-9DDA-E511-9200-0CC47A4D7670.root

RecoTauTag/RecoTau/BuildFile.xml

@@ -24,6 +24,8 @@
 <use   name="TrackingTools/TrackAssociator"/>
 <use   name="PhysicsTools/JetMCUtils"/>
 <use   name="CommonTools/Utils"/>
+<use   name="FastSimulation/BaseParticlePropagator"/>
+<use   name="FastSimulation/Particle"/>
 <use   name="roottmva"/>
 <export>
   <lib   name="1"/>

RecoTauTag/RecoTau/interface/AntiElectronIDMVA6.h

@@ -22,7 +22,10 @@
 #include "CondFormats/EgammaObjects/interface/GBRForest.h"
 #include "DataFormats/PatCandidates/interface/Tau.h"
 #include "DataFormats/PatCandidates/interface/Electron.h"
-//#include "DataFormats/Candidate/interface/Candidate.h"
+
+#include "FastSimulation/BaseParticlePropagator/interface/BaseParticlePropagator.h"
+#include "FastSimulation/Particle/interface/RawParticle.h"
+#include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 
 #include "TMVA/Tools.h"
 #include "TMVA/Reader.h"
@@ -120,16 +123,18 @@ class AntiElectronIDMVA6
 
    // this function can be called for all categories
    double MVAValue(const reco::PFTau& thePFTau, 
-		   const reco::GsfElectron& theGsfEle);
+		   const reco::GsfElectron& theGsfEle, bool usePhiAtEcalEntranceExtrapolation);
    // this function can be called for category 1 only !!
-   double MVAValue(const reco::PFTau& thePFTau);
+   double MVAValue(const reco::PFTau& thePFTau, bool usePhiAtEcalEntranceExtrapolation);
 
    // this function can be called for all categories
    double MVAValue(const pat::Tau& theTau, 
-		   const pat::Electron& theEle);
+		   const pat::Electron& theEle, bool usePhiAtEcalEntranceExtrapolation);
    // this function can be called for category 1 only !!
-   double MVAValue(const pat::Tau& theTau);
-
+   double MVAValue(const pat::Tau& theTau, bool usePhiAtEcalEntranceExtrapolation);
+   // track extrapolation to ECAL entrance (used to re-calculate varibales that might not be available on miniAOD)
+   bool atECalEntrance(const reco::Candidate* part, math::XYZPoint &pos);    
+
  private:   
 
    double dCrackEta(double eta);
@@ -169,6 +174,7 @@ class AntiElectronIDMVA6
 
    std::vector<TFile*> inputFilesToDelete_;
 
+   double bField_;
    int verbosity_;
 };
 

RecoTauTag/RecoTau/plugins/PATTauDiscriminationAgainstElectronMVA6.cc

@@ -31,6 +31,7 @@ class PATTauDiscriminationAgainstElectronMVA6 : public PATTauDiscriminationProdu
   {
     mva_ = std::make_unique<AntiElectronIDMVA6>(cfg);
 
+    usePhiAtEcalEntranceExtrapolation_ = cfg.getParameter<bool>("usePhiAtEcalEntranceExtrapolation");
     srcElectrons = cfg.getParameter<edm::InputTag>("srcElectrons");
     electronToken = consumes<pat::ElectronCollection>(srcElectrons);
     verbosity_ = ( cfg.exists("verbosity") ) ?
@@ -60,6 +61,7 @@ class PATTauDiscriminationAgainstElectronMVA6 : public PATTauDiscriminationProdu
   edm::Handle<TauCollection> taus_;
 
   std::unique_ptr<PATTauDiscriminator> category_output_;
+  bool usePhiAtEcalEntranceExtrapolation_;
 
   int verbosity_;
 };
@@ -102,7 +104,7 @@ double PATTauDiscriminationAgainstElectronMVA6::discriminate(const TauRef& theTa
 	double deltaREleTau = deltaR(theElectron.p4(), theTauRef->p4());
 	deltaRDummy = deltaREleTau;
 	if( deltaREleTau < 0.3 ){ 	
-	  double mva_match = mva_->MVAValue(*theTauRef, theElectron);	  
+	  double mva_match = mva_->MVAValue(*theTauRef, theElectron, usePhiAtEcalEntranceExtrapolation_);	  
 	  bool hasGsfTrack = 0;
           pat::PackedCandidate const* packedLeadTauCand = dynamic_cast<pat::PackedCandidate const*>(theTauRef->leadChargedHadrCand().get());
           if( abs(packedLeadTauCand->pdgId()) == 11 ) 
@@ -140,7 +142,7 @@ double PATTauDiscriminationAgainstElectronMVA6::discriminate(const TauRef& theTa
      } // end of loop over electrons
 
     if ( !isGsfElectronMatched ) {
-      mvaValue = mva_->MVAValue(*theTauRef);
+      mvaValue = mva_->MVAValue(*theTauRef, usePhiAtEcalEntranceExtrapolation_);
       bool hasGsfTrack = 0;
       pat::PackedCandidate const* packedLeadTauCand = dynamic_cast<pat::PackedCandidate const*>(theTauRef->leadChargedHadrCand().get());
       if( abs(packedLeadTauCand->pdgId()) == 11 ) hasGsfTrack = 1;

RecoTauTag/RecoTau/plugins/PATTauDiscriminationByMVAIsolationRun2.cc

@@ -15,7 +15,6 @@
 //           - TauPFEssential
 //           - PFRecoTauDiscriminationByMVAIsolationRun2
 //           - Training of BDT
-// todo 2: do we need/want to add PATTauIDEmbedder?
 
 #include "RecoTauTag/RecoTau/interface/TauDiscriminationProducerBase.h"
 

RecoTauTag/RecoTau/plugins/PFRecoTauDiscriminationAgainstElectronMVA6.cc

@@ -34,6 +34,7 @@ class PFRecoTauDiscriminationAgainstElectronMVA6 : public PFTauDiscriminationPro
   {
     mva_ = new AntiElectronIDMVA6(cfg);
 
+    usePhiAtEcalEntranceExtrapolation_ = cfg.getParameter<bool>("usePhiAtEcalEntranceExtrapolation");
     srcGsfElectrons_ = cfg.getParameter<edm::InputTag>("srcGsfElectrons");
     GsfElectrons_token = consumes<reco::GsfElectronCollection>(srcGsfElectrons_);
 
@@ -69,6 +70,7 @@ class PFRecoTauDiscriminationAgainstElectronMVA6 : public PFTauDiscriminationPro
   edm::Handle<TauCollection> taus_;
 
   std::unique_ptr<PFTauDiscriminator> category_output_;
+  bool usePhiAtEcalEntranceExtrapolation_;
 
   int verbosity_;
 };
@@ -147,7 +149,7 @@ double PFRecoTauDiscriminationAgainstElectronMVA6::discriminate(const PFTauRef&
 	double deltaREleTau = deltaR(theGsfElectron->p4(), thePFTauRef->p4());
 	deltaRDummy = deltaREleTau;
 	if ( deltaREleTau < 0.3 ) {
-	  double mva_match = mva_->MVAValue(*thePFTauRef, *theGsfElectron);
+	  double mva_match = mva_->MVAValue(*thePFTauRef, *theGsfElectron, usePhiAtEcalEntranceExtrapolation_);
 	  bool hasGsfTrack = thePFTauRef->leadPFChargedHadrCand()->gsfTrackRef().isNonnull();
 	  if ( !hasGsfTrack )
             hasGsfTrack = theGsfElectron->gsfTrack().isNonnull();
@@ -184,7 +186,7 @@ double PFRecoTauDiscriminationAgainstElectronMVA6::discriminate(const PFTauRef&
     } // end of loop over electrons
 
     if ( !isGsfElectronMatched ) {
-      mvaValue = mva_->MVAValue(*thePFTauRef);
+      mvaValue = mva_->MVAValue(*thePFTauRef, usePhiAtEcalEntranceExtrapolation_);
       bool hasGsfTrack = thePFTauRef->leadPFChargedHadrCand()->gsfTrackRef().isNonnull();
 
       //// Veto taus that go to Ecal crack

RecoTauTag/RecoTau/python/PATTauDiscriminationAgainstElectronMVA6_cfi.py

@@ -33,5 +33,6 @@
     minMVAWOgWgsfEC            = cms.double(0.0),
     minMVAWgWgsfEC             = cms.double(0.0),
 
-    srcElectrons = cms.InputTag('slimmedElectrons')
+    srcElectrons = cms.InputTag('slimmedElectrons'),
+    usePhiAtEcalEntranceExtrapolation = cms.bool(False)
 )

RecoTauTag/RecoTau/python/PFRecoTauDiscriminationAgainstElectronMVA6_cfi.py

@@ -34,5 +34,6 @@
     minMVAWOgWgsfEC            = cms.double(0.0),
     minMVAWgWgsfEC             = cms.double(0.0),
 
-    srcGsfElectrons = cms.InputTag('gedGsfElectrons')
+    srcGsfElectrons = cms.InputTag('gedGsfElectrons'),
+    usePhiAtEcalEntranceExtrapolation = cms.bool(False)
 )