Reversing a cut that was previously the wrong comparison

cms-sw · Jul 29, 2014 · 727f53b · 727f53b
1 parent 2833bcf
commit 727f53b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/DQM/Physics/python/B2GDQM_cfi.py b/DQM/Physics/python/B2GDQM_cfi.py
@@ -24,26 +24,28 @@
         50.,
         100.
         ),
-    pfMETCollection          = cms.InputTag("pfMet")
-
-    cmsTagLabel = cms.InputTag("cmsTopTagPFJetsCHS")
-
-    allHadPtCut = cms.double(400.0)
-    allHadRapidityCut = cms.double(1.0)
-    allHadDeltaPhiCut = cms.double( pi / 2.0)
-
-    muonSelect = cms.string("pt > 45.0 & abs(eta)<2.1 & isGlobalMuon & abs(globalTrack.d0)<1 & abs(globalTrack.dz)<20")
-    semiMu_HadJetPtCut = cms.double(400.0)
-    semiMu_LepJetPtCut = cms.double(30.0)
-    semiMu_dphiHadCut = cms.double( pi / 2.0)
-    semiMu_dRMin = cms.double( 0.5 )
-    semiMu_ptRel = cms.double( 25.0 )
-
-    elecSelect = cms.string("pt > 45.0 & abs(eta)<2.5 & abs(gsfTrack.d0)<1 & abs(gsfTrack.dz)<20 & passConversionVeto() & electronID('mvaTrigV0') > 0.5")
-    semiE_HadJetPtCut = cms.double(400.0)
-    semiE_LepJetPtCut = cms.double(30.0)
-    semiE_dphiHadCut = cms.double( pi / 2.0)
-    semiE_dRMin = cms.double( 0.5 )
+    pfMETCollection          = cms.InputTag("pfMet"),
+
+    cmsTagLabel = cms.InputTag("cmsTopTagPFJetsCHS"),
+    muonSrc = cms.InputTag("muons"),
+    electronSrc = cms.InputTag("gedGsfElectrons"),
+
+    allHadPtCut = cms.double(400.0),
+    allHadRapidityCut = cms.double(1.0),
+    allHadDeltaPhiCut = cms.double( pi / 2.0),
+
+    muonSelect = cms.string("pt > 45.0 & abs(eta)<2.1 & isGlobalMuon & abs(globalTrack.d0)<1 & abs(globalTrack.dz)<20"),
+    semiMu_HadJetPtCut = cms.double(400.0),
+    semiMu_LepJetPtCut = cms.double(30.0),
+    semiMu_dphiHadCut = cms.double( pi / 2.0),
+    semiMu_dRMin = cms.double( 0.5 ),
+    semiMu_ptRel = cms.double( 25.0 ),
+
+    elecSelect = cms.string("pt > 45.0 & abs(eta)<2.5 & abs(gsfTrack.d0)<1 & abs(gsfTrack.dz)<20"),
+    semiE_HadJetPtCut = cms.double(400.0),
+    semiE_LepJetPtCut = cms.double(30.0),
+    semiE_dphiHadCut = cms.double( pi / 2.0),
+    semiE_dRMin = cms.double( 0.5 ),
     semiE_ptRel = cms.double( 25.0 )    
 
 

diff --git a/DQM/Physics/src/B2GDQM.cc b/DQM/Physics/src/B2GDQM.cc
@@ -101,6 +101,10 @@ B2GDQM::B2GDQM(const edm::ParameterSet& ps){
   cmsTagLabel_ = ps.getParameter<edm::InputTag >("cmsTagLabel");
   cmsTagToken_ = consumes<edm::View<reco::BasicJet> > ( cmsTagLabel_ );
 
+
+  muonToken_ = consumes<edm::View<reco::Muon> >( ps.getParameter<edm::InputTag>("muonSrc") );
+  electronToken_ = consumes<edm::View<reco::GsfElectron> >( ps.getParameter<edm::InputTag>("electronSrc") );
+
   jetPtMins_         = ps.getParameter<std::vector<double> > ("jetPtMins");
   allHadPtCut_       = ps.getParameter<double> ("allHadPtCut");
   allHadRapidityCut_ = ps.getParameter<double> ("allHadRapidityCut");
@@ -400,7 +404,7 @@ void B2GDQM::analyzeAllHad(const Event & iEvent, const edm::EventSetup& iSetup){
   if (jet0.isAvailable() == false || jet1.isAvailable() == false) return;
   if ( jet0->pt() < allHadPtCut_ || jet1->pt() < allHadPtCut_ ) return;
   if ( std::abs( jet0->rapidity() - jet1->rapidity() ) > allHadRapidityCut_ ) return;
-  if ( std::abs( reco::deltaPhi( jet0->phi(), jet1->phi() ) ) < 2*M_PI ) return;
+  if ( std::abs( reco::deltaPhi( jet0->phi(), jet1->phi() ) ) < M_PI*0.5 ) return;
 
 
   CATopJetHelper helper(173., 80.4);
@@ -447,6 +451,7 @@ void B2GDQM::analyzeSemiMu(const Event & iEvent, const edm::EventSetup& iSetup){
   if(!validJets) return;
   if ( jetCollection->size() < 2 ) return;
 
+
   double pt0 = -1.0;
   double dRMin = 999.0;
   edm::Ptr<reco::BasicJet> hadJet;    // highest pt jet with dphi(lep,jet) > pi/2
@@ -471,7 +476,6 @@ void B2GDQM::analyzeSemiMu(const Event & iEvent, const edm::EventSetup& iSetup){
     }
   }
   if ( hadJet.isAvailable() == false || lepJet.isAvailable() == false ) return;
-
 
   auto lepJetP4 = lepJet->p4();
   auto muonP4 = muon.p4();