Skip to content

Commit f7f9cb0

Browse files
mmusichjprendi
authored andcommitted
resolve the missing DCSRecords printout in JME DQM for HLT monitoring
1 parent 9b90e50 commit f7f9cb0

File tree

5 files changed

+43
-15
lines changed

5 files changed

+43
-15
lines changed

DQM/HLTEvF/python/ScoutingJetMonitoring_cff.py

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,25 @@
44

55
from DQMOffline.JetMET.jetMETDQMOfflineSource_cff import *
66

7-
8-
jetDQMOnlineAnalyzerAk4ScoutingCleaned = jetDQMAnalyzerAk4ScoutingCleaned.clone()
9-
jetDQMOnlineAnalyzerAk4ScoutingUncleaned = jetDQMAnalyzerAk4ScoutingUncleaned.clone()
7+
jetDQMOnlineAnalyzerAk4ScoutingCleaned = jetDQMAnalyzerAk4ScoutingCleaned.clone(
8+
DCSFilterForJetMonitoring = cms.PSet(
9+
DetectorTypes = cms.untracked.string("ecal:hbhe:hf:pixel:sistrip:es:muon"),
10+
onlineMetaDataDigisSrc = cms.untracked.InputTag("hltOnlineMetaDataDigis"),
11+
DebugOn = cms.untracked.bool(False),
12+
alwaysPass = cms.untracked.bool(False)
13+
)
14+
)
15+
jetDQMOnlineAnalyzerAk4ScoutingUncleaned = jetDQMAnalyzerAk4ScoutingUncleaned.clone(
16+
DCSFilterForJetMonitoring = cms.PSet(
17+
DetectorTypes = cms.untracked.string("ecal:hbhe:hf:pixel:sistrip:es:muon"),
18+
onlineMetaDataDigisSrc = cms.untracked.InputTag("hltOnlineMetaDataDigis"),
19+
DebugOn = cms.untracked.bool(False),
20+
alwaysPass = cms.untracked.bool(False)
21+
)
22+
)
1023

1124
jetDQMOnlineAnalyzerSequenceScouting = cms.Sequence(jetDQMOnlineAnalyzerAk4ScoutingUncleaned*jetDQMOnlineAnalyzerAk4ScoutingCleaned)
1225

1326
ScoutingJetMonitoring = cms.Sequence(jetPreDQMSeqScouting*
14-
dqmAk4PFScoutingL1FastL2L3ResidualCorrectorChain*
15-
jetDQMOnlineAnalyzerSequenceScouting)
27+
dqmAk4PFScoutingL1FastL2L3ResidualCorrectorChain*
28+
jetDQMOnlineAnalyzerSequenceScouting)

DQM/HLTEvF/python/ScoutingMuonMonitoring_cff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
ScoutingMuonTriggerAnalysis_DoubleMu = ScoutingMuonTriggerAnalysis_DoubleMu.clone(OutputInternalPath = "/HLT/ScoutingOnline/Muons/L1Efficiency/DoubleMu")
1111
ScoutingMuonTriggerAnalysis_SingleMu = ScoutingMuonTriggerAnalysis_SingleMu.clone(OutputInternalPath = "/HLT/ScoutingOnline/Muons/L1Efficiency/SingleMu")
1212

13-
ScoutingMuonMonitoring = cms.Sequence( ScoutingMuonTagProbeAnalysisNoVtxOnline + ScoutingMuonTagProbeAnalysisVtxOnline + ScoutingMuonTriggerAnalysis_DoubleMu + ScoutingMuonTriggerAnalysis_SingleMu )
13+
ScoutingMuonMonitoring = cms.Sequence( ScoutingMuonTagProbeAnalysisNoVtxOnline + ScoutingMuonTagProbeAnalysisVtxOnline + ScoutingMuonTriggerAnalysis_DoubleMu + ScoutingMuonTriggerAnalysis_SingleMu )

