Skip to content

Commit 05b8850

Browse files
sckaosckao
committed
added the btagging info
1 parent 0c3269e commit 05b8850

17 files changed

+731
-412
lines changed

‎src/JetAnalysis.cc

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,12 @@ JetAnalysis::JetAnalysis(const edm::ParameterSet& iConfig)
4747
genJetSrc = iConfig.getParameter<edm::InputTag> ("genJetSource");
4848
genSrc = iConfig.getParameter<edm::InputTag> ("genParticles");
4949
metSrc = iConfig.getParameter<edm::InputTag> ("metSource");
50+
genmetSrc = iConfig.getParameter<edm::InputTag> ("genmetSource");
5051
tcmetSrc = iConfig.getParameter<edm::InputTag> ("tcMetSource");
5152
recoMuon = iConfig.getUntrackedParameter<string> ("recoMuons");
5253
caloSrc = iConfig.getParameter<edm::InputTag> ("caloSource");
5354
//recoJet = iConfig.getUntrackedParameter<string> ("recoJets");
55+
bTagAlgo = iConfig.getUntrackedParameter<string> ( "bTagAlgo" );
5456

5557
evtSelected = new TtEvtSelector( iConfig );
5658
ttMuon = new TtMuon();
@@ -156,6 +158,9 @@ void JetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
156158
Handle<std::vector<reco::MET> > tcmet;
157159
iEvent.getByLabel(tcmetSrc, tcmet);
158160

161+
Handle<std::vector<reco::GenMET> > genmet;
162+
iEvent.getByLabel(genmetSrc, genmet);
163+
159164
Handle<std::vector<reco::GenParticle> > genParticles;
160165
iEvent.getByLabel(genSrc, genParticles);
161166

@@ -183,26 +188,27 @@ void JetAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
183188
std::vector<const reco::Candidate*> theJets3 = ttJet->JetSelection( jets, isoMu, 30, hJ_Et30 ) ;
184189

185190
if ( pass > -1 ) {
191+
std::vector<bool> bTags;
186192
ttJet->MuonAndJet( theJets1, isoMu[0] , hJ_Et20 );
187193
ttJet->JetEtSpectrum( theJets1, hJ_Et20 );
188194
ttJet->JetdRAnalysis( theJets1, hJ_Et20 );
189195
if ( theJets1.size() == 4 ) {
190-
ttMET->METandNeutrino( isoMu, theJets1, met, tcmet, genParticles, hMET_J20 );
191-
std::vector<const reco::Candidate*> outJets1 = ttJet->SoftJetSelection( jets, isoMu, 20, hJ_Et20 ) ;
196+
ttMET->METandNeutrino( isoMu, theJets1, met, tcmet, genmet, genParticles, hMET_J20 );
197+
std::vector<const reco::Candidate*> outJets1 = ttJet->SoftJetSelection( jets, isoMu, 20, &bTags, bTagAlgo, hJ_Et20 ) ;
192198
}
193199
ttJet->MuonAndJet( theJets2, isoMu[0] , hJ_Et25 );
194200
ttJet->JetEtSpectrum( theJets2, hJ_Et25 );
195201
ttJet->JetdRAnalysis( theJets2, hJ_Et25 );
196202
if ( theJets2.size() == 4 ) {
197-
ttMET->METandNeutrino( isoMu, theJets2, met, tcmet, genParticles, hMET_J25 );
198-
std::vector<const reco::Candidate*> outJets2 = ttJet->SoftJetSelection( jets, isoMu, 25, hJ_Et25 ) ;
203+
ttMET->METandNeutrino( isoMu, theJets2, met, tcmet, genmet, genParticles, hMET_J25 );
204+
std::vector<const reco::Candidate*> outJets2 = ttJet->SoftJetSelection( jets, isoMu, 25, &bTags, bTagAlgo, hJ_Et25 ) ;
199205
}
200206
ttJet->MuonAndJet( theJets3, isoMu[0] , hJ_Et30 );
201207
ttJet->JetEtSpectrum( theJets3, hJ_Et30 );
202208
ttJet->JetdRAnalysis( theJets3, hJ_Et30 );
203209
if ( theJets3.size() == 4 ) {
204-
ttMET->METandNeutrino( isoMu, theJets3, met, tcmet, genParticles, hMET_J30 );
205-
std::vector<const reco::Candidate*> outJets3 = ttJet->SoftJetSelection( jets, isoMu, 30, hJ_Et30 ) ;
210+
ttMET->METandNeutrino( isoMu, theJets3, met, tcmet, genmet, genParticles, hMET_J30 );
211+
std::vector<const reco::Candidate*> outJets3 = ttJet->SoftJetSelection( jets, isoMu, 30, &bTags, bTagAlgo, hJ_Et30 ) ;
206212
}
207213
}
208214

