From 1ea94700b175dc2ffee45c4ee976a36a727fb384 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Sat, 12 Aug 2017 19:22:29 +0200 Subject: [PATCH] minor improvements to the L1T and HLT monitoring modules --- .../JSONMonitoring/plugins/HLTriggerJSONMonitoring.cc | 5 ++--- .../JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/HLTrigger/JSONMonitoring/plugins/HLTriggerJSONMonitoring.cc b/HLTrigger/JSONMonitoring/plugins/HLTriggerJSONMonitoring.cc index 25befe12d26a9..84ff9f7edc7ba 100644 --- a/HLTrigger/JSONMonitoring/plugins/HLTriggerJSONMonitoring.cc +++ b/HLTrigger/JSONMonitoring/plugins/HLTriggerJSONMonitoring.cc @@ -122,7 +122,6 @@ class HLTriggerJSONMonitoring : public edm::global::EDAnalyzer< private: - // FIXME use this static constexpr const char* streamName_ = "streamHLTRates"; static void writeJsdFile(HLTriggerJSONMonitoringData::run const&); @@ -166,8 +165,8 @@ HLTriggerJSONMonitoring::globalBeginRun(edm::Run const& run, edm::EventSetup con // set the DAQ parameters if (edm::Service().isAvailable()) { - rundata->streamDestination = edm::Service()->getStreamDestinations("streamHLTRates"); - rundata->streamMergeType = edm::Service()->getStreamMergeType("streamHLTRates", evf::MergeTypeJSNDATA); + rundata->streamDestination = edm::Service()->getStreamDestinations(streamName_); + rundata->streamMergeType = edm::Service()->getStreamMergeType(streamName_, evf::MergeTypeJSNDATA); rundata->baseRunDir = edm::Service()->baseRunDir(); } else { rundata->streamDestination = ""; diff --git a/HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc b/HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc index cb2d4cfc177ba..4f943316f0e37 100644 --- a/HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc +++ b/HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc @@ -144,7 +144,6 @@ class L1TriggerJSONMonitoring : public edm::global::EDAnalyzer< static constexpr const int kPrescaleUndefined = -2; static constexpr const int kPrescaleConflict = -1; - // FIXME use this static constexpr const char* streamName_ = "streamL1Rates"; static void writeJsdFile(L1TriggerJSONMonitoringData::run const&); @@ -190,8 +189,8 @@ L1TriggerJSONMonitoring::globalBeginRun(edm::Run const& run, edm::EventSetup con // set the DAQ parameters if (edm::Service().isAvailable()) { - rundata->streamDestination = edm::Service()->getStreamDestinations("streamL1Rates"); - rundata->streamMergeType = edm::Service()->getStreamMergeType("streamL1Rates", evf::MergeTypeJSNDATA); + rundata->streamDestination = edm::Service()->getStreamDestinations(streamName_); + rundata->streamMergeType = edm::Service()->getStreamMergeType(streamName_, evf::MergeTypeJSNDATA); rundata->baseRunDir = edm::Service()->baseRunDir(); } else { rundata->streamDestination = ""; @@ -207,7 +206,7 @@ L1TriggerJSONMonitoring::globalBeginRun(edm::Run const& run, edm::EventSetup con for (auto const& algo: menuHandle->getAlgorithmMap()) triggerNames[algo.second.getIndex()] = algo.first; } else { - edm::LogWarning("L1TriggerJSONMonitoring") << "L1TUtmTriggerMenu not found in the EventSetup.\nThe Level 1 Trigger rate monitoring will not include the rigger names."; + edm::LogWarning("L1TriggerJSONMonitoring") << "L1TUtmTriggerMenu not found in the EventSetup.\nThe Level 1 Trigger rate monitoring will not include the trigger names."; } // write the per-run .jsd file