Skip to content

Commit

Permalink
Merge pull request #14887 from Soureek89/topHLTDQM_Update_Jun15_81X
Browse files Browse the repository at this point in the history 
Update in Single Electron Trigger list and Fix for empty monitoring histograms issue for single lepton paths
  • Loading branch information
@cmsbuild
cmsbuild committed Jun 17, 2016
2 parents 868cbe2 + 9b9c234 commit e0647c2
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 36 deletions.
20 changes: 10 additions & 10 deletions DQMOffline/Trigger/python/singletopHLTEventDQM_cfi.py
View file
Expand Up @@ -54,10 +54,10 @@
label = cms.InputTag("pfJetProbabilityBJetTags" ),
workingPoint = cms.double(0.275)
),
trackCountingPur = cms.PSet(
label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
workingPoint = cms.double(3.41)
),
# trackCountingPur = cms.PSet(
# label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
# workingPoint = cms.double(3.41)
# ),
secondaryVertex = cms.PSet(
label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
workingPoint = cms.double(0.890)
Expand Down Expand Up @@ -194,10 +194,10 @@
label = cms.InputTag("pfJetProbabilityBJetTags" ),
workingPoint = cms.double(0.275)
),
trackCountingPur = cms.PSet(
label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
workingPoint = cms.double(3.41)
),
# trackCountingPur = cms.PSet(
# label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
# workingPoint = cms.double(3.41)
# ),
secondaryVertex = cms.PSet(
label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
workingPoint = cms.double(0.890)
Expand All @@ -215,7 +215,7 @@
triggerExtras = cms.PSet(
src = cms.InputTag("TriggerResults","","HLT"),
### Updating to HLT paths to be monitored by TOP PAG in 2016
paths = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v'])
paths = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele25_WPTight_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v'])
)
),
## ------------------------------------------------------
Expand All @@ -229,7 +229,7 @@
trigger = cms.PSet(
src = cms.InputTag("TriggerResults","","HLT"),
### Updating to HLT paths to be monitored by TOP PAG in 2016
select = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v'])
select = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele25_WPTight_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v'])
),
## [optional] : when omitted no preselection is applied
vertex = cms.PSet(
Expand Down
22 changes: 11 additions & 11 deletions DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py
View file
Expand Up @@ -87,7 +87,7 @@
trigger = cms.PSet(
src = cms.InputTag("TriggerResults","","HLT"),
### Updating to HLT paths to be monitored by TOP PAG in 2016
select = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v','HLT_IsoMu18_v', 'HLT_IsoMu20_v', 'HLT_IsoMu22_v', 'HLT_IsoMu24_v', 'HLT_IsoTkMu18_v', 'HLT_IsoTkMu20_v', 'HLT_IsoTkMu22_v', 'HLT_IsoTkMu24_v','HLT_IsoMu17_eta2p1_v','HLT_IsoMu20_eta2p1_v','HLT_IsoMu24_eta2p1_v','HLT_IsoTkMu20_eta2p1_v','HLT_IsoTkMu24_eta2p1_v','HLT_IsoTkMu20_eta2p1_v','HLT_IsoTkMu24_eta2p1_v']),
select = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele25_WPTight_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v','HLT_IsoMu18_v', 'HLT_IsoMu20_v', 'HLT_IsoMu22_v', 'HLT_IsoMu24_v', 'HLT_IsoTkMu18_v', 'HLT_IsoTkMu20_v', 'HLT_IsoTkMu22_v', 'HLT_IsoTkMu24_v','HLT_IsoMu17_eta2p1_v','HLT_IsoMu20_eta2p1_v','HLT_IsoMu24_eta2p1_v','HLT_IsoTkMu20_eta2p1_v','HLT_IsoTkMu24_eta2p1_v','HLT_IsoTkMu20_eta2p1_v','HLT_IsoTkMu24_eta2p1_v']),
),
## [optional] : when omitted no preselection is applied
vertex = cms.PSet(
Expand Down Expand Up @@ -175,10 +175,10 @@
label = cms.InputTag("pfJetProbabilityBJetTags" ),
workingPoint = cms.double(0.275)
),
trackCountingPur = cms.PSet(
label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
workingPoint = cms.double(3.41)
),
# trackCountingPur = cms.PSet(
# label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
# workingPoint = cms.double(3.41)
# ),
secondaryVertex = cms.PSet(
label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
workingPoint = cms.double(0.890)
Expand Down Expand Up @@ -329,10 +329,10 @@
label = cms.InputTag("pfJetProbabilityBJetTags" ),
workingPoint = cms.double(0.275)
),
trackCountingPur = cms.PSet(
label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
workingPoint = cms.double(3.41)
),
# trackCountingPur = cms.PSet(
# label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
# workingPoint = cms.double(3.41)
# ),
secondaryVertex = cms.PSet(
label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
workingPoint = cms.double(0.890)
Expand All @@ -350,7 +350,7 @@
triggerExtras = cms.PSet(
src = cms.InputTag("TriggerResults","","HLT"),
### Updating to HLT paths to be monitored by TOP PAG in 2016
paths = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v','HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v','HLT_Ele22_eta2p1_WPLoose_Gsf_v','HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v'])
paths = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele25_WPTight_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v','HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v','HLT_Ele22_eta2p1_WPLoose_Gsf_v','HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v'])
)
),
## ------------------------------------------------------
Expand All @@ -364,7 +364,7 @@
trigger = cms.PSet(
src = cms.InputTag("TriggerResults","","HLT"),
### Updating to HLT paths to be monitored by TOP PAG in 2016
select = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v','HLT_Ele22_eta2p1_WPLoose_Gsf_v','HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v'])
select = cms.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele25_WPTight_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v','HLT_Ele22_eta2p1_WPLoose_Gsf_v','HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v'])
),
## [optional] : when omitted no preselection is applied
vertex = cms.PSet(
Expand Down
26 changes: 13 additions & 13 deletions DQMOffline/Trigger/src/TopSingleLeptonHLTOfflineDQM.cc
View file
Expand Up @@ -125,8 +125,8 @@ namespace HLTOfflineDQMTopSingleLepton {
if( includeBTag_ ){
edm::ParameterSet btagEff=jetExtras.getParameter<edm::ParameterSet>("jetBTaggers").getParameter<edm::ParameterSet>("trackCountingEff");
btagEff_= iC.consumes< reco::JetTagCollection >(btagEff.getParameter<edm::InputTag>("label")); btagEffWP_= btagEff.getParameter<double>("workingPoint");
edm::ParameterSet btagPur=jetExtras.getParameter<edm::ParameterSet>("jetBTaggers").getParameter<edm::ParameterSet>("trackCountingPur");
btagPur_= iC.consumes< reco::JetTagCollection >(btagPur.getParameter<edm::InputTag>("label")); btagPurWP_= btagPur.getParameter<double>("workingPoint");
// edm::ParameterSet btagPur=jetExtras.getParameter<edm::ParameterSet>("jetBTaggers").getParameter<edm::ParameterSet>("trackCountingPur");
// btagPur_= iC.consumes< reco::JetTagCollection >(btagPur.getParameter<edm::InputTag>("label")); btagPurWP_= btagPur.getParameter<double>("workingPoint");
edm::ParameterSet btagVtx=jetExtras.getParameter<edm::ParameterSet>("jetBTaggers").getParameter<edm::ParameterSet>("secondaryVertex" );
btagVtx_= iC.consumes< reco::JetTagCollection >(btagVtx.getParameter<edm::InputTag>("label")); btagVtxWP_= btagVtx.getParameter<double>("workingPoint");
}
Expand Down Expand Up @@ -200,9 +200,9 @@ namespace HLTOfflineDQMTopSingleLepton {
// btag discriminator for track counting high efficiency for jets with pt(L2L3)>20
hists_["jetBDiscEff_"] = store_.book1D("JetBDiscProb", "Disc_{b/prob}(jet)", 25, 0., 2.5);
// multiplicity of btagged jets (for track counting high purity) with pt(L2L3)>20
hists_["jetMultBPur_"] = store_.book1D("JetMultBPur", "N_{20}(b/pur)" , 10, 0., 10.);
// hists_["jetMultBPur_"] = store_.book1D("JetMultBPur", "N_{20}(b/pur)" , 10, 0., 10.);
// btag discriminator for track counting high purity
hists_["jetBDiscPur_"] = store_.book1D("JetBDiscPur", "Disc_{b/pur}(Jet)", 100, 0., 10.);
// hists_["jetBDiscPur_"] = store_.book1D("JetBDiscPur", "Disc_{b/pur}(Jet)", 100, 0., 10.);
// multiplicity of btagged jets (for simple secondary vertex) with pt(L2L3)>20
hists_["jetMultBVtx_"] = store_.book1D("JetMultBVtx", "N_{20}(b/vtx)" , 10, 0., 10.);
// btag discriminator for simple secondary vertex
Expand Down Expand Up @@ -342,7 +342,7 @@ namespace HLTOfflineDQMTopSingleLepton {
edm::Handle<reco::JetTagCollection> btagEff, btagPur, btagVtx;
if( includeBTag_ ){
if( !event.getByToken(btagEff_, btagEff) ) return;
if( !event.getByToken(btagPur_, btagPur) ) return;
// if( !event.getByToken(btagPur_, btagPur) ) return;
if( !event.getByToken(btagVtx_, btagVtx) ) return;
}
// load jet corrector if configured such
Expand Down Expand Up @@ -370,7 +370,7 @@ namespace HLTOfflineDQMTopSingleLepton {

// loop jet collection
std::vector<reco::Jet> correctedJets;
unsigned int mult=0, multBEff=0, multBPur=0, multBVtx=0;
unsigned int mult=0, multBEff=0, multBVtx=0; //multBPur=0;

edm::Handle<edm::View<reco::Jet> > jets;
if( !event.getByToken(jets_, jets) ) {
Expand Down Expand Up @@ -416,18 +416,18 @@ namespace HLTOfflineDQMTopSingleLepton {
fill("jetBDiscEff_", btagEffDisc);
if( (*btagEff)[jetRef]>btagEffWP_ ) ++multBEff;
// for the btagPur collection
double btagPurDisc = (*btagPur)[jetRef];
fill("jetBDiscPur_", btagPurDisc);
if( (*btagPur)[jetRef]>btagPurWP_ ) {if(multBPur == 0) bJetCand = *jet; ++multBPur;}
// double btagPurDisc = (*btagPur)[jetRef];
// fill("jetBDiscPur_", btagPurDisc);
// if( (*btagPur)[jetRef]>btagPurWP_ ) {if(multBPur == 0) bJetCand = *jet; ++multBPur;}
// for the btagVtx collection
double btagVtxDisc = (*btagVtx)[jetRef];
fill("jetBDiscVtx_", btagVtxDisc);
if( (*btagVtx)[jetRef]>btagVtxWP_ ) ++multBVtx;
if( (*btagVtx)[jetRef]>btagVtxWP_ ) { if(multBVtx == 0) bJetCand= *jet; ++multBVtx;}
}
}
fill("jetMult_" , mult );
fill("jetMultBEff_", multBEff);
fill("jetMultBPur_", multBPur);
// fill("jetMultBPur_", multBPur);
fill("jetMultBVtx_", multBVtx);

/*
Expand Down Expand Up @@ -477,13 +477,13 @@ namespace HLTOfflineDQMTopSingleLepton {
++logged_;
}
}
if(multBPur != 0 && mMultIso == 1 ){
if(multBVtx != 0 && mMultIso == 1 ){
double mtW = eventKinematics.tmassWBoson(&mu,mET,bJetCand); if (mtW == mtW) fill("MTWm_",mtW);
double Mlb = eventKinematics.masslb(&mu,mET,bJetCand); if (Mlb == Mlb) fill("mMub_", Mlb);
double MTT = eventKinematics.tmassTopQuark(&mu,mET,bJetCand); if (MTT == MTT) fill("mMTT_", MTT);
}

if(multBPur != 0 && eMultIso == 1 ){
if(multBVtx != 0 && eMultIso == 1 ){
double mtW = eventKinematics.tmassWBoson(&mu,mET,bJetCand); if (mtW == mtW)fill("MTWe_",mtW);
double Mlb = eventKinematics.masslb(&mu,mET,bJetCand); if (Mlb == Mlb) fill("mEb_", Mlb);
double MTT = eventKinematics.tmassTopQuark(&mu,mET,bJetCand); if (MTT == MTT) fill("eMTT_", MTT);
Expand Down
2 changes: 1 addition & 1 deletion HLTriggerOffline/Top/python/singletopHLTEventValidation_cfi.py
View file
Expand Up @@ -54,5 +54,5 @@
iTrigger = cms.untracked.InputTag("TriggerResults","","HLT"),

### Updating to HLT paths to be monitored by TOP PAG in 2016
vsPaths = cms.untracked.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v']),
vsPaths = cms.untracked.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele25_WPTight_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v']),
)
2 changes: 1 addition & 1 deletion HLTriggerOffline/Top/python/topSingleLeptonHLTEventValidation_cfi.py
View file
Expand Up @@ -53,5 +53,5 @@
iTrigger = cms.untracked.InputTag("TriggerResults","","HLT"),

### Updating to HLT paths to be monitored by TOP PAG in 2016
vsPaths = cms.untracked.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v']),
vsPaths = cms.untracked.vstring(['HLT_Ele27_WPLoose_Gsf_v','HLT_Ele25_WPTight_Gsf_v','HLT_Ele23_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPTight_Gsf_v', 'HLT_Ele27_WPTight_Gsf_v','HLT_Ele27_eta2p1_WPLoose_Gsf_v', 'HLT_Ele22_eta2p1_WPLoose_Gsf_v', 'HLT_Ele24_eta2p1_WPLoose_Gsf_v','HLT_Ele25_eta2p1_WPLoose_Gsf_v']),
)

0 comments on commit e0647c2

Please sign in to comment.