Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minor improvements to the L1T and HLT monitoring modules #20147

Merged
merged 1 commit into from Aug 13, 2017
Merged

minor improvements to the L1T and HLT monitoring modules #20147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions HLTrigger/JSONMonitoring/plugins/HLTriggerJSONMonitoring.cc
View file
Open in desktop
Expand Up @@ -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&);
Expand Down Expand Up @@ -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 = "";
Expand Down
7 changes: 3 additions & 4 deletions HLTrigger/JSONMonitoring/plugins/L1TriggerJSONMonitoring.cc
View file
Open in desktop
Expand Up @@ -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&);
Expand Down Expand Up @@ -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 = "";
Expand All @@ -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
Expand Down