Skip to content

Commit 268c658

Browse files
committed
bug fix for production
1 parent ab05d2a commit 268c658

3 files changed

Lines changed: 44 additions & 44 deletions

File tree

CatAnalyzer/plugins/h2muAnalyzer.cc

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class h2muAnalyzer : public edm::EDAnalyzer {
5656
edm::EDGetTokenT<pat::TriggerObjectStandAloneCollection> triggerObjects_;
5757

5858
TTree * ttree_;
59-
TTree * t2;
6059

6160
int b_njet, b_step, b_channel;
6261
float b_MET;
@@ -87,7 +86,7 @@ h2muAnalyzer::h2muAnalyzer(const edm::ParameterSet& iConfig)
8786

8887
edm::Service<TFileService> fs;
8988
ttree_ = fs->make<TTree>("tree", "tree");
90-
t2 = fs->make<TTree>("tree2","tree2");
89+
ttree_ = fs->make<TTree>("tree2","tree2");
9190
ttree_->Branch("njet", &b_njet, "njet/I");
9291
ttree_->Branch("MET", &b_MET, "MET/F");
9392
ttree_->Branch("channel", &b_channel, "channel/I");
@@ -118,16 +117,16 @@ h2muAnalyzer::h2muAnalyzer(const edm::ParameterSet& iConfig)
118117
ttree_->Branch("jetcat_GC", &b_jetcat_GC, "jetcat_GC/I");
119118

120119
//tree2. we should use this for efficiency of recomuon per genmuon.
121-
t2 ->Branch("gen_lep_pt", &b_gen_lep_pt, "gen_lep_pt/F");
122-
t2 ->Branch("gen_lep_eta", &b_gen_lep_eta, "gen_lep_eta/F");
123-
t2 ->Branch("gen_lep_phi", &b_gen_lep_phi, "gen_lep_phi/F");
124-
t2 ->Branch("reco_lep_pt", &b_reco_lep_pt, "reco_lep_pt/F");
125-
t2 ->Branch("reco_lep_eta", &b_reco_lep_eta, "reco_lep_eta/F");
126-
t2 ->Branch("reco_lep_phi", &b_reco_lep_phi, "reco_lep_phi/F");
127-
t2 ->Branch("resolution", &b_resolution, "resolution/F");
128-
t2 ->Branch("lep_isLoose", &b_lep_isLoose, "lep_isLoose/B");
129-
t2 ->Branch("lep_isMedium", &b_lep_isMedium, "lep_isMedium/B");
130-
t2 ->Branch("lep_isTight", &b_lep_isTight, "lep_isTight/B");
120+
ttree_->Branch("gen_lep_pt", &b_gen_lep_pt, "gen_lep_pt/F");
121+
ttree_->Branch("gen_lep_eta", &b_gen_lep_eta, "gen_lep_eta/F");
122+
ttree_->Branch("gen_lep_phi", &b_gen_lep_phi, "gen_lep_phi/F");
123+
ttree_->Branch("reco_lep_pt", &b_reco_lep_pt, "reco_lep_pt/F");
124+
ttree_->Branch("reco_lep_eta", &b_reco_lep_eta, "reco_lep_eta/F");
125+
ttree_->Branch("reco_lep_phi", &b_reco_lep_phi, "reco_lep_phi/F");
126+
ttree_->Branch("resolution", &b_resolution, "resolution/F");
127+
ttree_->Branch("lep_isLoose", &b_lep_isLoose, "lep_isLoose/B");
128+
ttree_->Branch("lep_isMedium", &b_lep_isMedium, "lep_isMedium/B");
129+
ttree_->Branch("lep_isTight", &b_lep_isTight, "lep_isTight/B");
131130

132131
}
133132
h2muAnalyzer::~h2muAnalyzer(){}
@@ -186,7 +185,6 @@ void h2muAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet
186185
b_lep_isLoose = 0; b_lep_isMedium = 0; b_lep_isTight = 0;
187186

188187
if (!isfromZboson) {
189-
t2->Fill();
190188
continue;
191189
}
192190
b_gen_lep_pt = g.pt();
@@ -206,7 +204,6 @@ void h2muAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet
206204
break;
207205
}
208206
}
209-
t2->Fill();
210207
}
211208
}
212209

@@ -234,39 +231,40 @@ void h2muAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet
234231
b_ll_phi = tlv_ll.Phi();
235232
b_ll_m = tlv_ll.M();
236233

234+
TLorentzVector met = mets->front().tlv();
235+
b_MET = met.Pt();
236+
237+
vector<TLorentzVector> recolep;
238+
vector<cat::Jet> selectedJets = selectJets( jets.product(), recolep );
239+
240+
b_njet = selectedJets.size();
241+
237242
b_step = 1;
238243
int ll_charge = selectedMuons[0].charge()*selectedMuons[1].charge();
239244

240-
if (ll_charge < 0)
241-
b_step = 2;
242-
245+
if (ll_charge > 0){
246+
ttree_->Fill();
247+
return;
248+
}
249+
b_step = 2;
250+
243251
edm::Handle<edm::TriggerResults> triggerBits;
244252
edm::Handle<pat::TriggerObjectStandAloneCollection> triggerObjects;
245253
iEvent.getByToken(triggerBits_, triggerBits);
246254
iEvent.getByToken(triggerObjects_, triggerObjects);
247255
const edm::TriggerNames &triggerNames = iEvent.triggerNames(*triggerBits);
248256
AnalysisHelper trigHelper = AnalysisHelper(triggerNames, triggerBits, triggerObjects);
249257

