From ea1d9335461bbd779701c167dc08a144addcca47 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Sun, 11 Jan 2026 10:54:13 -0600 Subject: [PATCH] Added fillDescriptions to more classes in FWCore Used co-pilot to do initial changes. --- .../test/stubs/DeleteEarlyModules.cc | 35 +++++++++++++ .../Framework/test/stubs/HistoryAnalyzer.cc | 28 +++++++++- .../Framework/test/stubs/TestGetPathStatus.cc | 11 ++++ .../test/stubs/TestSchedulerModule1.cc | 6 +++ .../test/stubs/TestSchedulerModule2.cc | 6 +++ FWCore/Framework/test/stubs/ToyAnalyzers.cc | 5 ++ .../test/stubs/ToyDoubleProducers.cc | 6 +++ .../plugins/AssociationMapAnalyzer.cc | 17 +++++++ .../plugins/AssociationMapProducer.cc | 10 +++- .../plugins/ManyProductProducer.cc | 12 +++++ .../plugins/MaybeUninitializedIntAnalyzer.cc | 9 ++++ .../plugins/MaybeUninitializedIntProducer.cc | 8 +++ .../plugins/MissingDictionaryTestProducer.cc | 9 +++- FWCore/Integration/plugins/PathAnalyzer.cc | 8 ++- .../Integration/plugins/RandomIntProducer.cc | 7 +++ .../Integration/plugins/TestPSetAnalyzer.cc | 36 +++++++++++-- ...stServicesOnNonFrameworkThreadsAnalyzer.cc | 7 +++ .../plugins/TrackOfDSVThingsProducer.cc | 10 ++++ .../plugins/TrackOfThingsProducer.cc | 12 +++-- .../plugins/UseValueExampleAnalyzer.cc | 7 +++ FWCore/Integration/plugins/ViewAnalyzer.cc | 7 +++ FWCore/Integration/plugins/WhatsItAnalyzer.cc | 10 ++-- .../plugins/WhatsItWatcherAnalyzer.cc | 6 +++ .../Integration/test/testPSetAnalyzer_cfg.py | 1 - FWCore/Modules/src/IterateNTimesLooper.cc | 9 ++++ FWCore/Modules/src/NavigateEventsLooper.cc | 10 ++++ .../test/PythonTestProducer.cc | 12 +++++ FWCore/Services/test/StuckAnalyzer.cc | 7 +++ .../SiteLocalConfigServiceCatalogTester.cc | 14 +++++ .../test/SiteLocalConfigServiceTester.cc | 20 +++++++- IOPool/Input/test/GetTriggerNamesAnalyzer.cc | 9 ++++ IOPool/Streamer/test/StreamThingAnalyzer.cc | 51 ++++++++++++++++++- IOPool/Streamer/test/StreamThingAnalyzer.h | 42 --------------- IOPool/Streamer/test/StreamThingProducer.cc | 47 ++++++++++++++++- IOPool/Streamer/test/StreamThingProducer.h | 36 ------------- 35 files changed, 428 insertions(+), 102 deletions(-) delete mode 100644 IOPool/Streamer/test/StreamThingAnalyzer.h delete mode 100644 IOPool/Streamer/test/StreamThingProducer.h diff --git a/FWCore/Framework/test/stubs/DeleteEarlyModules.cc b/FWCore/Framework/test/stubs/DeleteEarlyModules.cc index d623311c81399..6d38431202e62 100644 --- a/FWCore/Framework/test/stubs/DeleteEarlyModules.cc +++ b/FWCore/Framework/test/stubs/DeleteEarlyModules.cc @@ -31,6 +31,11 @@ namespace edmtest { public: explicit DeleteEarlyProducer(edm::ParameterSet const& pset) { produces(); } + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); + } + void beginJob() override { // Needed because DeleteEarly objects may be allocated and deleted in initialization edmtest::DeleteEarly::resetDeleteCount(); @@ -48,6 +53,12 @@ namespace edmtest { m_put = produces>(); } + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("get"); + descriptions.addDefault(desc); + } + void produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const override { auto h = e.getHandle(m_token); e.emplace(m_put, h); @@ -63,6 +74,12 @@ namespace edmtest { DeleteEarlyReader(edm::ParameterSet const& pset) : getToken_(consumes(pset.getUntrackedParameter("tag"))) {} + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked("tag"); + descriptions.addDefault(desc); + } + void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const&) const override { e.get(getToken_); } private: @@ -75,6 +92,12 @@ namespace edmtest { consumes(pset.getUntrackedParameter("tag")); } + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked("tag"); + descriptions.addDefault(desc); + } + void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override {} private: @@ -85,6 +108,12 @@ namespace edmtest { DeleteEarlyRefProdReader(edm::ParameterSet const& pset) : getToken_(consumes(pset.getUntrackedParameter("tag"))) {} + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked("tag"); + descriptions.addDefault(desc); + } + void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const&) const override { e.get(getToken_).get(); } private: @@ -96,6 +125,12 @@ namespace edmtest { DeleteEarlyCheckDeleteAnalyzer(edm::ParameterSet const& pset) : m_expectedValues(pset.getUntrackedParameter>("expectedValues")), m_index(0) {} + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked>("expectedValues"); + descriptions.addDefault(desc); + } + void analyze(edm::Event const&, edm::EventSetup const&) override { if (DeleteEarly::nDeletes() != m_expectedValues.at(m_index)) { throw cms::Exception("DeleteEarlyError") diff --git a/FWCore/Framework/test/stubs/HistoryAnalyzer.cc b/FWCore/Framework/test/stubs/HistoryAnalyzer.cc index d1bccb7940307..8f38a9906acae 100644 --- a/FWCore/Framework/test/stubs/HistoryAnalyzer.cc +++ b/FWCore/Framework/test/stubs/HistoryAnalyzer.cc @@ -33,6 +33,8 @@ namespace edmtest { void analyze(edm::Event const& event, edm::EventSetup const&); void endJob(); + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: typedef std::vector vstring; @@ -54,7 +56,7 @@ namespace edmtest { : expectedSize_(params.getParameter("expectedSize")), eventCount_(0), expectedCount_(params.getParameter("expectedCount")), - expectedSelectEventsInfo_(params.getParameter >("expectedSelectEventsInfo")), + expectedSelectEventsInfo_(params.getParameter>("expectedSelectEventsInfo")), expectedPaths_(params.getParameter("expectedPaths")), expectedEndPaths_(params.getParameter("expectedEndPaths")), expectedModules_(params.getParameter("expectedModules")), @@ -63,6 +65,28 @@ namespace edmtest { expectedDropFromProcPSet_(params.getParameter("expectedDropFromProcPSet")), expectedModulesOnEndPaths_(params.getParameter("expectedModulesOnEndPaths")) {} + void HistoryAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("expectedSize"); + desc.add("expectedCount"); + edm::ParameterSetDescription expectedDesc; + expectedDesc.add>("EndPathPositions"); + expectedDesc.add>("EndPaths"); + expectedDesc.add("InProcessHistory"); + expectedDesc.add>("SelectEvents"); + desc.addVPSet("expectedSelectEventsInfo", expectedDesc); + desc.add>("expectedPaths"); + desc.add>("expectedEndPaths"); + desc.add>("expectedModules"); + desc.add>("expectedDroppedEndPaths"); + desc.add>("expectedDroppedModules"); + desc.add>("expectedDropFromProcPSet"); + edm::ParameterSetDescription modulesOnEndPathsDesc; + modulesOnEndPathsDesc.addWildcard>("*"); + desc.add("expectedModulesOnEndPaths", modulesOnEndPathsDesc); + descriptions.addDefault(desc); + } + void HistoryAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&) { edm::EventSelectionIDVector const& esv = event.eventSelectionIDs(); assert(esv.size() == static_cast(expectedSize_)); @@ -97,7 +121,7 @@ namespace edmtest { assert(paths == expectedPaths_); for (vstring::const_iterator i = paths.begin(), iEnd = paths.end(); i != iEnd; ++i) { - vstring modulesOnPath = proc_pset.getParameter >(*i); + vstring modulesOnPath = proc_pset.getParameter>(*i); assert(!modulesOnPath.empty()); } } diff --git a/FWCore/Framework/test/stubs/TestGetPathStatus.cc b/FWCore/Framework/test/stubs/TestGetPathStatus.cc index 875b58a4024d9..3f9b6deaeb480 100644 --- a/FWCore/Framework/test/stubs/TestGetPathStatus.cc +++ b/FWCore/Framework/test/stubs/TestGetPathStatus.cc @@ -24,6 +24,8 @@ namespace edmtest { void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: std::vector expectedStates_; std::vector expectedIndexes_; @@ -38,6 +40,15 @@ namespace edmtest { tokenPathStatus_(consumes(pset.getParameter("pathStatusTag"))), tokenEndPathStatus_(consumes(pset.getParameter("endPathStatusTag"))) {} + void TestGetPathStatus::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add>("expectedStates"); + desc.add>("expectedIndexes"); + desc.add("pathStatusTag"); + desc.add("endPathStatusTag"); + descriptions.addDefault(desc); + } + void TestGetPathStatus::analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const { auto const& pathStatus = event.get(tokenPathStatus_); diff --git a/FWCore/Framework/test/stubs/TestSchedulerModule1.cc b/FWCore/Framework/test/stubs/TestSchedulerModule1.cc index 2dbccd3c83ec0..af176ecd2fd25 100644 --- a/FWCore/Framework/test/stubs/TestSchedulerModule1.cc +++ b/FWCore/Framework/test/stubs/TestSchedulerModule1.cc @@ -23,6 +23,12 @@ class TestSchedulerModule1 : public global::EDProducer<> { void produce(StreamID, Event& e, EventSetup const&) const final; + static void fillDescriptions(ConfigurationDescriptions& descriptions) { + ParameterSetDescription desc; + desc.add("module_name"); + descriptions.addDefault(desc); + } + private: ParameterSet pset_; }; diff --git a/FWCore/Framework/test/stubs/TestSchedulerModule2.cc b/FWCore/Framework/test/stubs/TestSchedulerModule2.cc index 20837e290243b..ac4ba05ea31ec 100644 --- a/FWCore/Framework/test/stubs/TestSchedulerModule2.cc +++ b/FWCore/Framework/test/stubs/TestSchedulerModule2.cc @@ -23,6 +23,12 @@ namespace edm { void produce(StreamID, Event& e, EventSetup const&) const final; + static void fillDescriptions(ConfigurationDescriptions& descriptions) { + ParameterSetDescription desc; + desc.add("module_name"); + descriptions.addDefault(desc); + } + private: ParameterSet pset_; }; diff --git a/FWCore/Framework/test/stubs/ToyAnalyzers.cc b/FWCore/Framework/test/stubs/ToyAnalyzers.cc index ebd757f6f0918..dfe0147817349 100644 --- a/FWCore/Framework/test/stubs/ToyAnalyzers.cc +++ b/FWCore/Framework/test/stubs/ToyAnalyzers.cc @@ -40,6 +40,11 @@ namespace edmtest { explicit NonAnalyzer(edm::ParameterSet const& /*p*/) {} ~NonAnalyzer() override {} void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const& c) const final; + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); + } }; void NonAnalyzer::analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const {} diff --git a/FWCore/Framework/test/stubs/ToyDoubleProducers.cc b/FWCore/Framework/test/stubs/ToyDoubleProducers.cc index d194cabf65bc2..90a6ce9c6d353 100644 --- a/FWCore/Framework/test/stubs/ToyDoubleProducers.cc +++ b/FWCore/Framework/test/stubs/ToyDoubleProducers.cc @@ -37,6 +37,12 @@ namespace edmtest { explicit ToyDoubleProducer(double d) : value_(d) { produces(); } void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const final; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("dvalue"); + descriptions.addDefault(desc); + } + private: double value_; }; diff --git a/FWCore/Integration/plugins/AssociationMapAnalyzer.cc b/FWCore/Integration/plugins/AssociationMapAnalyzer.cc index 36abd13fc910b..fcfc2ecff0283 100644 --- a/FWCore/Integration/plugins/AssociationMapAnalyzer.cc +++ b/FWCore/Integration/plugins/AssociationMapAnalyzer.cc @@ -33,6 +33,8 @@ namespace edmtest { explicit AssociationMapAnalyzer(edm::ParameterSet const&); void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + edm::EDGetTokenT> inputToken1_; edm::EDGetTokenT> inputToken2_; edm::EDGetTokenT> inputToken1V_; @@ -63,6 +65,21 @@ namespace edmtest { associationMapToken8_ = consumes(pset.getParameter("associationMapTag8")); } + void AssociationMapAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("inputTag1"); + desc.add("inputTag2"); + desc.add("associationMapTag1"); + desc.add("associationMapTag2"); + desc.add("associationMapTag3"); + desc.add("associationMapTag4"); + desc.add("associationMapTag5"); + desc.add("associationMapTag6"); + desc.add("associationMapTag7"); + desc.add("associationMapTag8"); + descriptions.addDefault(desc); + } + void AssociationMapAnalyzer::analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const { edm::Handle> inputCollection1 = event.getHandle(inputToken1_); diff --git a/FWCore/Integration/plugins/AssociationMapProducer.cc b/FWCore/Integration/plugins/AssociationMapProducer.cc index 91b933c6945ff..acddd38d9f299 100644 --- a/FWCore/Integration/plugins/AssociationMapProducer.cc +++ b/FWCore/Integration/plugins/AssociationMapProducer.cc @@ -29,10 +29,11 @@ namespace edmtest { class AssociationMapProducer : public edm::one::EDProducer<> { public: explicit AssociationMapProducer(edm::ParameterSet const&); - ~AssociationMapProducer() override; void produce(edm::Event&, edm::EventSetup const&) override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + typedef edm::AssociationMap, double> > AssocOneToValue; typedef edm::AssociationMap, std::vector > > AssocOneToOne; typedef edm::AssociationMap, std::vector > > AssocOneToMany; @@ -65,7 +66,12 @@ namespace edmtest { produces("twoArg"); } - AssociationMapProducer::~AssociationMapProducer() {} + void AssociationMapProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("inputTag1"); + desc.add("inputTag2"); + descriptions.addDefault(desc); + } void AssociationMapProducer::produce(edm::Event& event, edm::EventSetup const&) { edm::Handle > inputCollection1 = event.getHandle(inputToken1_); diff --git a/FWCore/Integration/plugins/ManyProductProducer.cc b/FWCore/Integration/plugins/ManyProductProducer.cc index 8ef2c9504de03..6616b45a20791 100644 --- a/FWCore/Integration/plugins/ManyProductProducer.cc +++ b/FWCore/Integration/plugins/ManyProductProducer.cc @@ -22,6 +22,12 @@ namespace edmtest { void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const final; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked("nProducts", 1); + descriptions.addDefault(desc); + } + private: unsigned int nProducts_; std::vector instanceNames_; @@ -50,6 +56,12 @@ namespace edmtest { void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const final; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked("nProducts", 1); + descriptions.addDefault(desc); + } + private: unsigned int nProducts_; std::vector tags_; diff --git a/FWCore/Integration/plugins/MaybeUninitializedIntAnalyzer.cc b/FWCore/Integration/plugins/MaybeUninitializedIntAnalyzer.cc index e7f53982bd16d..12c5526c15412 100644 --- a/FWCore/Integration/plugins/MaybeUninitializedIntAnalyzer.cc +++ b/FWCore/Integration/plugins/MaybeUninitializedIntAnalyzer.cc @@ -2,6 +2,8 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/global/EDAnalyzer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/Utilities/interface/InputTag.h" @@ -22,6 +24,13 @@ namespace edmtest { } } + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("value"); + desc.add("source"); + descriptions.addDefault(desc); + } + private: const cms_int32_t value_; const edm::EDGetTokenT token_; diff --git a/FWCore/Integration/plugins/MaybeUninitializedIntProducer.cc b/FWCore/Integration/plugins/MaybeUninitializedIntProducer.cc index 1533d0e598c42..5f5f889a7a3dc 100644 --- a/FWCore/Integration/plugins/MaybeUninitializedIntProducer.cc +++ b/FWCore/Integration/plugins/MaybeUninitializedIntProducer.cc @@ -2,6 +2,8 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/EDPutToken.h" namespace edmtest { @@ -15,6 +17,12 @@ namespace edmtest { event.emplace(token_, value_); } + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("value"); + descriptions.addDefault(desc); + } + private: const cms_int32_t value_; const edm::EDPutTokenT token_; diff --git a/FWCore/Integration/plugins/MissingDictionaryTestProducer.cc b/FWCore/Integration/plugins/MissingDictionaryTestProducer.cc index 163d1c3fc8b91..85ef8a69c3491 100644 --- a/FWCore/Integration/plugins/MissingDictionaryTestProducer.cc +++ b/FWCore/Integration/plugins/MissingDictionaryTestProducer.cc @@ -29,10 +29,11 @@ namespace edmtest { class MissingDictionaryTestProducer : public edm::one::EDProducer<> { public: explicit MissingDictionaryTestProducer(edm::ParameterSet const&); - ~MissingDictionaryTestProducer() override; void produce(edm::Event&, edm::EventSetup const&) override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: edm::EDGetTokenT inputToken1_; edm::EDGetTokenT > inputToken2_; @@ -52,7 +53,11 @@ namespace edmtest { produces >(); } - MissingDictionaryTestProducer::~MissingDictionaryTestProducer() {} + void MissingDictionaryTestProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("inputTag"); + descriptions.addDefault(desc); + } void MissingDictionaryTestProducer::produce(edm::Event& event, edm::EventSetup const&) { edm::Handle h1; diff --git a/FWCore/Integration/plugins/PathAnalyzer.cc b/FWCore/Integration/plugins/PathAnalyzer.cc index 9a5804d651a93..958afa45daff5 100644 --- a/FWCore/Integration/plugins/PathAnalyzer.cc +++ b/FWCore/Integration/plugins/PathAnalyzer.cc @@ -15,12 +15,13 @@ namespace edmtest { class PathAnalyzer : public edm::global::EDAnalyzer<> { public: explicit PathAnalyzer(edm::ParameterSet const&); - ~PathAnalyzer() override; void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override; void beginJob() override; void endJob() override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: void dumpTriggerNamesServiceInfo(char const* where) const; }; // class PathAnalyzer @@ -31,7 +32,10 @@ namespace edmtest { PathAnalyzer::PathAnalyzer(edm::ParameterSet const&) {} - PathAnalyzer::~PathAnalyzer() {} + void PathAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); + } void PathAnalyzer::analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const { dumpTriggerNamesServiceInfo("analyze"); diff --git a/FWCore/Integration/plugins/RandomIntProducer.cc b/FWCore/Integration/plugins/RandomIntProducer.cc index 9d84aff9e6371..e9fbab7a48f80 100644 --- a/FWCore/Integration/plugins/RandomIntProducer.cc +++ b/FWCore/Integration/plugins/RandomIntProducer.cc @@ -22,6 +22,8 @@ namespace edmtest { void beginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) final; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: edm::EDPutTokenT const evToken_; edm::EDPutTokenT const lumiToken_; @@ -30,6 +32,11 @@ namespace edmtest { : evToken_{produces()}, lumiToken_{produces("lumi")} {} + void RandomIntProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); + } + void RandomIntProducer::produce(edm::Event& iEvent, edm::EventSetup const&) { edm::Service gen; iEvent.emplace(evToken_, CLHEP::RandFlat::shootInt(&gen->getEngine(iEvent.streamID()), 10)); diff --git a/FWCore/Integration/plugins/TestPSetAnalyzer.cc b/FWCore/Integration/plugins/TestPSetAnalyzer.cc index 5d768efe5284d..63ea924dc45ad 100644 --- a/FWCore/Integration/plugins/TestPSetAnalyzer.cc +++ b/FWCore/Integration/plugins/TestPSetAnalyzer.cc @@ -14,6 +14,8 @@ #include "FWCore/Framework/interface/global/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" // system include files #include @@ -27,6 +29,8 @@ class TestPSetAnalyzer : public edm::global::EDAnalyzer<> { public: explicit TestPSetAnalyzer(edm::ParameterSet const&); + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const final; @@ -66,23 +70,23 @@ class TestPSetAnalyzer : public edm::global::EDAnalyzer<> { // TestPSetAnalyzer::TestPSetAnalyzer(edm::ParameterSet const& iConfig) { testLumi_ = iConfig.getParameter("testLumi"); - testVLumi_ = iConfig.getParameter >("testVLumi"); + testVLumi_ = iConfig.getParameter>("testVLumi"); testLRange_ = iConfig.getParameter("testRange"); - testVLRange_ = iConfig.getParameter >("testVRange"); + testVLRange_ = iConfig.getParameter>("testVRange"); testERange_ = iConfig.getParameter("testERange"); - testVERange_ = iConfig.getParameter >("testVERange"); + testVERange_ = iConfig.getParameter>("testVERange"); testEventID1_ = iConfig.getParameter("testEventID1"); testEventID2_ = iConfig.getParameter("testEventID2"); testEventID3_ = iConfig.getParameter("testEventID3"); testEventID4_ = iConfig.getParameter("testEventID4"); - testVEventID_ = iConfig.getParameter >("testVEventID"); + testVEventID_ = iConfig.getParameter>("testVEventID"); testERange1_ = iConfig.getParameter("testERange1"); testERange2_ = iConfig.getParameter("testERange2"); testERange3_ = iConfig.getParameter("testERange3"); testERange4_ = iConfig.getParameter("testERange4"); testERange5_ = iConfig.getParameter("testERange5"); - testVERange2_ = iConfig.getParameter >("testVERange2"); + testVERange2_ = iConfig.getParameter>("testVERange2"); std::cout << "Lumi PSet test " << testLumi_ << std::endl; std::cout << "LRange PSet test " << testLRange_ << std::endl; @@ -119,6 +123,28 @@ TestPSetAnalyzer::TestPSetAnalyzer(edm::ParameterSet const& iConfig) { } } +void TestPSetAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("testLumi"); + desc.add>("testVLumi"); + desc.add("testRange"); + desc.add>("testVRange"); + desc.add("testERange"); + desc.add>("testVERange"); + desc.add("testEventID1"); + desc.add("testEventID2"); + desc.add("testEventID3"); + desc.add("testEventID4"); + desc.add>("testVEventID"); + desc.add("testERange1"); + desc.add("testERange2"); + desc.add("testERange3"); + desc.add("testERange4"); + desc.add("testERange5"); + desc.add>("testVERange2"); + descriptions.addDefault(desc); +} + // // member functions // diff --git a/FWCore/Integration/plugins/TestServicesOnNonFrameworkThreadsAnalyzer.cc b/FWCore/Integration/plugins/TestServicesOnNonFrameworkThreadsAnalyzer.cc index b5292d417a174..1f78ba946e775 100644 --- a/FWCore/Integration/plugins/TestServicesOnNonFrameworkThreadsAnalyzer.cc +++ b/FWCore/Integration/plugins/TestServicesOnNonFrameworkThreadsAnalyzer.cc @@ -25,6 +25,8 @@ namespace edmtest { void analyze(edm::Event const&, edm::EventSetup const&) final; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: void runOnOtherThread(); void shutdownThread(); @@ -52,6 +54,11 @@ namespace edmtest { m_continueProcessing = true; } + void TestServicesOnNonFrameworkThreadsAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); + } + TestServicesOnNonFrameworkThreadsAnalyzer::~TestServicesOnNonFrameworkThreadsAnalyzer() { if (m_thread) { shutdownThread(); diff --git a/FWCore/Integration/plugins/TrackOfDSVThingsProducer.cc b/FWCore/Integration/plugins/TrackOfDSVThingsProducer.cc index 1a808baa537d5..b0ffa7148884e 100644 --- a/FWCore/Integration/plugins/TrackOfDSVThingsProducer.cc +++ b/FWCore/Integration/plugins/TrackOfDSVThingsProducer.cc @@ -20,6 +20,8 @@ namespace edmtest { void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: void incrementKey(std::vector::const_iterator& key) const; @@ -35,6 +37,14 @@ namespace edmtest { keysToReference_(pset.getParameter>("keysToReference")), nTracks_(pset.getParameter("nTracks")) {} + void TrackOfDSVThingsProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("inputTag"); + desc.add>("keysToReference"); + desc.add("nTracks"); + descriptions.addDefault(desc); + } + void TrackOfDSVThingsProducer::incrementKey(std::vector::const_iterator& key) const { ++key; if (key == keysToReference_.end()) diff --git a/FWCore/Integration/plugins/TrackOfThingsProducer.cc b/FWCore/Integration/plugins/TrackOfThingsProducer.cc index c471add6da94a..27b0c747d5358 100644 --- a/FWCore/Integration/plugins/TrackOfThingsProducer.cc +++ b/FWCore/Integration/plugins/TrackOfThingsProducer.cc @@ -20,10 +20,11 @@ namespace edmtest { class TrackOfThingsProducer : public edm::one::EDProducer<> { public: explicit TrackOfThingsProducer(edm::ParameterSet const&); - ~TrackOfThingsProducer() override; void produce(edm::Event&, edm::EventSetup const&) override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: void incrementKey(std::vector::const_iterator& key) const; @@ -34,12 +35,17 @@ namespace edmtest { TrackOfThingsProducer::TrackOfThingsProducer(edm::ParameterSet const& pset) { inputToken_ = consumes(pset.getParameter("inputTag")); - keysToReference_ = pset.getParameter >("keysToReference"); + keysToReference_ = pset.getParameter>("keysToReference"); produces(); } - TrackOfThingsProducer::~TrackOfThingsProducer() {} + void TrackOfThingsProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("inputTag"); + desc.add>("keysToReference"); + descriptions.addDefault(desc); + } void TrackOfThingsProducer::incrementKey(std::vector::const_iterator& key) const { ++key; diff --git a/FWCore/Integration/plugins/UseValueExampleAnalyzer.cc b/FWCore/Integration/plugins/UseValueExampleAnalyzer.cc index ea89fdaa13049..4d01d02def071 100644 --- a/FWCore/Integration/plugins/UseValueExampleAnalyzer.cc +++ b/FWCore/Integration/plugins/UseValueExampleAnalyzer.cc @@ -38,6 +38,8 @@ class UseValueExampleAnalyzer : public edm::global::EDAnalyzer<> { void analyze(edm::StreamID, const edm::Event&, const edm::EventSetup&) const final; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: // ----------member data --------------------------- }; @@ -61,6 +63,11 @@ UseValueExampleAnalyzer::UseValueExampleAnalyzer(const edm::ParameterSet& /* iCo // member functions // +void UseValueExampleAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); +} + // ------------ method called to produce the data ------------ void UseValueExampleAnalyzer::analyze(edm::StreamID, const edm::Event& /* iEvent */, diff --git a/FWCore/Integration/plugins/ViewAnalyzer.cc b/FWCore/Integration/plugins/ViewAnalyzer.cc index 19ec6972db3d7..60bd7869bfb5e 100644 --- a/FWCore/Integration/plugins/ViewAnalyzer.cc +++ b/FWCore/Integration/plugins/ViewAnalyzer.cc @@ -31,6 +31,8 @@ namespace edmtest { explicit ViewAnalyzer(edm::ParameterSet const& /* no parameters*/); void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const& /* unused */) const override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + template void testProduct(edm::Event const& e, std::string const& moduleLabel) const; @@ -94,6 +96,11 @@ namespace edmtest { mayConsume>(edm::InputTag{"intvecptrvecdoesNotExist"}); } + void ViewAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); + } + template struct tester { static void call(ViewAnalyzer const* va, Event const& e, char const* moduleLabel) { diff --git a/FWCore/Integration/plugins/WhatsItAnalyzer.cc b/FWCore/Integration/plugins/WhatsItAnalyzer.cc index 5ac0f135566ee..3cf0249856bbf 100644 --- a/FWCore/Integration/plugins/WhatsItAnalyzer.cc +++ b/FWCore/Integration/plugins/WhatsItAnalyzer.cc @@ -42,10 +42,11 @@ namespace edmtest { class WhatsItAnalyzer : public edm::one::EDAnalyzer<> { public: explicit WhatsItAnalyzer(const edm::ParameterSet&); - ~WhatsItAnalyzer() override; void analyze(const edm::Event&, const edm::EventSetup&) override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: void getAndTest(edm::EventSetup const&, edm::ESGetToken token, @@ -81,9 +82,10 @@ namespace edmtest { } } - WhatsItAnalyzer::~WhatsItAnalyzer() { - // do anything here that needs to be done at desctruction time - // (e.g. close files, deallocate resources etc.) + void WhatsItAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked>("expectedValues", std::vector()); + descriptions.addDefault(desc); } // diff --git a/FWCore/Integration/plugins/WhatsItWatcherAnalyzer.cc b/FWCore/Integration/plugins/WhatsItWatcherAnalyzer.cc index 9875951f30616..a230d7ef66406 100644 --- a/FWCore/Integration/plugins/WhatsItWatcherAnalyzer.cc +++ b/FWCore/Integration/plugins/WhatsItWatcherAnalyzer.cc @@ -44,6 +44,8 @@ namespace edmtest { void analyze(const edm::Event&, const edm::EventSetup&) override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: // ----------member data --------------------------- void watch1(const GadgetRcd&); @@ -78,6 +80,10 @@ namespace edmtest { // // member functions // + void WhatsItWatcherAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); + } // ------------ method called to produce the data ------------ void WhatsItWatcherAnalyzer::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup) { diff --git a/FWCore/Integration/test/testPSetAnalyzer_cfg.py b/FWCore/Integration/test/testPSetAnalyzer_cfg.py index 5d4051c1518c8..db7310fc8cb3c 100644 --- a/FWCore/Integration/test/testPSetAnalyzer_cfg.py +++ b/FWCore/Integration/test/testPSetAnalyzer_cfg.py @@ -17,7 +17,6 @@ testVRange = cms.VLuminosityBlockRange("1:2-4:MAX","99:99","3:4-5:9"), testERange = cms.EventRange("1:2-4:MAX"), testVERange = cms.VEventRange("1:2-4:MAX","99:99","3:4-5:9","9:9-11:MIN"), - testEvent = cms.LuminosityBlockID("1:2"), testEventID1 = cms.EventID(1, 1, 1000123456789), testEventID2 = cms.EventID(2, 1000123456790), testEventID3 = cms.EventID('3:3:1000123456791'), diff --git a/FWCore/Modules/src/IterateNTimesLooper.cc b/FWCore/Modules/src/IterateNTimesLooper.cc index 2765531ebf7b9..2f50508b20988 100644 --- a/FWCore/Modules/src/IterateNTimesLooper.cc +++ b/FWCore/Modules/src/IterateNTimesLooper.cc @@ -16,6 +16,8 @@ #include "FWCore/Framework/interface/EDLooper.h" #include "FWCore/Framework/interface/LooperFactory.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" namespace edm { @@ -29,6 +31,7 @@ namespace edm { // ---------- const member functions --------------------- // ---------- static member functions -------------------- + static void fillDescriptions(ConfigurationDescriptions& descriptions); // ---------- member functions --------------------------- void startingNewLoop(unsigned int) override; @@ -84,6 +87,12 @@ namespace edm { ++times_; return (times_ < max_) ? kContinue : kStop; } + + void IterateNTimesLooper::fillDescriptions(ConfigurationDescriptions& descriptions) { + ParameterSetDescription desc; + desc.add("nTimes"); + descriptions.addDefault(desc); + } } // namespace edm using edm::IterateNTimesLooper; diff --git a/FWCore/Modules/src/NavigateEventsLooper.cc b/FWCore/Modules/src/NavigateEventsLooper.cc index 779262c01cf57..c41d30601bd09 100644 --- a/FWCore/Modules/src/NavigateEventsLooper.cc +++ b/FWCore/Modules/src/NavigateEventsLooper.cc @@ -21,6 +21,8 @@ turn off fast cloning its configuration. #include "FWCore/Framework/interface/LooperFactory.h" #include "FWCore/Framework/interface/ProcessingController.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include @@ -37,6 +39,8 @@ namespace edm { Status duringLoop(Event const& ev, EventSetup const& es, ProcessingController& pc) override; Status endOfLoop(EventSetup const& es, unsigned int iCounter) override; + static void fillDescriptions(ConfigurationDescriptions& descriptions); + private: int maxLoops_; int countLoops_; @@ -164,6 +168,12 @@ namespace edm { ++countLoops_; return (maxLoops_ < 0 || countLoops_ < maxLoops_) ? kContinue : kStop; } + + void NavigateEventsLooper::fillDescriptions(ConfigurationDescriptions& descriptions) { + ParameterSetDescription desc; + desc.addUntracked("maxLoops", -1); + descriptions.addDefault(desc); + } } // namespace edm using edm::NavigateEventsLooper; diff --git a/FWCore/PythonFramework/test/PythonTestProducer.cc b/FWCore/PythonFramework/test/PythonTestProducer.cc index a9a83a369adec..548001347bc9a 100644 --- a/FWCore/PythonFramework/test/PythonTestProducer.cc +++ b/FWCore/PythonFramework/test/PythonTestProducer.cc @@ -2,6 +2,8 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/EDPutToken.h" @@ -17,6 +19,8 @@ namespace edmtest { void produce(edm::Event& iEvent, edm::EventSetup const&) override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: edm::EDGetTokenT get_; edm::EDPutTokenT put_; @@ -46,6 +50,14 @@ namespace edmtest { } iEvent.emplace(put_, h->value + value_); } + + void PythonTestProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("source"); + desc.add("inputVariable"); + desc.add("outputListVariable"); + descriptions.addDefault(desc); + } } // namespace edmtest //define this as a plug-in diff --git a/FWCore/Services/test/StuckAnalyzer.cc b/FWCore/Services/test/StuckAnalyzer.cc index 2a7c5569ddeea..c3fa6bd7738a1 100644 --- a/FWCore/Services/test/StuckAnalyzer.cc +++ b/FWCore/Services/test/StuckAnalyzer.cc @@ -16,6 +16,8 @@ #include "FWCore/Framework/interface/global/EDAnalyzer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" class StuckAnalyzer : public edm::global::EDAnalyzer<> { public: @@ -25,6 +27,11 @@ class StuckAnalyzer : public edm::global::EDAnalyzer<> { while (true) { }; } + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); + } }; DEFINE_FWK_MODULE(StuckAnalyzer); diff --git a/FWStorage/Services/test/SiteLocalConfigServiceCatalogTester.cc b/FWStorage/Services/test/SiteLocalConfigServiceCatalogTester.cc index 4820660fff474..0d27993f81313 100644 --- a/FWStorage/Services/test/SiteLocalConfigServiceCatalogTester.cc +++ b/FWStorage/Services/test/SiteLocalConfigServiceCatalogTester.cc @@ -1,5 +1,7 @@ #include "FWCore/Framework/interface/global/EDAnalyzer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Catalog/interface/SiteLocalConfig.h" #include "FWCore/Catalog/interface/InputFileCatalog.h" @@ -14,6 +16,8 @@ namespace edmtest { SiteLocalConfigServiceCatalogTester(const edm::ParameterSet& iPSet); void analyze(edm::StreamID, const edm::Event&, const edm::EventSetup&) const override {} + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); }; SiteLocalConfigServiceCatalogTester::SiteLocalConfigServiceCatalogTester(const edm::ParameterSet& iPSet) { @@ -39,6 +43,16 @@ namespace edmtest { } } } + + void SiteLocalConfigServiceCatalogTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + edm::ParameterSetDescription fileDesc; + fileDesc.addUntracked("file"); + fileDesc.addUntracked("catalogIndex"); + fileDesc.addUntracked("expectResult"); + desc.addVPSetUntracked("files", fileDesc, {}); + descriptions.addDefault(desc); + } } // namespace edmtest using SiteLocalConfigServiceCatalogTester = edmtest::SiteLocalConfigServiceCatalogTester; diff --git a/FWStorage/Services/test/SiteLocalConfigServiceTester.cc b/FWStorage/Services/test/SiteLocalConfigServiceTester.cc index f64c2f39af427..e7a231cb263bc 100644 --- a/FWStorage/Services/test/SiteLocalConfigServiceTester.cc +++ b/FWStorage/Services/test/SiteLocalConfigServiceTester.cc @@ -12,6 +12,8 @@ #include "FWCore/Framework/interface/global/EDAnalyzer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Catalog/interface/SiteLocalConfig.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -26,6 +28,8 @@ namespace edmtest { void analyze(edm::StreamID, const edm::Event&, const edm::EventSetup&) const override; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: std::string m_cacheHint; std::string m_readHint; @@ -46,7 +50,7 @@ SiteLocalConfigServiceTester::SiteLocalConfigServiceTester(const edm::ParameterS m_readHint(iPSet.getUntrackedParameter("sourceReadHint")), m_tempDir(iPSet.getUntrackedParameter("sourceTempDir")), m_ttreeCacheSize(iPSet.getUntrackedParameter("sourceTTreeCacheSize")), - m_nativeProtocols(iPSet.getUntrackedParameter >("sourceNativeProtocols")), + m_nativeProtocols(iPSet.getUntrackedParameter>("sourceNativeProtocols")), m_valuesSet(iPSet.getUntrackedParameter("sourceValuesSet", true)), m_expectedUseLocalConnectString(iPSet.getUntrackedParameter("expectedUseLocalConnectString")), m_expectedLocalConnectPrefix(iPSet.getUntrackedParameter("expectedLocalConnectPrefix")), @@ -137,4 +141,18 @@ void SiteLocalConfigServiceTester::analyze(edm::StreamID, const edm::Event&, con } } +void SiteLocalConfigServiceTester::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.addUntracked("sourceCacheHint"); + desc.addUntracked("sourceReadHint"); + desc.addUntracked("sourceTempDir"); + desc.addUntracked("sourceTTreeCacheSize"); + desc.addUntracked>("sourceNativeProtocols"); + desc.addUntracked("sourceValuesSet", true); + desc.addUntracked("expectedUseLocalConnectString"); + desc.addUntracked("expectedLocalConnectPrefix"); + desc.addUntracked("expectedLocalConnectSuffix"); + descriptions.addDefault(desc); +} + DEFINE_FWK_MODULE(SiteLocalConfigServiceTester); diff --git a/IOPool/Input/test/GetTriggerNamesAnalyzer.cc b/IOPool/Input/test/GetTriggerNamesAnalyzer.cc index ad092f0c09a99..e8d234539288b 100644 --- a/IOPool/Input/test/GetTriggerNamesAnalyzer.cc +++ b/IOPool/Input/test/GetTriggerNamesAnalyzer.cc @@ -16,6 +16,8 @@ #include "FWCore/Framework/interface/global/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Utilities/interface/Exception.h" @@ -29,6 +31,8 @@ namespace edmtest { void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const final; + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + private: edm::EDGetTokenT const trToken_; }; @@ -58,4 +62,9 @@ void GetTriggerNamesAnalyzer::analyze(edm::StreamID, edm::Event const& iEvent, e } } +void GetTriggerNamesAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + descriptions.addDefault(desc); +} + DEFINE_FWK_MODULE(edmtest::GetTriggerNamesAnalyzer); diff --git a/IOPool/Streamer/test/StreamThingAnalyzer.cc b/IOPool/Streamer/test/StreamThingAnalyzer.cc index 93bb56384df8d..c0809f7d38223 100644 --- a/IOPool/Streamer/test/StreamThingAnalyzer.cc +++ b/IOPool/Streamer/test/StreamThingAnalyzer.cc @@ -1,8 +1,9 @@ #include -#include "IOPool/Streamer/test/StreamThingAnalyzer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/ModuleLabelMatch.h" @@ -15,6 +16,46 @@ #include #include +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/GetterOfProducts.h" + +#if 1 +#include "DataFormats/TestObjects/interface/StreamTestThing.h" +typedef edmtestprod::StreamTestThing WriteThis; +#else +#include "FWCore/Integration/interface/IntArray.h" +typedef edmtestprod::IntArray WriteThis; +#endif + +#include +#include + +namespace edmtest_thing { + + class StreamThingAnalyzer : public edm::one::EDAnalyzer<> { + public: + explicit StreamThingAnalyzer(edm::ParameterSet const&); + + ~StreamThingAnalyzer() override; + + void endJob() override; + + void analyze(edm::Event const& e, edm::EventSetup const& c) override; + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + + private: + std::string name_; + int total_; + std::ofstream out_; + std::string inChecksumFile_; + std::string outChecksumFile_; + int cnt_; + edm::GetterOfProducts getterUsingLabel_; + }; +} // namespace edmtest_thing + using namespace edmtestprod; namespace edmtest_thing { @@ -77,6 +118,14 @@ namespace edmtest_thing { ++cnt_; } + + void StreamThingAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("product_to_get"); + desc.addUntracked("inChecksum", ""); + desc.addUntracked("outChecksum", ""); + descriptions.addDefault(desc); + } } // namespace edmtest_thing using edmtest_thing::StreamThingAnalyzer; diff --git a/IOPool/Streamer/test/StreamThingAnalyzer.h b/IOPool/Streamer/test/StreamThingAnalyzer.h deleted file mode 100644 index 30af1f2c5e4b7..0000000000000 --- a/IOPool/Streamer/test/StreamThingAnalyzer.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef IOPool_Streamer_StreamThingAnalyzer_h -#define IOPool_Streamer_StreamThingAnalyzer_h - -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include "FWCore/Framework/interface/GetterOfProducts.h" - -#if 1 -#include "DataFormats/TestObjects/interface/StreamTestThing.h" -typedef edmtestprod::StreamTestThing WriteThis; -#else -#include "FWCore/Integration/interface/IntArray.h" -typedef edmtestprod::IntArray WriteThis; -#endif - -#include -#include - -namespace edmtest_thing { - - class StreamThingAnalyzer : public edm::one::EDAnalyzer<> { - public: - explicit StreamThingAnalyzer(edm::ParameterSet const&); - - ~StreamThingAnalyzer() override; - - void endJob() override; - - void analyze(edm::Event const& e, edm::EventSetup const& c) override; - - private: - std::string name_; - int total_; - std::ofstream out_; - std::string inChecksumFile_; - std::string outChecksumFile_; - int cnt_; - edm::GetterOfProducts getterUsingLabel_; - }; -} // namespace edmtest_thing - -#endif diff --git a/IOPool/Streamer/test/StreamThingProducer.cc b/IOPool/Streamer/test/StreamThingProducer.cc index a6e5a67f44cc7..e031dadb83fb6 100644 --- a/IOPool/Streamer/test/StreamThingProducer.cc +++ b/IOPool/Streamer/test/StreamThingProducer.cc @@ -1,4 +1,11 @@ +/** \class ThingProducer + * + * \version 1st Version Apr. 6, 2005 + + * + ************************************************************/ + #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -11,11 +18,39 @@ typedef edmtestprod::StreamTestThing WriteThis; typedef edmtestprod::IntArray WriteThis; #endif -#include "IOPool/Streamer/test/StreamThingProducer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" +#include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include +#include "FWCore/Framework/interface/Frameworkfwd.h" +#include "FWCore/Framework/interface/global/EDProducer.h" + +#include +#include + +namespace edmtest_thing { + class StreamThingProducer : public edm::global::EDProducer<> { + public: + explicit StreamThingProducer(edm::ParameterSet const& ps); + + ~StreamThingProducer() override; + + void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override; + + static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); + + private: + int size_; + int inst_count_; + std::vector names_; + int start_count_; + + bool apply_bit_mask_; + unsigned int bit_mask_; + }; +} // namespace edmtest_thing using namespace edmtestprod; namespace edmtest_thing { @@ -63,6 +98,16 @@ namespace edmtest_thing { //e.put(std::make_unique()); //e.put(std::make_unique()); } + + void StreamThingProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { + edm::ParameterSetDescription desc; + desc.add("array_size"); + desc.add("instance_count"); + desc.addUntracked("start_count", 0); + desc.addUntracked("apply_bit_mask", false); + desc.addUntracked("bit_mask", 0); + descriptions.addDefault(desc); + } } // namespace edmtest_thing using edmtest_thing::StreamThingProducer; diff --git a/IOPool/Streamer/test/StreamThingProducer.h b/IOPool/Streamer/test/StreamThingProducer.h deleted file mode 100644 index fc5d334859db3..0000000000000 --- a/IOPool/Streamer/test/StreamThingProducer.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef IOPool_Streamer_StreamThingProducer_h -#define IOPool_Streamer_StreamThingProducer_h - -/** \class ThingProducer - * - * \version 1st Version Apr. 6, 2005 - - * - ************************************************************/ - -#include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/global/EDProducer.h" - -#include -#include - -namespace edmtest_thing { - class StreamThingProducer : public edm::global::EDProducer<> { - public: - explicit StreamThingProducer(edm::ParameterSet const& ps); - - ~StreamThingProducer() override; - - void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override; - - private: - int size_; - int inst_count_; - std::vector names_; - int start_count_; - - bool apply_bit_mask_; - unsigned int bit_mask_; - }; -} // namespace edmtest_thing -#endif