Skip to content

Commit 3b17e35

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47483 from AdrianoDee/b2g_hlt_trigger_results
Reading `TriggerResults` from an `InputTag` for B2G HLT Analyzers
2 parents fe4b812 + e42bdfd commit 3b17e35

File tree

6 files changed

+13
-22
lines changed

6 files changed

+13
-22
lines changed

‎HLTriggerOffline/B2G/interface/B2GDoubleLeptonHLTValidation.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ class B2GDoubleLeptonHLTValidation : public DQMEDAnalyzer {
9292
unsigned int minLeptons_;
9393

9494
// Trigger
95-
std::string sTrigger_;
96-
edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
95+
const edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
9796
std::vector<std::string> vsPaths_;
9897
// Flags
9998
bool isAll_ = false;
@@ -131,16 +130,14 @@ inline B2GDoubleLeptonHLTValidation::B2GDoubleLeptonHLTValidation(const edm::Par
131130
isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons", 0.)),
132131
minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons", 0)),
133132
minLeptons_(iConfig.getUntrackedParameter<unsigned int>("minLeptons", 0)),
134-
sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger", "TriggerResults")),
133+
tokTrigger_(consumes(iConfig.getParameter<edm::InputTag>("triggerResults"))),
135134
vsPaths_(iConfig.getUntrackedParameter<std::vector<std::string>>("vsPaths"))
136135

137136
{
138137
// Electrons
139138
tokElectrons_ = consumes<edm::View<reco::GsfElectron>>(edm::InputTag(sElectrons_));
140139
// Muons
141140
tokMuons_ = consumes<edm::View<reco::Muon>>(edm::InputTag(sMuons_));
142-
// Trigger
143-
tokTrigger_ = consumes<edm::TriggerResults>(edm::InputTag(sTrigger_, "", "HLT"));
144141
}
145142

146143
inline B2GDoubleLeptonHLTValidation::~B2GDoubleLeptonHLTValidation() {

‎HLTriggerOffline/B2G/interface/B2GHadronicHLTValidation.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ class B2GHadronicHLTValidation : public DQMEDAnalyzer {
8282
unsigned int minJets_;
8383
double htMin_;
8484
// Trigger
85-
std::string sTrigger_;
86-
edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
85+
const edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
8786
std::vector<std::string> vsPaths_;
8887
// Flags
8988
bool isAll_ = false;
@@ -117,14 +116,12 @@ inline B2GHadronicHLTValidation::B2GHadronicHLTValidation(const edm::ParameterSe
117116
etaJets_(iConfig.getUntrackedParameter<double>("etaJets", 0.)),
118117
minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets", 0)),
119118
htMin_(iConfig.getUntrackedParameter<double>("htMin", 0.0)),
120-
sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger", "TriggerResults")),
119+
tokTrigger_(consumes(iConfig.getParameter<edm::InputTag>("triggerResults"))),
121120
vsPaths_(iConfig.getUntrackedParameter<std::vector<std::string>>("vsPaths"))
122121

123122
{
124123
// Jets
125124
tokJets_ = consumes<edm::View<reco::Jet>>(edm::InputTag(sJets_));
126-
// Trigger
127-
tokTrigger_ = consumes<edm::TriggerResults>(edm::InputTag(sTrigger_, "", "HLT"));
128125
}
129126

130127
inline B2GHadronicHLTValidation::~B2GHadronicHLTValidation() {

‎HLTriggerOffline/B2G/interface/B2GSingleLeptonHLTValidation.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ class B2GSingleLeptonHLTValidation : public DQMEDAnalyzer {
101101
double etaJets_;
102102
unsigned int minJets_;
103103
// Trigger
104-
std::string sTrigger_;
105-
edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
104+
const edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
106105
std::vector<std::string> vsPaths_;
107106
// Flags
108107
bool isAll_ = false;
@@ -145,7 +144,7 @@ inline B2GSingleLeptonHLTValidation::B2GSingleLeptonHLTValidation(const edm::Par
145144
ptJets1_(iConfig.getUntrackedParameter<double>("ptJets1", 0.)),
146145
etaJets_(iConfig.getUntrackedParameter<double>("etaJets", 0.)),
147146
minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets", 0)),
148-
sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger", "TriggerResults")),
147+
tokTrigger_(consumes(iConfig.getParameter<edm::InputTag>("triggerResults"))),
149148
vsPaths_(iConfig.getUntrackedParameter<std::vector<std::string>>("vsPaths"))
150149

151150
{
@@ -155,8 +154,6 @@ inline B2GSingleLeptonHLTValidation::B2GSingleLeptonHLTValidation(const edm::Par
155154
tokMuons_ = consumes<edm::View<reco::Muon>>(edm::InputTag(sMuons_));
156155
// Jets
157156
tokJets_ = consumes<edm::View<reco::Jet>>(edm::InputTag(sJets_));
158-
// Trigger
159-
tokTrigger_ = consumes<edm::TriggerResults>(edm::InputTag(sTrigger_, "", "HLT"));
160157
}
161158

162159
inline B2GSingleLeptonHLTValidation::~B2GSingleLeptonHLTValidation() {

‎HLTriggerOffline/B2G/python/b2gDoubleLeptonHLTEventValidation_cfi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
minLeptons = cms.untracked.uint32(2),
2121

2222
# Trigger
23-
sTrigger = cms.untracked.string("TriggerResults"),
23+
triggerResults = cms.InputTag("TriggerResults", "", "HLT"),
2424
vsPaths = cms.untracked.vstring(['HLT_Mu37_Ele27_CaloIdL_GsfTrkIdVL','HLT_Mu27_Ele37_CaloIdL_GsfTrkIdVL']),
2525
)
2626

@@ -43,6 +43,6 @@
4343
minLeptons = cms.untracked.uint32(2),
4444

4545
# Trigger
46-
sTrigger = cms.untracked.string("TriggerResults"),
46+
triggerResults = cms.InputTag("TriggerResults", "", "HLT"),
4747
vsPaths = cms.untracked.vstring(['HLT_DoubleEle37_Ele27_CaloIdL_GsfTrkIdVL']),
4848
)

‎HLTriggerOffline/B2G/python/b2gHadronicHLTEventValidation_cfi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
etaJets = cms.untracked.double(2.4),
1212
minJets = cms.untracked.uint32(1),
1313
# Trigger
14-
sTrigger = cms.untracked.string("TriggerResults"),
14+
triggerResults = cms.InputTag("TriggerResults", "", "HLT"),
1515
vsPaths = cms.untracked.vstring(['HLT_AK8DiPFJet280_200_TrimMass30_BTagCSV_p20',
1616
'HLT_AK8DiPFJet250_200_TrimMass30_BTagCSV_p20',
1717
'HLT_AK8DiPFJet280_200_TrimMass30_BTagCSV_p087',
@@ -36,7 +36,7 @@
3636
etaJets = cms.untracked.double(2.4),
3737
minJets = cms.untracked.uint32(2),
3838
# Trigger
39-
sTrigger = cms.untracked.string("TriggerResults"),
39+
triggerResults = cms.InputTag("TriggerResults", "", "HLT"),
4040
vsPaths = cms.untracked.vstring(['HLT_AK8DiPFJet280_200_TrimMass30_BTagCSV_p20',
4141
'HLT_AK8DiPFJet250_200_TrimMass30_BTagCSV_p20',
4242
'HLT_AK8DiPFJet280_200_TrimMass30_BTagCSV_p087',

‎HLTriggerOffline/B2G/python/b2gSingleLeptonHLTEventValidation_cfi.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
etaJets = cms.untracked.double(2.4),
2323
minJets = cms.untracked.uint32(2),
2424
# Trigger
25-
sTrigger = cms.untracked.string("TriggerResults"),
25+
triggerResults = cms.InputTag("TriggerResults", "", "HLT"),
2626
vsPaths = cms.untracked.vstring(['HLT_Mu40_eta2p1_PFJet200_PFJet50',
2727
'HLT_Mu30_eta2p1_PFJet150_PFJet50']),
2828
)
@@ -48,7 +48,7 @@
4848
etaJets = cms.untracked.double(2.4),
4949
minJets = cms.untracked.uint32(2),
5050
# Trigger
51-
sTrigger = cms.untracked.string("TriggerResults"),
51+
triggerResults = cms.InputTag("TriggerResults", "", "HLT"),
5252
vsPaths = cms.untracked.vstring(['HLT_Ele45_CaloIdVT_GsfTrkIdT_PFJet200_PFJet50',
5353
'HLT_Ele35_CaloIdVT_GsfTrkIdT_PFJet150_PFJet50']),
5454
)
@@ -73,7 +73,7 @@
7373
etaJets = cms.untracked.double(2.4),
7474
minJets = cms.untracked.uint32(1),
7575
# Trigger
76-
sTrigger = cms.untracked.string("TriggerResults"),
76+
triggerResults = cms.InputTag("TriggerResults", "", "HLT"),
7777
vsPaths = cms.untracked.vstring(['HLT_Ele50_CaloIdVT_GsfTrkIdT_PFJet140',
7878
'HLT_Ele50_CaloIdVT_GsfTrkIdT_PFJet165']),
7979
)

0 commit comments

Comments
 (0)