Merge pull request #13962 from jhgoh/PseudoTopFix76

Synchronize pseudo top definition with LHCTOPWG - 81X
cms-sw · Apr 15, 2016 · c008fce · c008fce
2 parents d1095bd + ee42031
commit c008fce
Show file tree

Hide file tree

Showing 4 changed files with 295 additions and 299 deletions.
diff --git a/TopQuarkAnalysis/TopEventProducers/interface/PseudoTopProducer.h b/TopQuarkAnalysis/TopEventProducers/interface/PseudoTopProducer.h
@@ -2,15 +2,17 @@
 #define TopQuarkAnalysis_TopEventProducers_PseudoTopProducer_H
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 
 #include "fastjet/JetDefinition.hh"
+#include <set>
 
-class PseudoTopProducer : public edm::EDProducer
+class PseudoTopProducer : public edm::stream::EDProducer<>
 {
 public:
   PseudoTopProducer(const edm::ParameterSet& pset);
@@ -20,18 +22,23 @@ class PseudoTopProducer : public edm::EDProducer
   bool isFromHadron(const reco::Candidate* p) const;
   bool isBHadron(const reco::Candidate* p) const;
   bool isBHadron(const unsigned int pdgId) const;
+  void insertAllDaughters(const reco::Candidate* p, std::set<const reco::Candidate*>& list) const;
 
   const reco::Candidate* getLast(const reco::Candidate* p);
   reco::GenParticleRef buildGenParticle(const reco::Candidate* p, reco::GenParticleRefProd& refHandle,
                                         std::auto_ptr<reco::GenParticleCollection>& outColl) const;
-
   typedef reco::Particle::LorentzVector LorentzVector;
 
 private:
-  edm::EDGetTokenT<edm::View<reco::Candidate> > finalStateToken_;
-  edm::EDGetTokenT<edm::View<reco::Candidate> > genParticleToken_;
-  const double leptonMinPt_, leptonMaxEta_, jetMinPt_, jetMaxEta_;
+  const edm::EDGetTokenT<edm::View<reco::Candidate> > finalStateToken_;
+  const edm::EDGetTokenT<edm::View<reco::Candidate> > genParticleToken_;
+  const double minLeptonPt_, maxLeptonEta_, minJetPt_, maxJetEta_;
   const double wMass_, tMass_;
+  const double minLeptonPtDilepton_, maxLeptonEtaDilepton_;
+  const double minDileptonMassDilepton_;
+  const double minLeptonPtSemilepton_, maxLeptonEtaSemilepton_;
+  const double minVetoLeptonPtSemilepton_, maxVetoLeptonEtaSemilepton_;
+  const double minMETSemiLepton_, minMtWSemiLepton_;
 
   typedef fastjet::JetDefinition JetDef;
   std::shared_ptr<JetDef> fjLepDef_, fjJetDef_;

diff --git a/TopQuarkAnalysis/TopEventProducers/python/producers/pseudoTop_cfi.py b/TopQuarkAnalysis/TopEventProducers/python/producers/pseudoTop_cfi.py
@@ -3,12 +3,22 @@
 pseudoTop = cms.EDProducer("PseudoTopProducer",
     genParticles = cms.InputTag("prunedGenParticles"),
     finalStates = cms.InputTag("packedGenParticles"),
-    leptonMinPt = cms.double(20),
-    leptonMaxEta = cms.double(2.4),
-    jetMinPt = cms.double(20),
-    jetMaxEta = cms.double(2.4),
+    minLeptonPt = cms.double(15),
+    maxLeptonEta = cms.double(2.5),
+    minJetPt = cms.double(30),
+    maxJetEta = cms.double(2.4),
     leptonConeSize = cms.double(0.1),
     jetConeSize = cms.double(0.4),
     wMass = cms.double(80.4),
     tMass = cms.double(172.5),
+
+    minLeptonPtDilepton = cms.double(20),
+    maxLeptonEtaDilepton = cms.double(2.4),
+    minDileptonMassDilepton = cms.double(20),
+    minLeptonPtSemilepton = cms.double(20),
+    maxLeptonEtaSemilepton = cms.double(2.4),
+    minVetoLeptonPtSemilepton = cms.double(15),
+    maxVetoLeptonEtaSemilepton = cms.double(2.5),
+    minMETSemiLepton = cms.double(30),
+    minMtWSemiLepton = cms.double(30),
 )