250-
// if (triggerFired(triggerNames, triggerBits, "HLT_IsoMu24_eta2p1_v") ){
251-
if (trigHelper.triggerFired("HLT_IsoMu24_eta2p1_v") ){
252-
b_step = 3;
253-
cout << "trigger fired"<<endl;
258+
if (!trigHelper.triggerFired("HLT_IsoMu24_eta2p1_v")){
254259
}
255-
// if ( triggerMatched(triggerNames, triggerObjects, "HLT_IsoMu24_eta2p1_v", selectedMuons[0] )
256-
// || triggerMatched(triggerNames, triggerObjects, "HLT_IsoMu24_eta2p1_v", selectedMuons[1] ))
257-
if ( trigHelper.triggerMatched("HLT_IsoMu24_eta2p1_v", selectedMuons[0] )
258-
|| trigHelper.triggerMatched("HLT_IsoMu24_eta2p1_v", selectedMuons[1] ))
259-
b_step = 4;
260-
261-
TLorentzVector met = mets->front().tlv();
262-
b_MET = met.Pt();
263-
264-
vector<TLorentzVector> recolep;
265-
//for (auto lep : selectedMuons){ recolep.push_back(lep.tlv()); }
266-
//vector<cat::Electron> selectedElectrons = selectElecs( electrons.product() );
267-
vector<cat::Jet> selectedJets = selectJets( jets.product(), recolep );
268-
269-
b_njet = selectedJets.size();
260+
b_step = 3;
261+
262+
if ( !trigHelper.triggerMatched("HLT_IsoMu24_eta2p1_v", selectedMuons[0] )
263+
&& !trigHelper.triggerMatched("HLT_IsoMu24_eta2p1_v", selectedMuons[1] )){
264+
ttree_->Fill();
265+
return;
266+
}
267+
b_step = 4;
270268

271269
// float step = passingSteps( channel, met.Pt(), (recolep[0]+recolep[1]).M(), ll_charge, selectedJets.size() );
272270

CatAnalyzer/test/run_h2muAnalyzer_cfg.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
process.load("FWCore.MessageService.MessageLogger_cfi")
66
process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) )
77

8-
datadir = '/xrootd/store/group/CAT/SingleMuon/v7-3-6_Run2015B-PromptReco-v1/150820_215216/0000/'
8+
datadir = '/xrootd/store/user/jlee/SingleMuon/v7-4-1_Run2015C-PromptReco-v1/150913_173449/0000/'
99
process.source = cms.Source("PoolSource",
10-
fileNames = cms.untracked.vstring('file:/afs/cern.ch/user/j/jlee/work/cat74/src/CATTools/CatProducer/prod/catTuple.root')
11-
#fileNames = cms.untracked.vstring()
10+
#fileNames = cms.untracked.vstring('file:/xrootd/store/user/jlee/SingleMuon/v7-4-1_Run2015C-PromptReco-v1/150913_173449/0000/catTuple_125.root')
11+
fileNames = cms.untracked.vstring()
1212
)
1313

14-
#for f in os.listdir(datadir):
15-
# process.source.fileNames.append("file:"+datadir+f)
14+
for f in os.listdir(datadir):
15+
process.source.fileNames.append("file:"+datadir+f)
1616

1717
print process.source.fileNames
1818
runOnMC=True
1919
### for run data
20-
lumiFile = 'Cert_246908-255031_13TeV_PromptReco_Collisions15_50ns_JSON.txt'
20+
lumiFile = 'Cert_246908-255031_13TeV_PromptReco_Collisions15_25ns_JSON_v2.txt'
2121
for i in process.source.fileNames:
2222
if 'Run2015' in i:
2323
runOnMC=False
@@ -35,7 +35,8 @@
3535
mets = cms.InputTag("catMETs"),
3636
mcLabel = cms.InputTag("prunedGenParticles"),
3737
triggerBits = cms.InputTag("TriggerResults","","HLT"),
38-
triggerObjects = cms.InputTag("catTrigger"),
38+
#triggerObjects = cms.InputTag("catTrigger"),
39+
triggerObjects = cms.InputTag("selectedPatTrigger"),
3940
)
4041

4142
process.TFileService = cms.Service("TFileService",

CatProducer/prod/PAT2CAT_cfg.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
if useMiniAOD:
6565
process.source.fileNames = ['/store/relval/CMSSW_7_4_6_patch6/RelValTTbar_13/MINIAODSIM/MCRUN2_74_V9-v1/00000/2403409D-1225-E511-B64E-0025905A6132.root']
6666
## Hack to run on relval sample
67-
process.genMetExtractor.metSource = "slimmedMETs::RECO"
67+
# this makes production to fail... need another solution for this
68+
# process.genMetExtractor.metSource = "slimmedMETs::RECO"
6869
else:
6970
process.source.fileNames = ['/store/relval/CMSSW_7_4_6_patch6/RelValTTbar_13/GEN-SIM-RECO/MCRUN2_74_V9-v1/00000/54F6E09C-1225-E511-842B-0025905A612E.root']
7071

0 commit comments

Comments
 (0)