From 6f15bd7dc8a469a3b6f8ccea36b638f0eefa7fa4 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Thu, 18 Mar 2021 08:55:05 +0100 Subject: [PATCH] renamed MultiplicityValueProducer* -> HLTMultiplicityValueProducer* --- ...ducer.h => HLTMultiplicityValueProducer.h} | 22 +++++++++---------- ...licityValueProducerFromNestedCollection.cc | 12 ++++++++++ ...licityValueProducerFromNestedCollection.h} | 21 +++++++++--------- ...licityValueProducerFromNestedCollection.cc | 12 ---------- 4 files changed, 33 insertions(+), 34 deletions(-) rename HLTrigger/JetMET/plugins/{MultiplicityValueProducer.h => HLTMultiplicityValueProducer.h} (71%) create mode 100644 HLTrigger/JetMET/plugins/HLTMultiplicityValueProducerFromNestedCollection.cc rename HLTrigger/JetMET/plugins/{MultiplicityValueProducerFromNestedCollection.h => HLTMultiplicityValueProducerFromNestedCollection.h} (65%) delete mode 100644 HLTrigger/JetMET/plugins/MultiplicityValueProducerFromNestedCollection.cc diff --git a/HLTrigger/JetMET/plugins/MultiplicityValueProducer.h b/HLTrigger/JetMET/plugins/HLTMultiplicityValueProducer.h similarity index 71% rename from HLTrigger/JetMET/plugins/MultiplicityValueProducer.h rename to HLTrigger/JetMET/plugins/HLTMultiplicityValueProducer.h index 3d222f641b0c8..0e2d8f1e9f2b4 100644 --- a/HLTrigger/JetMET/plugins/MultiplicityValueProducer.h +++ b/HLTrigger/JetMET/plugins/HLTMultiplicityValueProducer.h @@ -1,5 +1,5 @@ -#ifndef HLTrigger_JetMET_plugins_MultiplicityValueProducer_h -#define HLTrigger_JetMET_plugins_MultiplicityValueProducer_h +#ifndef HLTrigger_JetMET_plugins_HLTMultiplicityValueProducer_h +#define HLTrigger_JetMET_plugins_HLTMultiplicityValueProducer_h #include #include @@ -14,10 +14,10 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" template -class MultiplicityValueProducer : public edm::global::EDProducer<> { +class HLTMultiplicityValueProducer : public edm::global::EDProducer<> { public: - explicit MultiplicityValueProducer(edm::ParameterSet const&); - ~MultiplicityValueProducer() override {} + explicit HLTMultiplicityValueProducer(edm::ParameterSet const&); + ~HLTMultiplicityValueProducer() override {} static void fillDescriptions(edm::ConfigurationDescriptions&); @@ -30,7 +30,7 @@ class MultiplicityValueProducer : public edm::global::EDProducer<> { }; template -MultiplicityValueProducer::MultiplicityValueProducer(edm::ParameterSet const& iConfig) +HLTMultiplicityValueProducer::HLTMultiplicityValueProducer(edm::ParameterSet const& iConfig) : src_token_(consumes>(iConfig.getParameter("src"))), strObjSelector_(StringCutObjectSelector(iConfig.getParameter("cut"))), defaultValue_(iConfig.getParameter("defaultValue")) { @@ -38,9 +38,9 @@ MultiplicityValueProducer::MultiplicityValueProducer(edm::Pa } template -void MultiplicityValueProducer::produce(edm::StreamID, - edm::Event& iEvent, - edm::EventSetup const& iSetup) const { +void HLTMultiplicityValueProducer::produce(edm::StreamID, + edm::Event& iEvent, + edm::EventSetup const& iSetup) const { auto const& objHandle(iEvent.getHandle(src_token_)); if (objHandle.isValid()) { @@ -62,7 +62,7 @@ void MultiplicityValueProducer::produce(edm::StreamID, } template -void MultiplicityValueProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { +void HLTMultiplicityValueProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("src", edm::InputTag(""))->setComment("input collection"); desc.add("cut", "")->setComment("string for StringCutObjectSelector"); @@ -70,4 +70,4 @@ void MultiplicityValueProducer::fillDescriptions(edm::Config descriptions.addWithDefaultLabel(desc); } -#endif // HLTrigger_JetMET_plugins_MultiplicityValueProducer_h +#endif // HLTrigger_JetMET_plugins_HLTMultiplicityValueProducer_h diff --git a/HLTrigger/JetMET/plugins/HLTMultiplicityValueProducerFromNestedCollection.cc b/HLTrigger/JetMET/plugins/HLTMultiplicityValueProducerFromNestedCollection.cc new file mode 100644 index 0000000000000..19cf8dc232806 --- /dev/null +++ b/HLTrigger/JetMET/plugins/HLTMultiplicityValueProducerFromNestedCollection.cc @@ -0,0 +1,12 @@ +#include "HLTMultiplicityValueProducerFromNestedCollection.h" +#include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" +#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" +#include "FWCore/Framework/interface/MakerMacros.h" + +typedef HLTMultiplicityValueProducerFromNestedCollection + HLTSiPixelClusterMultiplicityValueProducer; +DEFINE_FWK_MODULE(HLTSiPixelClusterMultiplicityValueProducer); + +typedef HLTMultiplicityValueProducerFromNestedCollection + HLTSiPhase2TrackerClusterMultiplicityValueProducer; +DEFINE_FWK_MODULE(HLTSiPhase2TrackerClusterMultiplicityValueProducer); diff --git a/HLTrigger/JetMET/plugins/MultiplicityValueProducerFromNestedCollection.h b/HLTrigger/JetMET/plugins/HLTMultiplicityValueProducerFromNestedCollection.h similarity index 65% rename from HLTrigger/JetMET/plugins/MultiplicityValueProducerFromNestedCollection.h rename to HLTrigger/JetMET/plugins/HLTMultiplicityValueProducerFromNestedCollection.h index a637852a1f6c5..36d55ab237c8c 100644 --- a/HLTrigger/JetMET/plugins/MultiplicityValueProducerFromNestedCollection.h +++ b/HLTrigger/JetMET/plugins/HLTMultiplicityValueProducerFromNestedCollection.h @@ -1,5 +1,5 @@ -#ifndef HLTrigger_JetMET_plugins_MultiplicityValueProducerFromNestedCollection_h -#define HLTrigger_JetMET_plugins_MultiplicityValueProducerFromNestedCollection_h +#ifndef HLTrigger_JetMET_plugins_HLTMultiplicityValueProducerFromNestedCollection_h +#define HLTrigger_JetMET_plugins_HLTMultiplicityValueProducerFromNestedCollection_h #include @@ -12,10 +12,10 @@ #include "FWCore/MessageLogger/interface/MessageLogger.h" template -class MultiplicityValueProducerFromNestedCollection : public edm::global::EDProducer<> { +class HLTMultiplicityValueProducerFromNestedCollection : public edm::global::EDProducer<> { public: - explicit MultiplicityValueProducerFromNestedCollection(edm::ParameterSet const&); - ~MultiplicityValueProducerFromNestedCollection() override {} + explicit HLTMultiplicityValueProducerFromNestedCollection(edm::ParameterSet const&); + ~HLTMultiplicityValueProducerFromNestedCollection() override {} static void fillDescriptions(edm::ConfigurationDescriptions&); @@ -27,7 +27,7 @@ class MultiplicityValueProducerFromNestedCollection : public edm::global::EDProd }; template -MultiplicityValueProducerFromNestedCollection::MultiplicityValueProducerFromNestedCollection( +HLTMultiplicityValueProducerFromNestedCollection::HLTMultiplicityValueProducerFromNestedCollection( edm::ParameterSet const& iConfig) : src_token_(consumes(iConfig.getParameter("src"))), defaultValue_(iConfig.getParameter("defaultValue")) { @@ -35,9 +35,8 @@ MultiplicityValueProducerFromNestedCollection::MultiplicityV } template -void MultiplicityValueProducerFromNestedCollection::produce(edm::StreamID, - edm::Event& iEvent, - edm::EventSetup const& iSetup) const { +void HLTMultiplicityValueProducerFromNestedCollection::produce( + edm::StreamID, edm::Event& iEvent, edm::EventSetup const& iSetup) const { auto const& objHandle(iEvent.getHandle(src_token_)); if (objHandle.isValid()) { @@ -57,7 +56,7 @@ void MultiplicityValueProducerFromNestedCollection::produce( } template -void MultiplicityValueProducerFromNestedCollection::fillDescriptions( +void HLTMultiplicityValueProducerFromNestedCollection::fillDescriptions( edm::ConfigurationDescriptions& descriptions) { edm::ParameterSetDescription desc; desc.add("src", edm::InputTag(""))->setComment("input collection"); @@ -65,4 +64,4 @@ void MultiplicityValueProducerFromNestedCollection::fillDesc descriptions.addWithDefaultLabel(desc); } -#endif // HLTrigger_JetMET_plugins_MultiplicityValueProducerFromNestedCollection_h +#endif // HLTrigger_JetMET_plugins_HLTMultiplicityValueProducerFromNestedCollection_h diff --git a/HLTrigger/JetMET/plugins/MultiplicityValueProducerFromNestedCollection.cc b/HLTrigger/JetMET/plugins/MultiplicityValueProducerFromNestedCollection.cc deleted file mode 100644 index be6d96d969b8d..0000000000000 --- a/HLTrigger/JetMET/plugins/MultiplicityValueProducerFromNestedCollection.cc +++ /dev/null @@ -1,12 +0,0 @@ -#include "MultiplicityValueProducerFromNestedCollection.h" -#include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h" -#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -typedef MultiplicityValueProducerFromNestedCollection - SiPixelClusterMultiplicityValueProducer; -DEFINE_FWK_MODULE(SiPixelClusterMultiplicityValueProducer); - -typedef MultiplicityValueProducerFromNestedCollection - SiPhase2TrackerClusterMultiplicityValueProducer; -DEFINE_FWK_MODULE(SiPhase2TrackerClusterMultiplicityValueProducer);