DQMOffline/JetMET/interface/JetMETDQMDCSFilter.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
class JetMETDQMDCSFilter {
1919
public:
2020
JetMETDQMDCSFilter(const edm::ParameterSet&, edm::ConsumesCollector&);
21-
JetMETDQMDCSFilter(const std::string& detectorTypes,
21+
JetMETDQMDCSFilter(const edm::ParameterSet&,
22+
const std::string& detectorTypes,
2223
edm::ConsumesCollector&,
2324
const bool verbose = false,
2425
const bool alwaysPass = false);
@@ -35,6 +36,8 @@ class JetMETDQMDCSFilter {
3536
bool verbose_;
3637
bool filter_;
3738
bool detectorOn_;
39+
edm::InputTag scalersSrc_;
40+
edm::InputTag onlineMetaDataDigiSrc_;
3841
std::string detectorTypes_;
3942
std::map<std::string, std::vector<int>> associationMap_;
4043
std::map<std::string, bool> passPerDet_;

DQMOffline/JetMET/src/JetAnalyzer.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,8 @@ JetAnalyzer::JetAnalyzer(const edm::ParameterSet& pSet)
238238
// ==========================================================
239239
edm::ConsumesCollector iC = consumesCollector();
240240
DCSFilterForJetMonitoring_ = new JetMETDQMDCSFilter(pSet.getParameter<ParameterSet>("DCSFilterForJetMonitoring"), iC);
241-
DCSFilterForDCSMonitoring_ = new JetMETDQMDCSFilter("ecal:hbhe:hf:ho:pixel:sistrip:es:muon", iC);
241+
DCSFilterForDCSMonitoring_ = new JetMETDQMDCSFilter(
242+
pSet.getParameter<ParameterSet>("DCSFilterForJetMonitoring"), "ecal:hbhe:hf:ho:pixel:sistrip:es:muon", iC);
242243

243244
//Trigger selectoin
244245
edm::ParameterSet highptjetparms = pSet.getParameter<edm::ParameterSet>("highPtJetTrigger");

DQMOffline/JetMET/src/JetMETDQMDCSFilter.cc

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,41 @@ JetMETDQMDCSFilter::JetMETDQMDCSFilter(const edm::ParameterSet& pset, edm::Consu
1515
verbose_ = pset.getUntrackedParameter<bool>("DebugOn", false);
1616
detectorTypes_ = pset.getUntrackedParameter<std::string>("DetectorTypes", "ecal:hcal");
1717
filter_ = !pset.getUntrackedParameter<bool>("alwaysPass", false);
18-
scalarsToken_ = iC.consumes<DcsStatusCollection>(std::string("scalersRawToDigi"));
19-
dcsRecordToken_ = iC.consumes<DCSRecord>(std::string("onlineMetaDataDigis"));
18+
scalersSrc_ = pset.getUntrackedParameter<edm::InputTag>("scalerSrc", edm::InputTag("scalersRawToDigi"));
19+
onlineMetaDataDigiSrc_ =
20+
pset.getUntrackedParameter<edm::InputTag>("onlineMetaDataDigisSrc", edm::InputTag("onlineMetaDataDigis"));
21+
scalarsToken_ = iC.consumes<DcsStatusCollection>(scalersSrc_);
22+
dcsRecordToken_ = iC.consumes<DCSRecord>(onlineMetaDataDigiSrc_);
2023

2124
detectorOn_ = false;
2225
if (verbose_)
23-
edm::LogPrint("JetMETDQMDCSFilter") << " constructor: " << detectorTypes_ << std::endl;
26+
edm::LogPrint("JetMETDQMDCSFilter") << " constructor: " << detectorTypes_
27+
<< " onlineMetaDataSource: " << onlineMetaDataDigiSrc_.encode() << std::endl;
2428

2529
// initialize variables
2630
initializeVars();
2731
}
2832

29-
JetMETDQMDCSFilter::JetMETDQMDCSFilter(const std::string& detectorTypes,
33+
JetMETDQMDCSFilter::JetMETDQMDCSFilter(const edm::ParameterSet& pset,
34+
const std::string& detectorTypes,
3035
edm::ConsumesCollector& iC,
3136
const bool verbose,
3237
const bool alwaysPass) {
3338
verbose_ = verbose;
3439
detectorTypes_ = detectorTypes;
3540
filter_ = !alwaysPass;
36-
scalarsToken_ = iC.consumes<DcsStatusCollection>(std::string("scalersRawToDigi"));
37-
dcsRecordToken_ = iC.consumes<DCSRecord>(std::string("onlineMetaDataDigis"));
41+
42+
scalersSrc_ = pset.getUntrackedParameter<edm::InputTag>("scalerSrc", edm::InputTag("scalersRawToDigi"));
43+
onlineMetaDataDigiSrc_ =
44+
pset.getUntrackedParameter<edm::InputTag>("onlineMetaDataDigisSrc", edm::InputTag("onlineMetaDataDigis"));
45+
46+
scalarsToken_ = iC.consumes<DcsStatusCollection>(scalersSrc_);
47+
dcsRecordToken_ = iC.consumes<DCSRecord>(onlineMetaDataDigiSrc_);
3848

3949
detectorOn_ = false;
4050
if (verbose_)
41-
edm::LogPrint("JetMETDQMDCSFilter") << " constructor: " << detectorTypes_ << std::endl;
51+
edm::LogPrint("JetMETDQMDCSFilter") << " constructor with no pset: " << detectorTypes_
52+
<< " onlineMetaDataSource: " << onlineMetaDataDigiSrc_.encode() << std::endl;
4253

4354
// initialize variables
4455
initializeVars();

0 commit comments

Comments
 (0)