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

introduce GenericTriggerEventFlag::fillPSetDescription and use it in several clients #37083

Merged
merged 1 commit into from
Mar 2, 2022
Merged

introduce GenericTriggerEventFlag::fillPSetDescription and use it in several clients #37083

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
3 changes: 3 additions & 0 deletions CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "FWCore/Framework/interface/ESWatcher.h"
#include "FWCore/Framework/interface/ConsumesCollector.h"
#include "FWCore/Utilities/interface/ESGetToken.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h"
#include "CondFormats/DataRecord/interface/L1GtTriggerMenuRcd.h"
#include "CondFormats/HLTObjects/interface/AlCaRecoTriggerBits.h"
Expand Down Expand Up @@ -139,6 +140,8 @@ class GenericTriggerEventFlag {

bool allHLTPathsAreValid() const;

static void fillPSetDescription(edm::ParameterSetDescription& desc);

private:
GenericTriggerEventFlag(const edm::ParameterSet& config, edm::ConsumesCollector& iC, bool stage1Valid);
// Private methods
Expand Down
35 changes: 29 additions & 6 deletions CommonTools/TriggerUtils/src/GenericTriggerEventFlag.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ GenericTriggerEventFlag::GenericTriggerEventFlag(const edm::ParameterSet& config
andOrDcs_ = config.getParameter<bool>("andOrDcs");
dcsInputTag_ = config.getParameter<edm::InputTag>("dcsInputTag");
dcsInputToken_ = iC.mayConsume<DcsStatusCollection>(dcsInputTag_);
dcsPartitions_ = config.getParameter<std::vector<int> >("dcsPartitions");
dcsPartitions_ = config.getParameter<std::vector<int>>("dcsPartitions");
errorReplyDcs_ = config.getParameter<bool>("errorReplyDcs");
} else {
onDcs_ = false;
Expand All @@ -86,7 +86,7 @@ GenericTriggerEventFlag::GenericTriggerEventFlag(const edm::ParameterSet& config
andOrGt_ = config.getParameter<bool>("andOrGt");
gtInputTag_ = config.getParameter<edm::InputTag>("gtInputTag");
gtInputToken_ = iC.mayConsume<L1GlobalTriggerReadoutRecord>(gtInputTag_);
gtLogicalExpressions_ = config.getParameter<std::vector<std::string> >("gtStatusBits");
gtLogicalExpressions_ = config.getParameter<std::vector<std::string>>("gtStatusBits");
errorReplyGt_ = config.getParameter<bool>("errorReplyGt");
if (config.exists("gtEvmInputTag")) {
gtEvmInputTag_ = config.getParameter<edm::InputTag>("gtEvmInputTag");
Expand All @@ -103,7 +103,7 @@ GenericTriggerEventFlag::GenericTriggerEventFlag(const edm::ParameterSet& config
stage2_ = config.getParameter<bool>("stage2");
else
stage2_ = false;
l1LogicalExpressionsCache_ = config.getParameter<std::vector<std::string> >("l1Algorithms");
l1LogicalExpressionsCache_ = config.getParameter<std::vector<std::string>>("l1Algorithms");
errorReplyL1_ = config.getParameter<bool>("errorReplyL1");
if (config.exists("l1DBKey"))
l1DBKey_ = config.getParameter<std::string>("l1DBKey");
Expand All @@ -116,7 +116,7 @@ GenericTriggerEventFlag::GenericTriggerEventFlag(const edm::ParameterSet& config
andOrHlt_ = config.getParameter<bool>("andOrHlt");
hltInputTag_ = config.getParameter<edm::InputTag>("hltInputTag");
hltInputToken_ = iC.mayConsume<edm::TriggerResults>(hltInputTag_);
hltLogicalExpressionsCache_ = config.getParameter<std::vector<std::string> >("hltPaths");
hltLogicalExpressionsCache_ = config.getParameter<std::vector<std::string>>("hltPaths");
errorReplyHlt_ = config.getParameter<bool>("errorReplyHlt");
if (config.exists("hltDBKey"))
hltDBKey_ = config.getParameter<std::string>("hltDBKey");
Expand All @@ -128,7 +128,7 @@ GenericTriggerEventFlag::GenericTriggerEventFlag(const edm::ParameterSet& config
else {
if (config.exists("dbLabel"))
dbLabel_ = config.getParameter<std::string>("dbLabel");
watchDB_ = std::make_unique<edm::ESWatcher<AlCaRecoTriggerBitsRcd> >();
watchDB_ = std::make_unique<edm::ESWatcher<AlCaRecoTriggerBitsRcd>>();
}
}

Expand Down Expand Up @@ -203,7 +203,7 @@ void GenericTriggerEventFlag::initRun(const edm::Run& run, const edm::EventSetup
if (stage2_) {
l1uGt_->retrieveL1Setup(setup);

const std::vector<std::pair<std::string, double> > prescales = l1uGt_->prescales();
const std::vector<std::pair<std::string, double>> prescales = l1uGt_->prescales();
for (const auto& ip : prescales)
algoNames.push_back(ip.first);
} else {
Expand Down Expand Up @@ -770,3 +770,26 @@ bool GenericTriggerEventFlag::allHLTPathsAreValid() const {

return true;
}

void GenericTriggerEventFlag::fillPSetDescription(edm::ParameterSetDescription& desc) {
desc.add<bool>("ReadPrescalesFromFile", false);
desc.add<bool>("andOr", false);
desc.add<bool>("andOrDcs", false);
desc.add<bool>("andOrHlt", false);
desc.add<bool>("andOrL1", false);
desc.add<bool>("errorReplyDcs", false);
desc.add<bool>("errorReplyHlt", false);
desc.add<bool>("errorReplyL1", false);
desc.add<bool>("l1BeforeMask", false);
desc.add<bool>("stage2", false);
desc.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
desc.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
desc.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
desc.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
desc.add<std::string>("dbLabel", "");
desc.add<std::string>("hltDBKey", "");
desc.add<std::vector<int>>("dcsPartitions", {});
desc.add<std::vector<std::string>>("hltPaths", {});
desc.add<std::vector<std::string>>("l1Algorithms", {});
desc.add<unsigned int>("verbosityLevel", 0);
}
13 changes: 1 addition & 12 deletions DQM/TrackingMonitorSource/src/TrackToTrackComparisonHists.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,18 +291,7 @@ void TrackToTrackComparisonHists::fillDescriptions(edm::ConfigurationDescription
desc.add<double>("dzWRTPvCut", 1e6);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr", false);
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int> >("dcsPartitions", {24, 25, 26, 27, 28, 29}); // 24-27: strip, 28-29
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true); // True:=OR; False:=AND
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string> >("hltPaths", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);
GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("genericTriggerEventPSet", genericTriggerEventPSet);

edm::ParameterSetDescription histoPSet;
Expand Down
21 changes: 1 addition & 20 deletions DQMOffline/Trigger/plugins/BPHMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1245,26 +1245,7 @@ void BPHMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
desc.add<unsigned int>("stageL1Trigger", 1);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<int>>("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<bool>("andOrL1", true);
genericTriggerEventPSet.add<std::vector<std::string>>("hltPaths", {});
genericTriggerEventPSet.add<std::vector<std::string>>("l1Algorithms", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<bool>("errorReplyL1", true);
genericTriggerEventPSet.add<bool>("l1BeforeMask", true);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 0);
genericTriggerEventPSet.add<bool>("stage2", false);
genericTriggerEventPSet.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<bool>("ReadPrescalesFromFile", false);
GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);

desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);
Expand Down
14 changes: 1 addition & 13 deletions DQMOffline/Trigger/plugins/DiDispStaMuonMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,19 +358,7 @@ void DiDispStaMuonMonitor::fillDescriptions(edm::ConfigurationDescriptions& desc
desc.add<edm::ParameterSetDescription>("muonSelection", muonSelection);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int>>("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string>>("hltPaths", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);

GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);

Expand Down
13 changes: 1 addition & 12 deletions DQMOffline/Trigger/plugins/DiJetMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,18 +435,7 @@ void DiJetMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions
desc.add<double>("ptcut", 20);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int> >("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string> >("hltPaths", {});
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);

GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);

Expand Down
14 changes: 1 addition & 13 deletions DQMOffline/Trigger/plugins/HTMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,19 +460,7 @@ void HTMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
desc.add<double>("dEtaCut", 1.3);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int> >("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string> >("hltPaths", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);

GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);

Expand Down
17 changes: 1 addition & 16 deletions DQMOffline/Trigger/plugins/JetMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,22 +656,7 @@ void JetMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
desc.add<bool>("iscalojettrg", false);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int> >("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string> >("hltPaths", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);
genericTriggerEventPSet.add<bool>("stage2", false);
genericTriggerEventPSet.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<bool>("ReadPrescalesFromFile", false);
GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);

desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);
Expand Down
17 changes: 1 addition & 16 deletions DQMOffline/Trigger/plugins/METMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,22 +379,7 @@ void METMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
desc.add<unsigned>("nmuons", 0);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int> >("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string> >("hltPaths", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);
genericTriggerEventPSet.add<bool>("stage2", false);
genericTriggerEventPSet.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<bool>("ReadPrescalesFromFile", false);
GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);

desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);
Expand Down
14 changes: 1 addition & 13 deletions DQMOffline/Trigger/plugins/METplusTrackMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,19 +442,7 @@ void METplusTrackMonitor::fillDescriptions(edm::ConfigurationDescriptions& descr
desc.add<double>("maxMatchDeltaR", 0.1);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int> >("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string> >("hltPaths", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);

GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);

Expand Down
23 changes: 1 addition & 22 deletions DQMOffline/Trigger/plugins/MuonMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,28 +355,7 @@ void MuonMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
desc.add<unsigned int>("nelectrons", 0);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int>>("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string>>("hltPaths", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<bool>("errorReplyL1", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);
genericTriggerEventPSet.add<bool>("andOrL1", false);
genericTriggerEventPSet.add<bool>("l1BeforeMask", false);
genericTriggerEventPSet.add<bool>("stage2", false);
genericTriggerEventPSet.add<edm::InputTag>("l1tAlgBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<edm::InputTag>("l1tExtBlkInputTag", edm::InputTag("gtStage2Digis"));
genericTriggerEventPSet.add<bool>("ReadPrescalesFromFile", false);

genericTriggerEventPSet.add<std::vector<std::string>>("l1Algorithms", {});

GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);

Expand Down
14 changes: 1 addition & 13 deletions DQMOffline/Trigger/plugins/NoBPTXMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,19 +475,7 @@ void NoBPTXMonitor::fillDescriptions(edm::ConfigurationDescriptions& description
desc.add<unsigned int>("nmuons", 0);

edm::ParameterSetDescription genericTriggerEventPSet;
genericTriggerEventPSet.add<bool>("andOr");
genericTriggerEventPSet.add<edm::InputTag>("dcsInputTag", edm::InputTag("scalersRawToDigi"));
genericTriggerEventPSet.add<std::vector<int> >("dcsPartitions", {});
genericTriggerEventPSet.add<bool>("andOrDcs", false);
genericTriggerEventPSet.add<bool>("errorReplyDcs", true);
genericTriggerEventPSet.add<std::string>("dbLabel", "");
genericTriggerEventPSet.add<bool>("andOrHlt", true);
genericTriggerEventPSet.add<edm::InputTag>("hltInputTag", edm::InputTag("TriggerResults::HLT"));
genericTriggerEventPSet.add<std::vector<std::string> >("hltPaths", {});
genericTriggerEventPSet.add<std::string>("hltDBKey", "");
genericTriggerEventPSet.add<bool>("errorReplyHlt", false);
genericTriggerEventPSet.add<unsigned int>("verbosityLevel", 1);

GenericTriggerEventFlag::fillPSetDescription(genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("numGenericTriggerEventPSet", genericTriggerEventPSet);
desc.add<edm::ParameterSetDescription>("denGenericTriggerEventPSet", genericTriggerEventPSet);

Expand Down