‎src/JetAnalysis.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555

5656
#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
5757
#include "DataFormats/JetReco/interface/GenJet.h"
58+
#include "DataFormats/METReco/interface/GenMET.h"
5859
#include "DataFormats/Candidate/interface/Particle.h"
5960
#include "DataFormats/Candidate/interface/Candidate.h"
6061
#include "DataFormats/Candidate/interface/CandidateFwd.h"
@@ -135,11 +136,12 @@ class JetAnalysis : public edm::EDAnalyzer {
135136
edm::InputTag jptSrc;
136137
edm::InputTag metSrc;
137138
edm::InputTag tcmetSrc;
139+
edm::InputTag genmetSrc;
138140
edm::InputTag genJetSrc;
139141
edm::InputTag jetObj;
140142
edm::InputTag genSrc;
141143
edm::InputTag caloSrc;
142-
144+
string bTagAlgo;
143145

144146
};
145147

‎src/TtAnalysis.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ TtAnalysis::TtAnalysis(const edm::ParameterSet& iConfig)
3838
needTree = iConfig.getUntrackedParameter<bool> ("needTree");
3939
trigOn = iConfig.getUntrackedParameter<bool> ("trigOn");
4040
rootFileName = iConfig.getUntrackedParameter<string> ("rootFileName");
41-
leptonFlavour = iConfig.getParameter<std::string> ("leptonFlavour");
4241
muonSrc = iConfig.getParameter<edm::InputTag> ("muonSource");
4342
electronSrc = iConfig.getParameter<edm::InputTag> ("electronSource");
4443
photonSrc = iConfig.getParameter<edm::InputTag> ("photonSource");
@@ -272,14 +271,14 @@ void TtAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup
272271
std::vector<const pat::Jet*> tmpJets;
273272
std::vector<jmatch> mcjets = MCMatching->matchJets(genParticles, theJets, histos.hBJet, histos.hWJet, false);
274273
ttJet->JetMatchedMuon( jets, muons, iEvent, iSetup, histos.hMuon, true );
275-
ttJet->bTagAnalysis( jets, histos.hBJet );
276274

277275
if ( topo == 1) {
278276
ttJet->genJetInfo(genJets,genParticles, histos.hJet, histos.hBJet, histos.hWJet);
279277
ttJet->matchedWJetsAnalysis( mcjets, isoMu, jets, histos.hWJet );
280278
}
281279
if ( pass > 3 && topo == 1 ) {
282280
ttJet->selectedWJetsAnalysis(jets, isoMu, histos.hWJet);
281+
ttJet->bTagAnalysis( jets, muons, histos.hBJet );
283282
}
284283
// looking for the leptonic b jet effect
285284
if ( pass > 3 ) {

‎src/TtAnalysis.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@
5454
#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
5555

5656
#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
57-
#include "DataFormats/JetReco/interface/GenJet.h"
57+
#include "DataFormats/JetReco/interface/GenJet.h"
58+
#include "DataFormats/METReco/interface/GenMET.h"
5859
#include "DataFormats/Candidate/interface/Particle.h"
5960
#include "DataFormats/Candidate/interface/Candidate.h"
6061
#include "DataFormats/Candidate/interface/CandidateFwd.h"
62+
#include "DataFormats/METReco/interface/GenMET.h"
6163
#include "DataFormats/RecoCandidate/interface/RecoCandidate.h"
6264

6365
//#include "DataFormates/TrackReco/interface/Track.h"

0 commit comments

Comments
 (0)