Merge pull request #20147 from fwyzard/HLTrigger_JSONMonitoring_minor…

…_improvements_93x minor improvements to the L1T and HLT monitoring modules
cms-sw · Aug 13, 2017 · 8ef7e73 · 8ef7e73
2 parents b19919d + 1ea9470
commit 8ef7e73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git 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<evf::EvFDaqDirector>().isAvailable()) {
-    rundata->streamDestination = edm::Service<evf::EvFDaqDirector>()->getStreamDestinations("streamHLTRates");
-    rundata->streamMergeType   = edm::Service<evf::EvFDaqDirector>()->getStreamMergeType("streamHLTRates", evf::MergeTypeJSNDATA);
+    rundata->streamDestination = edm::Service<evf::EvFDaqDirector>()->getStreamDestinations(streamName_);
+    rundata->streamMergeType   = edm::Service<evf::EvFDaqDirector>()->getStreamMergeType(streamName_, evf::MergeTypeJSNDATA);
     rundata->baseRunDir        = edm::Service<evf::EvFDaqDirector>()->baseRunDir();
   } else {
     rundata->streamDestination = "";

diff --git 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<evf::EvFDaqDirector>().isAvailable()) {
-    rundata->streamDestination = edm::Service<evf::EvFDaqDirector>()->getStreamDestinations("streamL1Rates");
-    rundata->streamMergeType   = edm::Service<evf::EvFDaqDirector>()->getStreamMergeType("streamL1Rates", evf::MergeTypeJSNDATA);
+    rundata->streamDestination = edm::Service<evf::EvFDaqDirector>()->getStreamDestinations(streamName_);
+    rundata->streamMergeType   = edm::Service<evf::EvFDaqDirector>()->getStreamMergeType(streamName_, evf::MergeTypeJSNDATA);
     rundata->baseRunDir        = edm::Service<evf::EvFDaqDirector>()->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