From 3addb167d61c3fd98a3c2293db2ba42c0c77f918 Mon Sep 17 00:00:00 2001 From: mmusich Date: Wed, 20 Apr 2022 16:37:15 +0200 Subject: [PATCH 1/6] get rid of residual deprecation warnings in DataFormats/SiStripCommon --- .../test/plugins/examples_SiStripFecKey.cc | 43 ++++++++++--- .../test/plugins/examples_SiStripFecKey.h | 27 -------- .../SiStripCommon/test/plugins/modules.cc | 28 -------- .../test/plugins/perf_SiStripFecKey.cc | 64 +++++++++++++++++-- .../test/plugins/perf_SiStripFecKey.h | 53 --------------- .../plugins/test_SiStripEnumsAndStrings.cc | 29 +++++++-- .../plugins/test_SiStripEnumsAndStrings.h | 22 ------- .../test/plugins/test_SiStripFecKey.cc | 32 +++++++++- .../test/plugins/test_SiStripFecKey.h | 31 --------- .../test/plugins/test_SiStripFedKey.cc | 33 ++++++++-- .../test/plugins/test_SiStripFedKey.h | 22 ------- .../test/plugins/test_SiStripHistoTitle.cc | 37 ++++++++--- .../test/plugins/test_SiStripHistoTitle.h | 22 ------- .../test/plugins/test_SiStripKey.cc | 44 ++++++++++--- .../test/plugins/test_SiStripKey.h | 29 --------- .../test/plugins/test_SiStripNullKey.cc | 33 ++++++++-- .../test/plugins/test_SiStripNullKey.h | 22 ------- .../test/plugins/test_Template.cc | 29 +++++++-- .../test/plugins/test_Template.h | 24 ------- 19 files changed, 285 insertions(+), 339 deletions(-) delete mode 100644 DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.h delete mode 100644 DataFormats/SiStripCommon/test/plugins/modules.cc delete mode 100644 DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.h delete mode 100644 DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.h delete mode 100644 DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.h delete mode 100644 DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.h delete mode 100644 DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.h delete mode 100644 DataFormats/SiStripCommon/test/plugins/test_SiStripKey.h delete mode 100644 DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.h delete mode 100644 DataFormats/SiStripCommon/test/plugins/test_Template.h diff --git a/DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.cc b/DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.cc index 9a1db31d05c77..8724db100d4fd 100644 --- a/DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.cc +++ b/DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.cc @@ -1,16 +1,38 @@ - -#include "DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.h" -#include "FWCore/Framework/interface/Event.h" -#include "DataFormats/SiStripCommon/interface/SiStripFecKey.h" -#include "DataFormats/SiStripCommon/interface/Constants.h" -#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include +// system includes +#include +#include #include +#include #include #include #include -#include +#include + +// user includes +#include "DataFormats/SiStripCommon/interface/Constants.h" +#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" +#include "DataFormats/SiStripCommon/interface/SiStripFecKey.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" + +/** + @class examplesSiStripFecKey + @author R.Bainbridge + @brief Simple class that tests SiStripFecKey. +*/ + +class examplesSiStripFecKey : public edm::one::EDAnalyzer<> { +public: + examplesSiStripFecKey(const edm::ParameterSet&); + ~examplesSiStripFecKey(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); + +private: + void buildKeys(std::vector&); +}; using namespace sistrip; @@ -92,3 +114,6 @@ void examplesSiStripFecKey::analyze(const edm::Event& event, const edm::EventSet LogTrace(mlDqmCommon_) << "[SiStripFecKey::" << __func__ << "]" << " Analyzing run/event " << event.id().run() << "/" << event.id().event(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(examplesSiStripFecKey); diff --git a/DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.h b/DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.h deleted file mode 100644 index 3cd32bfef5fa0..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.h +++ /dev/null @@ -1,27 +0,0 @@ - -#ifndef DataFormats_SiStripCommon_examplesSiStripFecKey_H -#define DataFormats_SiStripCommon_examplesSiStripFecKey_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include -#include - -/** - @class examplesSiStripFecKey - @author R.Bainbridge - @brief Simple class that tests SiStripFecKey. -*/ -class examplesSiStripFecKey : public edm::EDAnalyzer { -public: - examplesSiStripFecKey(const edm::ParameterSet&); - ~examplesSiStripFecKey(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } - -private: - void buildKeys(std::vector&); -}; - -#endif // DataFormats_SiStripCommon_examplesSiStripFecKey_H diff --git a/DataFormats/SiStripCommon/test/plugins/modules.cc b/DataFormats/SiStripCommon/test/plugins/modules.cc deleted file mode 100644 index 7198f9847a35c..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/modules.cc +++ /dev/null @@ -1,28 +0,0 @@ -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.h" -DEFINE_FWK_MODULE(testSiStripFecKey); - -#include "DataFormats/SiStripCommon/test/plugins/examples_SiStripFecKey.h" -DEFINE_FWK_MODULE(examplesSiStripFecKey); - -#include "DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.h" -DEFINE_FWK_MODULE(perfSiStripFecKey); - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.h" -DEFINE_FWK_MODULE(testSiStripFedKey); - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.h" -DEFINE_FWK_MODULE(testSiStripNullKey); - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripKey.h" -DEFINE_FWK_MODULE(testSiStripKey); - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.h" -DEFINE_FWK_MODULE(testSiStripEnumsAndStrings); - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.h" -DEFINE_FWK_MODULE(testSiStripHistoTitle); - -#include "DataFormats/SiStripCommon/test/plugins/test_Template.h" -DEFINE_FWK_MODULE(test_Template); diff --git a/DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.cc b/DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.cc index 89f4542d20bb0..3c67857f2b142 100644 --- a/DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.cc +++ b/DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.cc @@ -1,10 +1,6 @@ - -#include "DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DataFormats/SiStripCommon/interface/Constants.h" -#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" +// system includes +#include +#include #include #include #include @@ -12,6 +8,57 @@ #include #include +// user includes +#include "DataFormats/SiStripCommon/interface/Constants.h" +#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" +#include "DataFormats/SiStripCommon/interface/SiStripFecKey.h" +#include "DataFormats/SiStripCommon/interface/SiStripKey.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +/** + @class perfSiStripFecKey + @author R.Bainbridge + @brief Simple class that tests SiStripFecKey. +*/ +class perfSiStripFecKey : public edm::one::EDAnalyzer<> { +public: + perfSiStripFecKey(const edm::ParameterSet&); + ~perfSiStripFecKey(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); + +private: + class Value { + public: + uint16_t crate_, slot_, ring_, ccu_, module_, lld_, i2c_; + Value() : crate_(0), slot_(0), ring_(0), ccu_(0), module_(0), lld_(0), i2c_(0) { ; } + Value(uint16_t crate, uint16_t slot, uint16_t ring, uint16_t ccu, uint16_t module, uint16_t lld, uint16_t i2c) + : crate_(crate), slot_(slot), ring_(ring), ccu_(ccu), module_(module), lld_(lld), i2c_(i2c) { + ; + } + }; + + void build(std::vector&, + std::vector&, + std::vector&, + std::vector&, + std::vector&); + + void build(const std::vector&) const; + void build(const std::vector&) const; + void build(const std::vector&) const; + void build(const std::vector&) const; + void build(const std::vector&) const; + + void test(const std::vector&) const; + + uint32_t loops_; +}; + using namespace sistrip; // ----------------------------------------------------------------------------- @@ -205,3 +252,6 @@ void perfSiStripFecKey::build(std::vector& values, // std::sort( derived.begin(), derived.end() ); // std::sort( base.begin(), base.end() ); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(perfSiStripFecKey); diff --git a/DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.h b/DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.h deleted file mode 100644 index e75e89dd53511..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.h +++ /dev/null @@ -1,53 +0,0 @@ - -#ifndef DataFormats_SiStripCommon_perfSiStripFecKey_H -#define DataFormats_SiStripCommon_perfSiStripFecKey_H - -#include "DataFormats/SiStripCommon/interface/SiStripFecKey.h" -#include "DataFormats/SiStripCommon/interface/SiStripKey.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include -#include - -/** - @class perfSiStripFecKey - @author R.Bainbridge - @brief Simple class that tests SiStripFecKey. -*/ -class perfSiStripFecKey : public edm::EDAnalyzer { -public: - perfSiStripFecKey(const edm::ParameterSet&); - ~perfSiStripFecKey(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } - -private: - class Value { - public: - uint16_t crate_, slot_, ring_, ccu_, module_, lld_, i2c_; - Value() : crate_(0), slot_(0), ring_(0), ccu_(0), module_(0), lld_(0), i2c_(0) { ; } - Value(uint16_t crate, uint16_t slot, uint16_t ring, uint16_t ccu, uint16_t module, uint16_t lld, uint16_t i2c) - : crate_(crate), slot_(slot), ring_(ring), ccu_(ccu), module_(module), lld_(lld), i2c_(i2c) { - ; - } - }; - - void build(std::vector&, - std::vector&, - std::vector&, - std::vector&, - std::vector&); - - void build(const std::vector&) const; - void build(const std::vector&) const; - void build(const std::vector&) const; - void build(const std::vector&) const; - void build(const std::vector&) const; - - void test(const std::vector&) const; - - uint32_t loops_; -}; - -#endif // DataFormats_SiStripCommon_perfSiStripFecKey_H diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.cc b/DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.cc index 4a6897c90463b..b43be846c5833 100644 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.cc +++ b/DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.cc @@ -1,15 +1,31 @@ - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.h" -#include "FWCore/Framework/interface/Event.h" -#include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h" +// user includes #include "DataFormats/SiStripCommon/interface/SiStripConstants.h" +#include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include + +// system includes #include +#include #include #include #include +/** + @class testSiStripEnumsAndStrings + @author R.Bainbridge + @brief Simple class that tests SiStripEnumsAndStrings. +*/ +class testSiStripEnumsAndStrings : public edm::one::EDAnalyzer<> { +public: + testSiStripEnumsAndStrings(const edm::ParameterSet&); + ~testSiStripEnumsAndStrings(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); +}; + using namespace sistrip; // ----------------------------------------------------------------------------- @@ -216,3 +232,6 @@ void testSiStripEnumsAndStrings::analyze(const edm::Event& event, const edm::Eve LogTrace(mlDqmCommon_) << "[SiStripEnumsAndStrings::" << __func__ << "]" << " Analyzing run/event " << event.id().run() << "/" << event.id().event(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(testSiStripEnumsAndStrings); diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.h b/DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.h deleted file mode 100644 index 84a2329a70a63..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripEnumsAndStrings.h +++ /dev/null @@ -1,22 +0,0 @@ - -#ifndef DataFormats_SiStripCommon_testSiStripEnumsAndStrings_H -#define DataFormats_SiStripCommon_testSiStripEnumsAndStrings_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -/** - @class testSiStripEnumsAndStrings - @author R.Bainbridge - @brief Simple class that tests SiStripEnumsAndStrings. -*/ -class testSiStripEnumsAndStrings : public edm::EDAnalyzer { -public: - testSiStripEnumsAndStrings(const edm::ParameterSet&); - ~testSiStripEnumsAndStrings(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } -}; - -#endif // DataFormats_SiStripCommon_testSiStripEnumsAndStrings_H diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.cc b/DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.cc index 9b751de8acd33..864fec51f6fed 100644 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.cc +++ b/DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.cc @@ -1,12 +1,37 @@ +// system includes +#include -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.h" +// user includes +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "DataFormats/SiStripCommon/interface/SiStripConstants.h" #include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h" #include "DataFormats/SiStripCommon/interface/SiStripFecKey.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include + +/** + @class testSiStripFecKey + @author R.Bainbridge + @brief Simple class that tests SiStripFecKey. +*/ +class testSiStripFecKey : public edm::one::EDAnalyzer<> { +public: + testSiStripFecKey(const edm::ParameterSet&); + ~testSiStripFecKey(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); + +private: + const uint32_t crate_; + const uint32_t slot_; + const uint32_t ring_; + const uint32_t ccu_; + const uint32_t module_; + const uint32_t lld_; + const uint32_t i2c_; +}; using namespace sistrip; @@ -170,3 +195,6 @@ void testSiStripFecKey::analyze(const edm::Event& event, const edm::EventSetup& LogTrace(mlDqmCommon_) << "[SiStripFecKey::" << __func__ << "]" << " Analyzing run/event " << event.id().run() << "/" << event.id().event(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(testSiStripFecKey); diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.h b/DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.h deleted file mode 100644 index 71535eb8d9e8a..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.h +++ /dev/null @@ -1,31 +0,0 @@ - -#ifndef DataFormats_SiStripCommon_testSiStripFecKey_H -#define DataFormats_SiStripCommon_testSiStripFecKey_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -/** - @class testSiStripFecKey - @author R.Bainbridge - @brief Simple class that tests SiStripFecKey. -*/ -class testSiStripFecKey : public edm::EDAnalyzer { -public: - testSiStripFecKey(const edm::ParameterSet&); - ~testSiStripFecKey(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } - -private: - uint32_t crate_; - uint32_t slot_; - uint32_t ring_; - uint32_t ccu_; - uint32_t module_; - uint32_t lld_; - uint32_t i2c_; -}; - -#endif // DataFormats_SiStripCommon_testSiStripFecKey_H diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.cc b/DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.cc index 37853f170e8dc..ba5dfcadf497a 100644 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.cc +++ b/DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.cc @@ -1,16 +1,32 @@ - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.h" -#include "FWCore/Framework/interface/Event.h" -#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" -#include "DataFormats/SiStripCommon/interface/Constants.h" -#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" +// system includes #include #include #include #include #include +// user includes +#include "DataFormats/SiStripCommon/interface/Constants.h" +#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" +#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" + +/** + @class testSiStripFedKey + @author R.Bainbridge + @brief Simple class that tests SiStripFedKey. +*/ +class testSiStripFedKey : public edm::one::EDAnalyzer<> { +public: + testSiStripFedKey(const edm::ParameterSet&); + ~testSiStripFedKey(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); +}; + using namespace sistrip; // ----------------------------------------------------------------------------- @@ -165,3 +181,6 @@ void testSiStripFedKey::analyze(const edm::Event& event, const edm::EventSetup& LogTrace(mlDqmCommon_) << "[SiStripFedKey::" << __func__ << "]" << " Analyzing run/event " << event.id().run() << "/" << event.id().event(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(testSiStripFedKey); diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.h b/DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.h deleted file mode 100644 index bc6597b5974be..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripFedKey.h +++ /dev/null @@ -1,22 +0,0 @@ - -#ifndef DataFormats_SiStripCommon_testSiStripFedKey_H -#define DataFormats_SiStripCommon_testSiStripFedKey_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -/** - @class testSiStripFedKey - @author R.Bainbridge - @brief Simple class that tests SiStripFedKey. -*/ -class testSiStripFedKey : public edm::EDAnalyzer { -public: - testSiStripFedKey(const edm::ParameterSet&); - ~testSiStripFedKey(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } -}; - -#endif // DataFormats_SiStripCommon_testSiStripFedKey_H diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.cc b/DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.cc index c00ad7c1bee9f..6d7c2e566a5ff 100644 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.cc +++ b/DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.cc @@ -1,18 +1,34 @@ - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.h" -#include "FWCore/Framework/interface/Event.h" -#include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h" -#include "DataFormats/SiStripCommon/interface/SiStripHistoTitle.h" -#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" -#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" -#include "DataFormats/SiStripCommon/interface/Constants.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" +// system includes #include #include #include #include #include +// user includes +#include "DataFormats/SiStripCommon/interface/Constants.h" +#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" +#include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h" +#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" +#include "DataFormats/SiStripCommon/interface/SiStripHistoTitle.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" + +/** + @class testSiStripHistoTitle + @author R.Bainbridge + @brief Simple class that tests SiStripHistoTitle. +*/ +class testSiStripHistoTitle : public edm::one::EDAnalyzer<> { +public: + testSiStripHistoTitle(const edm::ParameterSet&); + ~testSiStripHistoTitle(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); +}; + using namespace sistrip; // ----------------------------------------------------------------------------- @@ -205,3 +221,6 @@ void testSiStripHistoTitle::analyze(const edm::Event& event, const edm::EventSet LogTrace(mlDqmCommon_) << "[SiStripHistoTitle::" << __func__ << "]" << " Analyzing run/event " << event.id().run() << "/" << event.id().event(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(testSiStripHistoTitle); diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.h b/DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.h deleted file mode 100644 index 4378abdc46797..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripHistoTitle.h +++ /dev/null @@ -1,22 +0,0 @@ - -#ifndef DataFormats_SiStripCommon_testSiStripHistoTitle_H -#define DataFormats_SiStripCommon_testSiStripHistoTitle_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -/** - @class testSiStripHistoTitle - @author R.Bainbridge - @brief Simple class that tests SiStripHistoTitle. -*/ -class testSiStripHistoTitle : public edm::EDAnalyzer { -public: - testSiStripHistoTitle(const edm::ParameterSet&); - ~testSiStripHistoTitle(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } -}; - -#endif // DataFormats_SiStripCommon_testSiStripHistoTitle_H diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripKey.cc b/DataFormats/SiStripCommon/test/plugins/test_SiStripKey.cc index 58f22bc81cc93..67f291375ffc8 100644 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripKey.cc +++ b/DataFormats/SiStripCommon/test/plugins/test_SiStripKey.cc @@ -1,17 +1,40 @@ - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripKey.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" -#include "DataFormats/SiStripCommon/interface/SiStripFecKey.h" -#include "DataFormats/SiStripCommon/interface/SiStripDetKey.h" -#include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" +// system includes +#include #include #include #include #include +// user includes +#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" +#include "DataFormats/SiStripCommon/interface/SiStripDetKey.h" +#include "DataFormats/SiStripCommon/interface/SiStripEnumsAndStrings.h" +#include "DataFormats/SiStripCommon/interface/SiStripFecKey.h" +#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +/** + @class testSiStripKey + @author R.Bainbridge + @brief Simple class that tests SiStripKey. +*/ +class testSiStripKey : public edm::one::EDAnalyzer<> { +public: + testSiStripKey(const edm::ParameterSet&); + ~testSiStripKey(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); + +private: + sistrip::KeyType keyType_; + uint32_t key_; + std::string path_; +}; + using namespace sistrip; // ----------------------------------------------------------------------------- @@ -134,3 +157,6 @@ void testSiStripKey::analyze(const edm::Event& event, const edm::EventSetup& set LogTrace(mlDqmCommon_) << "[SiStripKey::" << __func__ << "]" << " Analyzing run/event " << event.id().run() << "/" << event.id().event(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(testSiStripKey); diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripKey.h b/DataFormats/SiStripCommon/test/plugins/test_SiStripKey.h deleted file mode 100644 index b032546f82f2c..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripKey.h +++ /dev/null @@ -1,29 +0,0 @@ - -#ifndef DataFormats_SiStripCommon_testSiStripKey_H -#define DataFormats_SiStripCommon_testSiStripKey_H - -#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include - -/** - @class testSiStripKey - @author R.Bainbridge - @brief Simple class that tests SiStripKey. -*/ -class testSiStripKey : public edm::EDAnalyzer { -public: - testSiStripKey(const edm::ParameterSet&); - ~testSiStripKey(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } - -private: - sistrip::KeyType keyType_; - uint32_t key_; - std::string path_; -}; - -#endif // DataFormats_SiStripCommon_testSiStripKey_H diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.cc b/DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.cc index 71701e1a88b6e..a0fb426392103 100644 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.cc +++ b/DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.cc @@ -1,15 +1,31 @@ - -#include "DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.h" -#include "FWCore/Framework/interface/Event.h" -#include "DataFormats/SiStripCommon/interface/SiStripNullKey.h" -#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" -#include +// system includes #include +#include #include #include #include +// user includes +#include "DataFormats/SiStripCommon/interface/SiStripConstants.h" +#include "DataFormats/SiStripCommon/interface/SiStripNullKey.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" + +/** + @class testSiStripNullKey + @author R.Bainbridge + @brief Simple class that tests SiStripNullKey. +*/ +class testSiStripNullKey : public edm::one::EDAnalyzer<> { +public: + testSiStripNullKey(const edm::ParameterSet&); + ~testSiStripNullKey(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); +}; + using namespace sistrip; // ----------------------------------------------------------------------------- @@ -71,3 +87,6 @@ void testSiStripNullKey::analyze(const edm::Event& event, const edm::EventSetup& LogTrace(mlDqmCommon_) << "[SiStripNullKey::" << __func__ << "]" << " Analyzing run/event " << event.id().run() << "/" << event.id().event(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(testSiStripNullKey); diff --git a/DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.h b/DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.h deleted file mode 100644 index 19c3b28bf10ea..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/test_SiStripNullKey.h +++ /dev/null @@ -1,22 +0,0 @@ - -#ifndef DataFormats_SiStripCommon_testSiStripNullKey_H -#define DataFormats_SiStripCommon_testSiStripNullKey_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -/** - @class testSiStripNullKey - @author R.Bainbridge - @brief Simple class that tests SiStripNullKey. -*/ -class testSiStripNullKey : public edm::EDAnalyzer { -public: - testSiStripNullKey(const edm::ParameterSet&); - ~testSiStripNullKey(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } -}; - -#endif // DataFormats_SiStripCommon_testSiStripNullKey_H diff --git a/DataFormats/SiStripCommon/test/plugins/test_Template.cc b/DataFormats/SiStripCommon/test/plugins/test_Template.cc index 108262fdaf9b8..6c944196f0fb3 100644 --- a/DataFormats/SiStripCommon/test/plugins/test_Template.cc +++ b/DataFormats/SiStripCommon/test/plugins/test_Template.cc @@ -1,10 +1,28 @@ +// system includes +#include +#include -#include "DataFormats/SiStripCommon/test/plugins/test_Template.h" -#include "FWCore/Framework/interface/Event.h" +// user includes #include "DataFormats/SiStripCommon/interface/SiStripConstants.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include -#include + +/** + @class test_Template + @author R.Bainbridge + @brief Simple class that tests Template. +*/ +class test_Template : public edm::one::EDAnalyzer<> { +public: + test_Template(const edm::ParameterSet&); + ~test_Template(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); + +private: +}; using namespace sistrip; @@ -37,3 +55,6 @@ void test_Template::analyze(const edm::Event& event, const edm::EventSetup& setu LogTrace(mlTest_) << "[test_Template::" << __func__ << "]" << " Analyzing run/event " << event.id().run() << "/" << event.id().event(); } + +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(test_Template); diff --git a/DataFormats/SiStripCommon/test/plugins/test_Template.h b/DataFormats/SiStripCommon/test/plugins/test_Template.h deleted file mode 100644 index 7e2c270afbda8..0000000000000 --- a/DataFormats/SiStripCommon/test/plugins/test_Template.h +++ /dev/null @@ -1,24 +0,0 @@ - -#ifndef DQM_SiStripCommissioningClients_test_Template_H -#define DQM_SiStripCommissioningClients_test_Template_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" - -/** - @class test_Template - @author R.Bainbridge - @brief Simple class that tests Template. -*/ -class test_Template : public edm::EDAnalyzer { -public: - test_Template(const edm::ParameterSet&); - ~test_Template(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob() { ; } - -private: -}; - -#endif // DQM_SiStripCommissioningClients_test_Template_H From 344a6c7b08c57074f2e067f8ed3bc8794e95e3e1 Mon Sep 17 00:00:00 2001 From: mmusich Date: Thu, 21 Apr 2022 10:02:26 +0200 Subject: [PATCH 2/6] get rid of residual deprecation warnings in EventFilter/Phase2TrackerRawToDigi --- .../plugins/Phase2TrackerFEDTestAnalyzer.cc | 103 ++++++++++++------ .../plugins/Phase2TrackerFEDTestAnalyzer.h | 36 ------ .../test/plugins/module.cc | 5 - 3 files changed, 70 insertions(+), 74 deletions(-) delete mode 100644 EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.h delete mode 100644 EventFilter/Phase2TrackerRawToDigi/test/plugins/module.cc diff --git a/EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.cc b/EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.cc index e48c7db03a977..17cda25154e77 100644 --- a/EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.cc +++ b/EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.cc @@ -1,26 +1,59 @@ +// system includes +#include +#include + +// user includes #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" +#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" #include "DataFormats/FEDRawData/interface/FEDTrailer.h" -#include "EventFilter/Phase2TrackerRawToDigi/interface/utils.h" -#include "EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.h" #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDBuffer.h" #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDChannel.h" #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDHeader.h" #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDRawChannelUnpacker.h" #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDZSChannelUnpacker.h" +#include "EventFilter/Phase2TrackerRawToDigi/interface/utils.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" -#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +#define LOGPRINT edm::LogPrint("Phase2TrackerFEDTestAnalyzer") + +/** + @class Phase2TrackerFEDTestAnalyzer + @brief Analyzes contents of FED_test_ collection +*/ + +class Phase2TrackerFEDTestAnalyzer : public edm::one::EDAnalyzer<> { +public: + typedef std::pair Fed; + typedef std::vector Feds; + typedef std::vector Channels; + typedef std::map ChannelsMap; + + Phase2TrackerFEDTestAnalyzer(const edm::ParameterSet&); + ~Phase2TrackerFEDTestAnalyzer(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); + void endJob(); + +private: + const edm::EDGetTokenT token_; +}; using namespace Phase2Tracker; using namespace std; // ----------------------------------------------------------------------------- // -Phase2TrackerFEDTestAnalyzer::Phase2TrackerFEDTestAnalyzer(const edm::ParameterSet& pset) { +Phase2TrackerFEDTestAnalyzer::Phase2TrackerFEDTestAnalyzer(const edm::ParameterSet& pset) + : token_(consumes(pset.getParameter("ProductLabel"))) { LogDebug("Phase2TrackerFEDTestAnalyzer") << "[Phase2TrackerFEDTestAnalyzer::" << __func__ << "]" << "Constructing object..."; - token_ = consumes(pset.getParameter("ProductLabel")); } // ----------------------------------------------------------------------------- @@ -58,39 +91,39 @@ void Phase2TrackerFEDTestAnalyzer::analyze(const edm::Event& event, const edm::E Phase2Tracker::Phase2TrackerFEDBuffer* buffer = 0; buffer = new Phase2Tracker::Phase2TrackerFEDBuffer(fed.data(), fed.size()); - cout << " -------------------------------------------- " << endl; - cout << " buffer debug ------------------------------- " << endl; - cout << " -------------------------------------------- " << endl; - cout << " buffer size : " << buffer->bufferSize() << endl; - cout << " fed id : " << fedIndex << endl; - cout << " -------------------------------------------- " << endl; - cout << " tracker header debug ------------------------" << endl; - cout << " -------------------------------------------- " << endl; + LOGPRINT << " -------------------------------------------- "; + LOGPRINT << " buffer debug ------------------------------- "; + LOGPRINT << " -------------------------------------------- "; + LOGPRINT << " buffer size : " << buffer->bufferSize(); + LOGPRINT << " fed id : " << fedIndex; + LOGPRINT << " -------------------------------------------- "; + LOGPRINT << " tracker header debug ------------------------"; + LOGPRINT << " -------------------------------------------- "; Phase2TrackerFEDHeader tr_header = buffer->trackerHeader(); - cout << " Version : " << hex << setw(2) << (int)tr_header.getDataFormatVersion() << endl; - cout << " Mode : " << hex << setw(2) << (int)tr_header.getDebugMode() << endl; - cout << " Type : " << hex << setw(2) << (int)tr_header.getEventType() << endl; - cout << " Readout : " << hex << setw(2) << (int)tr_header.getReadoutMode() << endl; - cout << " Status : " << hex << setw(16) << (int)tr_header.getGlibStatusCode() << endl; - cout << " FE stat : "; + LOGPRINT << " Version : " << hex << setw(2) << (int)tr_header.getDataFormatVersion(); + LOGPRINT << " Mode : " << hex << setw(2) << (int)tr_header.getDebugMode(); + LOGPRINT << " Type : " << hex << setw(2) << (int)tr_header.getEventType(); + LOGPRINT << " Readout : " << hex << setw(2) << (int)tr_header.getReadoutMode(); + LOGPRINT << " Status : " << hex << setw(16) << (int)tr_header.getGlibStatusCode(); + LOGPRINT << " FE stat : "; for (int i = 15; i >= 0; i--) { if ((tr_header.frontendStatus())[i]) { - cout << "1"; + LOGPRINT << "1"; } else { - cout << "0"; + LOGPRINT << "0"; } } - cout << endl; - cout << " Nr CBC : " << hex << setw(16) << (int)tr_header.getNumberOfCBC() << endl; - cout << " CBC stat : "; + LOGPRINT << "\n"; + LOGPRINT << " Nr CBC : " << hex << setw(16) << (int)tr_header.getNumberOfCBC(); + LOGPRINT << " CBC stat : "; for (int i = 0; i < tr_header.getNumberOfCBC(); i++) { - cout << hex << setw(2) << (int)tr_header.CBCStatus()[i] << " "; + LOGPRINT << hex << setw(2) << (int)tr_header.CBCStatus()[i] << " "; } - cout << endl; - cout << " -------------------------------------------- " << endl; - cout << " Payload ----------------------------------- " << endl; - cout << " -------------------------------------------- " << endl; + LOGPRINT << "\n"; + LOGPRINT << " -------------------------------------------- "; + LOGPRINT << " Payload ----------------------------------- "; + LOGPRINT << " -------------------------------------------- "; // loop channels int ichan = 0; @@ -98,14 +131,14 @@ void Phase2TrackerFEDTestAnalyzer::analyze(const edm::Event& event, const edm::E for (int icbc = 0; icbc < 16; icbc++) { const Phase2TrackerFEDChannel& channel = buffer->channel(ichan); if (channel.length() > 0) { - cout << dec << " reading channel : " << icbc << " on FE " << ife; - cout << dec << " with length : " << (int)channel.length() << endl; + LOGPRINT << dec << " reading channel : " << icbc << " on FE " << ife; + LOGPRINT << dec << " with length : " << (int)channel.length(); Phase2TrackerFEDRawChannelUnpacker unpacker = Phase2TrackerFEDRawChannelUnpacker(channel); while (unpacker.hasData()) { - std::cout << (unpacker.stripOn() ? "1" : "_"); + LOGPRINT << (unpacker.stripOn() ? "1" : "_"); unpacker++; } - std::cout << std::endl; + LOGPRINT << "\n"; } ichan++; } @@ -113,3 +146,7 @@ void Phase2TrackerFEDTestAnalyzer::analyze(const edm::Event& event, const edm::E } } } + +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(Phase2TrackerFEDTestAnalyzer); diff --git a/EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.h b/EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.h deleted file mode 100644 index 881dd4748e33f..0000000000000 --- a/EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef EventFilter_Phase2TrackerRawToDigi_Phase2TrackerFEDTestAnalyzer_H -#define EventFilter_Phase2TrackerRawToDigi_Phase2TrackerFEDTestAnalyzer_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" -#include -#include - -/** - @class Phase2TrackerFEDTestAnalyzer - @brief Analyzes contents of FED_test_ collection -*/ - -class Phase2TrackerFEDTestAnalyzer : public edm::EDAnalyzer { -public: - typedef std::pair Fed; - typedef std::vector Feds; - typedef std::vector Channels; - typedef std::map ChannelsMap; - - Phase2TrackerFEDTestAnalyzer(const edm::ParameterSet&); - ~Phase2TrackerFEDTestAnalyzer(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob(); - -private: - edm::InputTag label_; - edm::EDGetTokenT token_; -}; - -#endif // EventFilter_Phase2TrackerRawToDigi_Phase2TrackerFEDTestAnalyzer_H diff --git a/EventFilter/Phase2TrackerRawToDigi/test/plugins/module.cc b/EventFilter/Phase2TrackerRawToDigi/test/plugins/module.cc deleted file mode 100644 index 6d64bd1901da4..0000000000000 --- a/EventFilter/Phase2TrackerRawToDigi/test/plugins/module.cc +++ /dev/null @@ -1,5 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "EventFilter/Phase2TrackerRawToDigi/test/plugins/Phase2TrackerFEDTestAnalyzer.h" -DEFINE_FWK_MODULE(Phase2TrackerFEDTestAnalyzer); From b5ab65fcb5b420e7c11dea935bcba39f92cd8cd9 Mon Sep 17 00:00:00 2001 From: mmusich Date: Thu, 21 Apr 2022 16:21:17 +0200 Subject: [PATCH 3/6] get rid of deprection warnings in EventFilter/SiStripChannelChargeFilter --- .../interface/ClusterMTCCFilter.h | 6 +++--- .../interface/MTCCHLTrigger.h | 12 +++--------- .../interface/TECClusterFilter.h | 6 +++--- .../interface/TrackMTCCFilter.h | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/EventFilter/SiStripChannelChargeFilter/interface/ClusterMTCCFilter.h b/EventFilter/SiStripChannelChargeFilter/interface/ClusterMTCCFilter.h index 8757c8ef08739..e93dec7a630aa 100644 --- a/EventFilter/SiStripChannelChargeFilter/interface/ClusterMTCCFilter.h +++ b/EventFilter/SiStripChannelChargeFilter/interface/ClusterMTCCFilter.h @@ -9,7 +9,7 @@ // // Original Author: dkcira -#include "FWCore/Framework/interface/EDFilter.h" +#include "FWCore/Framework/interface/stream/EDFilter.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -19,10 +19,10 @@ class TrackerTopology; namespace cms { - class ClusterMTCCFilter : public edm::EDFilter { + class ClusterMTCCFilter : public edm::stream::EDFilter<> { public: ClusterMTCCFilter(const edm::ParameterSet& ps); - ~ClusterMTCCFilter() override {} + ~ClusterMTCCFilter() override = default; bool filter(edm::Event& e, edm::EventSetup const& c) override; private: diff --git a/EventFilter/SiStripChannelChargeFilter/interface/MTCCHLTrigger.h b/EventFilter/SiStripChannelChargeFilter/interface/MTCCHLTrigger.h index b084c155101fa..d7d1d09f3b345 100644 --- a/EventFilter/SiStripChannelChargeFilter/interface/MTCCHLTrigger.h +++ b/EventFilter/SiStripChannelChargeFilter/interface/MTCCHLTrigger.h @@ -1,28 +1,22 @@ #ifndef MTCCHLTrigger_H #define MTCCHLTrigger_H -#include "FWCore/Framework/interface/EDFilter.h" +#include "FWCore/Framework/interface/stream/EDFilter.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" -// #include "SimDataFormats/TrackingHit/interface/PSimHit.h" -// #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" namespace cms { - class MTCCHLTrigger : public edm::EDFilter { + class MTCCHLTrigger : public edm::stream::EDFilter<> { public: MTCCHLTrigger(const edm::ParameterSet& ps); - ~MTCCHLTrigger() override {} + ~MTCCHLTrigger() override = default; bool filter(edm::Event& e, edm::EventSetup const& c) override; private: - // bool selOnClusterCharge; bool selOnDigiCharge; unsigned int ChargeThreshold; - // unsigned int digiChargeThreshold; - // std::string rawtodigiProducer; - // std::string zsdigiProducer; std::string clusterProducer; }; } // namespace cms diff --git a/EventFilter/SiStripChannelChargeFilter/interface/TECClusterFilter.h b/EventFilter/SiStripChannelChargeFilter/interface/TECClusterFilter.h index 15875e8bc8a00..8bcba609f2901 100644 --- a/EventFilter/SiStripChannelChargeFilter/interface/TECClusterFilter.h +++ b/EventFilter/SiStripChannelChargeFilter/interface/TECClusterFilter.h @@ -9,7 +9,7 @@ // // Original Author: sfricke -#include "FWCore/Framework/interface/EDFilter.h" +#include "FWCore/Framework/interface/stream/EDFilter.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -17,10 +17,10 @@ #include "DataFormats/DetId/interface/DetId.h" namespace cms { - class TECClusterFilter : public edm::EDFilter { + class TECClusterFilter : public edm::stream::EDFilter<> { public: TECClusterFilter(const edm::ParameterSet& ps); - ~TECClusterFilter() override {} + ~TECClusterFilter() override = default; bool filter(edm::Event& e, edm::EventSetup const& c) override; private: diff --git a/EventFilter/SiStripChannelChargeFilter/interface/TrackMTCCFilter.h b/EventFilter/SiStripChannelChargeFilter/interface/TrackMTCCFilter.h index 127436b630a51..3b0da079f08be 100644 --- a/EventFilter/SiStripChannelChargeFilter/interface/TrackMTCCFilter.h +++ b/EventFilter/SiStripChannelChargeFilter/interface/TrackMTCCFilter.h @@ -9,13 +9,13 @@ // // Original Author: dkcira -#include "FWCore/Framework/interface/EDFilter.h" +#include "FWCore/Framework/interface/stream/EDFilter.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" namespace cms { - class TrackMTCCFilter : public edm::EDFilter { + class TrackMTCCFilter : public edm::stream::EDFilter<> { public: TrackMTCCFilter(const edm::ParameterSet& ps); ~TrackMTCCFilter() override {} From 6a5c40bbb12c4411a3f42cb5461bcc192046326c Mon Sep 17 00:00:00 2001 From: mmusich Date: Thu, 21 Apr 2022 16:22:08 +0200 Subject: [PATCH 4/6] get rid of deprection warnings in EventFilter/SiStripRawToDigi --- .../test/plugins/SiStripClusterValidator.cc | 48 +++++++- .../test/plugins/SiStripClusterValidator.h | 41 ------- .../test/plugins/SiStripDigiAnalyzer.cc | 112 ++++++++++++++++-- .../test/plugins/SiStripDigiAnalyzer.h | 92 -------------- .../test/plugins/SiStripDigiValidator.cc | 61 +++++++++- .../test/plugins/SiStripDigiValidator.h | 55 --------- .../test/plugins/SiStripFEDRawDataAnalyzer.cc | 48 +++++++- .../test/plugins/SiStripFEDRawDataAnalyzer.h | 37 ------ .../test/plugins/SiStripModuleTimer.cc | 35 +++++- .../test/plugins/SiStripModuleTimer.h | 27 ----- .../plugins/SiStripTrivialClusterSource.cc | 65 +++++++++- .../plugins/SiStripTrivialClusterSource.h | 60 ---------- .../test/plugins/SiStripTrivialDigiSource.cc | 53 +++++++-- .../test/plugins/SiStripTrivialDigiSource.h | 32 ----- .../SiStripRawToDigi/test/plugins/module.cc | 23 ---- 15 files changed, 378 insertions(+), 411 deletions(-) delete mode 100644 EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.h delete mode 100644 EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.h delete mode 100644 EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.h delete mode 100644 EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.h delete mode 100644 EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.h delete mode 100644 EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h delete mode 100644 EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h delete mode 100644 EventFilter/SiStripRawToDigi/test/plugins/module.cc diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc index 7fde5101e85da..0ead12781d1cb 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc @@ -1,6 +1,42 @@ -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" +// system includes +#include + +// user includes +#include "DataFormats/Common/interface/DetSetVector.h" +#include "DataFormats/Common/interface/DetSetVectorNew.h" #include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/SiStripCluster/interface/SiStripCluster.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Utilities/interface/InputTag.h" + +class SiStripClusterValidator : public edm::one::EDAnalyzer<> { +public: + SiStripClusterValidator(const edm::ParameterSet& config); + ~SiStripClusterValidator() override = default; + virtual void endJob(); + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + void validate(const edm::DetSetVector&, const edm::DetSetVector&); + void validate(const edmNew::DetSetVector&, const edmNew::DetSetVector&); + +private: + inline const std::string& header() { return header_; } + + /// Input collections + const edm::InputTag collection1Tag_; + const edm::InputTag collection2Tag_; + const bool dsvnew_; + /// used to remember if there have been errors for message in endJob + bool errors_; + + std::string header_; +}; + +std::ostream& operator<<(std::ostream&, const edmNew::DetSetVector&); +std::ostream& operator<<(std::ostream&, const edm::DetSetVector&); SiStripClusterValidator::SiStripClusterValidator(const edm::ParameterSet& conf) : collection1Tag_(conf.getUntrackedParameter("Collection1")), @@ -27,10 +63,6 @@ SiStripClusterValidator::SiStripClusterValidator(const edm::ParameterSet& conf) } } -SiStripClusterValidator::~SiStripClusterValidator() {} - -void SiStripClusterValidator::beginJob() {} - void SiStripClusterValidator::endJob() { std::stringstream ss; ss << "[SiStripClusterValidator::" << __func__ << "]" << std::endl << header(); @@ -218,3 +250,7 @@ std::ostream& operator<<(std::ostream& ss, const edm::DetSetVector - -class SiStripClusterValidator : public edm::EDAnalyzer { -public: - SiStripClusterValidator(const edm::ParameterSet& config); - ~SiStripClusterValidator(); - virtual void beginJob(); - virtual void endJob(); - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); - void validate(const edm::DetSetVector&, const edm::DetSetVector&); - void validate(const edmNew::DetSetVector&, const edmNew::DetSetVector&); - -private: - inline const std::string& header() { return header_; } - - /// Input collections - edm::InputTag collection1Tag_; - edm::InputTag collection2Tag_; - bool dsvnew_; - /// used to remember if there have been errors for message in endJob - bool errors_; - - std::string header_; -}; - -std::ostream& operator<<(std::ostream&, const edmNew::DetSetVector&); -std::ostream& operator<<(std::ostream&, const edm::DetSetVector&); - -#endif /// RecoLocalTracker_SiStripClusterizer_SiStripClusterValidator_H diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc index f75f22dd5aa3d..5dbca003803ce 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.cc @@ -1,18 +1,105 @@ -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" +// system includes +#include +#include +#include +#include +#include + +// user includes +#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h" +#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" #include "DataFormats/Common/interface/DetSetVector.h" +#include "DataFormats/Common/interface/Handle.h" #include "DataFormats/SiStripCommon/interface/SiStripConstants.h" -#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" #include "DataFormats/SiStripCommon/interface/SiStripEventSummary.h" +#include "DataFormats/SiStripCommon/interface/SiStripFedKey.h" #include "DataFormats/SiStripDigi/interface/SiStripDigi.h" #include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h" -#include -#include +#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +/** + @class SiStripDigiAnalyzer + @brief Simple class that analyzes Digis produced by RawToDigi unpacker +*/ + +class SiStripTrivialDigiAnalysis { +public: + /** Default constructor. */ + SiStripTrivialDigiAnalysis() + : events_(0), feds_(0), channels_(0), strips_(0), digis_(0), size_(1024), pos_(size_ + 1, 0), adc_(size_ + 1, 0) {} + + /** Pipes collected statistics to stringstream. */ + void print(std::stringstream&); + + // setters + inline void pos(const uint16_t& pos); + inline void adc(const uint16_t& adc); + + // getters + inline const std::vector& pos(); + inline const std::vector& adc(); + +public: + uint32_t events_; + uint32_t feds_; + uint32_t channels_; + uint32_t strips_; + uint32_t digis_; + + const uint16_t size_; + +private: + std::vector pos_; + std::vector adc_; +}; + +class SiStripDigiAnalyzer : public edm::one::EDAnalyzer<> { +public: + SiStripDigiAnalyzer(const edm::ParameterSet&); + ~SiStripDigiAnalyzer(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); + void endJob(); + +private: + const edm::ESGetToken esTokenCabling_; + std::string inputModuleLabel_; + + SiStripTrivialDigiAnalysis anal_; + SiStripTrivialDigiAnalysis vr_p; + SiStripTrivialDigiAnalysis pr_p; + SiStripTrivialDigiAnalysis sm_p; + SiStripTrivialDigiAnalysis zs_p; + SiStripTrivialDigiAnalysis vr_r; + SiStripTrivialDigiAnalysis pr_r; + SiStripTrivialDigiAnalysis sm_r; + SiStripTrivialDigiAnalysis zs_r; +}; + +void SiStripTrivialDigiAnalysis::pos(const uint16_t& pos) { + if (pos < size_) { + pos_[pos]++; + } else { + pos_[size_]++; + } +} + +void SiStripTrivialDigiAnalysis::adc(const uint16_t& adc) { + if (adc < size_) { + adc_[adc]++; + } else { + adc_[size_]++; + } +} + +const std::vector& SiStripTrivialDigiAnalysis::pos() { return pos_; } +const std::vector& SiStripTrivialDigiAnalysis::adc() { return adc_; } using namespace std; @@ -207,7 +294,10 @@ void SiStripDigiAnalyzer::analyze(const edm::Event& event, const edm::EventSetup } } } - } // channel loop } // fed loop } + +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SiStripDigiAnalyzer); diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.h b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.h deleted file mode 100644 index 008ee2fe6aea5..0000000000000 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.h +++ /dev/null @@ -1,92 +0,0 @@ -#ifndef EventFilter_SiStripRawToDigi_test_AnalyzeSiStripDigis_H -#define EventFilter_SiStripRawToDigi_test_AnalyzeSiStripDigis_H - -#include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h" -#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" -#include -#include -#include -#include - -/** - @class SiStripDigiAnalyzer - @brief Simple class that analyzes Digis produced by RawToDigi unpacker -*/ - -class SiStripTrivialDigiAnalysis { -public: - /** Default constructor. */ - SiStripTrivialDigiAnalysis() - : events_(0), feds_(0), channels_(0), strips_(0), digis_(0), size_(1024), pos_(size_ + 1, 0), adc_(size_ + 1, 0) {} - - /** Pipes collected statistics to stringstream. */ - void print(std::stringstream&); - - // setters - inline void pos(const uint16_t& pos); - inline void adc(const uint16_t& adc); - - // getters - inline const std::vector& pos(); - inline const std::vector& adc(); - -public: - uint32_t events_; - uint32_t feds_; - uint32_t channels_; - uint32_t strips_; - uint32_t digis_; - - const uint16_t size_; - -private: - std::vector pos_; - std::vector adc_; -}; - -class SiStripDigiAnalyzer : public edm::one::EDAnalyzer<> { -public: - SiStripDigiAnalyzer(const edm::ParameterSet&); - ~SiStripDigiAnalyzer(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob(); - -private: - const edm::ESGetToken esTokenCabling_; - std::string inputModuleLabel_; - - SiStripTrivialDigiAnalysis anal_; - SiStripTrivialDigiAnalysis vr_p; - SiStripTrivialDigiAnalysis pr_p; - SiStripTrivialDigiAnalysis sm_p; - SiStripTrivialDigiAnalysis zs_p; - SiStripTrivialDigiAnalysis vr_r; - SiStripTrivialDigiAnalysis pr_r; - SiStripTrivialDigiAnalysis sm_r; - SiStripTrivialDigiAnalysis zs_r; -}; - -void SiStripTrivialDigiAnalysis::pos(const uint16_t& pos) { - if (pos < size_) { - pos_[pos]++; - } else { - pos_[size_]++; - } -} - -void SiStripTrivialDigiAnalysis::adc(const uint16_t& adc) { - if (adc < size_) { - adc_[adc]++; - } else { - adc_[size_]++; - } -} - -const std::vector& SiStripTrivialDigiAnalysis::pos() { return pos_; } - -const std::vector& SiStripTrivialDigiAnalysis::adc() { return adc_; } - -#endif // EventFilter_SiStripRawToDigi_test_SiStripDigiAnalyzer_H diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc index 074d8c05cb479..7f6f470fa979e 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc @@ -1,6 +1,57 @@ -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.h" +// system includes +#include + +// user includes +#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" +#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h" +#include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/SiStripDigi/interface/SiStripDigi.h" +#include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h" +#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "FWCore/Utilities/interface/InputTag.h" + +/** + @file EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.h + @class SiStripDigiValidator + + @brief Compares two digi collections. Reports an error if the collection + sizes do not match or the first collection conatins any digi which + does not have an identical matching digi in the other collection. + This guarentees that the collections are identical. +*/ + +class SiStripDigiValidator : public edm::EDAnalyzer { +public: + SiStripDigiValidator(const edm::ParameterSet& config); + ~SiStripDigiValidator() override = default; + + virtual void endJob(); + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + + void validate(const edm::DetSetVector&, const edm::DetSetVector&); + void validate(const edm::DetSetVector&, const edm::DetSetVector&); + void validate(const edm::DetSetVector&, const edm::DetSetVector&); + void validate(const edm::DetSetVector&, const edm::DetSetVector&); + +private: + inline const std::string& header() { return header_; } + + //Input collections + const edm::InputTag tag1_; + const edm::InputTag tag2_; + const bool raw1_; + const bool raw2_; + //used to remember if there have been errors for message in endJob + bool errors_; + + std::string header_; +}; SiStripDigiValidator::SiStripDigiValidator(const edm::ParameterSet& conf) : tag1_(conf.getUntrackedParameter("TagCollection1")), @@ -24,10 +75,6 @@ SiStripDigiValidator::SiStripDigiValidator(const edm::ParameterSet& conf) mayConsume >(tag2_); } -SiStripDigiValidator::~SiStripDigiValidator() {} - -void SiStripDigiValidator::beginJob() {} - void SiStripDigiValidator::endJob() { std::stringstream ss; ss << "[SiStripDigiValidator::" << __func__ << "]" << std::endl << header(); @@ -222,3 +269,7 @@ void SiStripDigiValidator::validate(const edm::DetSetVector& col } } } + +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SiStripDigiValidator); diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.h b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.h deleted file mode 100644 index 5c567e6d75d1a..0000000000000 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef EventFilter_SiStripRawToDigi_SiStripDigiValidator_H -#define EventFilter_SiStripRawToDigi_SiStripDigiValidator_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "FWCore/Utilities/interface/InputTag.h" -#include "DataFormats/Common/interface/DetSetVector.h" -#include "DataFormats/SiStripDigi/interface/SiStripDigi.h" -#include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h" -#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" -#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h" -#include - -/** - @file EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.h - @class SiStripDigiValidator - - @brief Compares two digi collections. Reports an error if the collection - sizes do not match or the first collection conatins any digi which - does not have an identical matching digi in the other collection. - This guarentees that the collections are identical. -*/ - -class SiStripDigiValidator : public edm::EDAnalyzer { -public: - SiStripDigiValidator(const edm::ParameterSet& config); - ~SiStripDigiValidator(); - - virtual void beginJob(); - virtual void endJob(); - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); - - void validate(const edm::DetSetVector&, const edm::DetSetVector&); - void validate(const edm::DetSetVector&, const edm::DetSetVector&); - void validate(const edm::DetSetVector&, const edm::DetSetVector&); - void validate(const edm::DetSetVector&, const edm::DetSetVector&); - -private: - inline const std::string& header() { return header_; } - - //Input collections - edm::InputTag tag1_; - edm::InputTag tag2_; - bool raw1_; - bool raw2_; - //used to remember if there have been errors for message in endJob - bool errors_; - - std::string header_; -}; - -#endif // EventFilter_SiStripRawToDigi_SiStripDigiValidator_H diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.cc index ab781ac0e4a51..e4883c0c56526 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.cc @@ -1,14 +1,48 @@ +// system includes +#include +#include +#include +#include +#include + +// user includes +#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h" +#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" #include "DataFormats/Common/interface/Handle.h" #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h" #include "DataFormats/FEDRawData/interface/FEDTrailer.h" #include "DataFormats/SiStripCommon/interface/SiStripConstants.h" -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.h" #include "EventFilter/SiStripRawToDigi/interface/SiStripFEDBuffer.h" -#include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/Framework/interface/ESHandle.h" -#include -#include -#include +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +/** + @class SiStripFEDRawDataAnalyzer + @brief Analyzes contents of FEDRawData collection +*/ + +class SiStripFEDRawDataAnalyzer : public edm::one::EDAnalyzer<> { +public: + typedef std::pair Fed; + typedef std::vector Feds; + typedef std::vector Channels; + typedef std::map ChannelsMap; + + SiStripFEDRawDataAnalyzer(const edm::ParameterSet&); + ~SiStripFEDRawDataAnalyzer(); + + void beginJob(); + void analyze(const edm::Event&, const edm::EventSetup&); + void endJob(); + +private: + const edm::ESGetToken esTokenCabling_; + edm::InputTag label_; +}; using namespace sistrip; using namespace std; @@ -321,3 +355,7 @@ void SiStripFEDRawDataAnalyzer::analyze(const edm::Event& event, const edm::Even LogTrace(mlRawToDigi_) << ss.str(); } } + +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SiStripFEDRawDataAnalyzer); diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.h b/EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.h deleted file mode 100644 index 5db35c868b8ef..0000000000000 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef EventFilter_SiStripRawToDigi_SiStripFEDRawDataAnalyzer_H -#define EventFilter_SiStripRawToDigi_SiStripFEDRawDataAnalyzer_H - -#include "FWCore/Framework/interface/one/EDAnalyzer.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h" -#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" -#include -#include - -/** - @class SiStripFEDRawDataAnalyzer - @brief Analyzes contents of FEDRawData collection -*/ - -class SiStripFEDRawDataAnalyzer : public edm::one::EDAnalyzer<> { -public: - typedef std::pair Fed; - typedef std::vector Feds; - typedef std::vector Channels; - typedef std::map ChannelsMap; - - SiStripFEDRawDataAnalyzer(const edm::ParameterSet&); - ~SiStripFEDRawDataAnalyzer(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob(); - -private: - const edm::ESGetToken esTokenCabling_; - edm::InputTag label_; -}; - -#endif // EventFilter_SiStripRawToDigi_SiStripFEDRawDataAnalyzer_H diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.cc index ca376959a2c88..a7c9ae5db9cf5 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.cc @@ -1,13 +1,34 @@ -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.h" +// user includes #include "FWCore/ServiceRegistry/interface/Service.h" +#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +//#include "DQM/HLTEvF/interface/PathTimerService.h" + +// ROOT includes +#include "TFile.h" +#include "TTree.h" + +class SiStripModuleTimer : public edm::EDAnalyzer { +public: + SiStripModuleTimer(const edm::ParameterSet&); + ~SiStripModuleTimer(); + + void analyze(const edm::Event&, const edm::EventSetup&); + void endJob(); + +private: + std::vector moduleLabels_; + std::vector times_; + TFile* file_; + TTree* tree_; +}; using namespace std; using namespace edm; SiStripModuleTimer::SiStripModuleTimer(const ParameterSet& pset) - : - - moduleLabels_(pset.getUntrackedParameter >("ModuleLabels")), + : moduleLabels_(pset.getUntrackedParameter >("ModuleLabels")), times_(moduleLabels_.size()), file_(0), tree_(0) { @@ -26,8 +47,6 @@ SiStripModuleTimer::~SiStripModuleTimer() { file_->Close(); } -void SiStripModuleTimer::beginJob() {} - void SiStripModuleTimer::endJob() { file_->cd(); tree_->Write(); @@ -44,3 +63,7 @@ void SiStripModuleTimer::analyze(const Event& iEvent, const EventSetup& iSetup) //} tree_->Fill(); } + +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SiStripModuleTimer); diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.h b/EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.h deleted file mode 100644 index aca99a03dcf03..0000000000000 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef EventFilter_SiStripRawToDigi_SiStripModuleTimer_H -#define EventFilter_SiStripRawToDigi_SiStripModuleTimer_H - -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -//#include "DQM/HLTEvF/interface/PathTimerService.h" -#include "TFile.h" -#include "TTree.h" - -class SiStripModuleTimer : public edm::EDAnalyzer { -public: - SiStripModuleTimer(const edm::ParameterSet&); - ~SiStripModuleTimer(); - - void beginJob(); - void analyze(const edm::Event&, const edm::EventSetup&); - void endJob(); - -private: - std::vector moduleLabels_; - std::vector times_; - TFile* file_; - TTree* tree_; -}; - -#endif diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.cc index 1c023a977a5b5..56f1eeac78e12 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.cc @@ -1,4 +1,63 @@ -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h" +// system includes +#include + +// user includes +#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" +#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h" +#include "DataFormats/Common/interface/DetSetVector.h" +#include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/SiStripDigi/interface/SiStripDigi.h" +#include "FWCore/Framework/interface/ESHandle.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/Run.h" +#include "FWCore/Framework/interface/stream/EDProducer.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +// ROOT includes +#include "TRandom.h" + +/** + @file EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.cc + @class SiStripTrivialClusterSource + @brief Creates a DetSetVector of SiStripDigis created using random + number generators and attaches the collection to the Event. Allows + to test the final DigiToRaw and RawToDigi/RawToCluster converters. + */ + +class SiStripTrivialClusterSource : public edm::stream::EDProducer<> { +public: + SiStripTrivialClusterSource(const edm::ParameterSet&); + ~SiStripTrivialClusterSource() override; + + void beginRun(const edm::Run&, const edm::EventSetup&) override; + void produce(edm::Event&, const edm::EventSetup&) override; + +private: + /** Check for space in module */ + bool available(const edm::DetSet&, const uint16_t, const uint32_t); + + /** Add cluster to module */ + void addcluster(edm::DetSet&, const uint16_t, const uint16_t); + + /** token */ + const edm::ESGetToken esTokenCabling_; + + /** Configurables */ + double minocc_; + double maxocc_; + double mincluster_; + double maxcluster_; + uint16_t separation_; + + /** Setup */ + edm::ESHandle cabling_; + std::vector detids_; + uint32_t nstrips_; + + /** Random */ + TRandom random_; +}; SiStripTrivialClusterSource::SiStripTrivialClusterSource(const edm::ParameterSet& pset) : esTokenCabling_(esConsumes()), @@ -82,3 +141,7 @@ void SiStripTrivialClusterSource::addcluster(edm::DetSet& detset, detset.data.push_back(SiStripDigi(firststrip + istrip, 0xFF)); } } + +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SiStripTrivialClusterSource); diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h b/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h deleted file mode 100644 index 3e16ad6c6f894..0000000000000 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef EventFilter_SiStripRawToDigi_SiStripTrivialClusterSource_H -#define EventFilter_SiStripRawToDigi_SiStripTrivialClusterSource_H - -#include "FWCore/Framework/interface/stream/EDProducer.h" -#include "FWCore/Framework/interface/Event.h" -#include "FWCore/Framework/interface/EventSetup.h" -#include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Framework/interface/Run.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "DataFormats/Common/interface/DetSetVector.h" -#include "DataFormats/Common/interface/Handle.h" -#include "DataFormats/SiStripDigi/interface/SiStripDigi.h" -#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" -#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h" -#include "TRandom.h" -#include - -/** - @file EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h - @class SiStripTrivialClusterSource - @brief Creates a DetSetVector of SiStripDigis created using random - number generators and attaches the collection to the Event. Allows - to test the final DigiToRaw and RawToDigi/RawToCluster converters. - */ - -class SiStripTrivialClusterSource : public edm::stream::EDProducer<> { -public: - SiStripTrivialClusterSource(const edm::ParameterSet&); - ~SiStripTrivialClusterSource() override; - - void beginRun(const edm::Run&, const edm::EventSetup&) override; - void produce(edm::Event&, const edm::EventSetup&) override; - -private: - /** Check for space in module */ - bool available(const edm::DetSet&, const uint16_t, const uint32_t); - - /** Add cluster to module */ - void addcluster(edm::DetSet&, const uint16_t, const uint16_t); - - /** token */ - const edm::ESGetToken esTokenCabling_; - - /** Configurables */ - double minocc_; - double maxocc_; - double mincluster_; - double maxcluster_; - uint16_t separation_; - - /** Setup */ - edm::ESHandle cabling_; - std::vector detids_; - uint32_t nstrips_; - - /** Random */ - TRandom random_; -}; - -#endif // EventFilter_SiStripRawToDigi_SiStripTrivialClusterSource_H diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.cc index 3c1ca9acf8d6d..1c1804af89ae8 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.cc @@ -1,4 +1,17 @@ -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h" +// system includes +#include +#include +#include +#include +#include +#include +#include + +// user includes +#include "CLHEP/Random/RandFlat.h" +#include "CLHEP/Random/RandGauss.h" +#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h" +#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/SiStripCommon/interface/SiStripConstants.h" #include "DataFormats/SiStripDigi/interface/SiStripDigi.h" @@ -6,17 +19,33 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" +#include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" -#include "CLHEP/Random/RandGauss.h" -#include "CLHEP/Random/RandFlat.h" -#include -#include -#include -#include -#include -#include -#include + +/** + @file EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h + @class SiStripTrivialDigiSource + + @brief Creates a DetSetVector of SiStripDigis created using random + number generators and attaches the collection to the Event. Allows + to test the final DigiToRaw and RawToDigi converters. +*/ +class SiStripTrivialDigiSource : public edm::global::EDProducer<> { +public: + SiStripTrivialDigiSource(const edm::ParameterSet&); + ~SiStripTrivialDigiSource(); + + virtual void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; + +private: + const edm::ESGetToken esTokenCabling_; + const float meanOcc_; + const float rmsOcc_; + const int ped_; + const bool raw_; + const bool useFedKey_; +}; // ----------------------------------------------------------------------------- // @@ -174,3 +203,7 @@ void SiStripTrivialDigiSource::produce(edm::StreamID, edm::Event& event, const e LogTrace("TrivialDigiSource") << ss.str(); } } + +#include "FWCore/PluginManager/interface/ModuleDef.h" +#include "FWCore/Framework/interface/MakerMacros.h" +DEFINE_FWK_MODULE(SiStripTrivialDigiSource); diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h b/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h deleted file mode 100644 index 2474dd30300ec..0000000000000 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef EventFilter_SiStripRawToDigi_SiStripTrivialDigiSource_H -#define EventFilter_SiStripRawToDigi_SiStripTrivialDigiSource_H - -#include "FWCore/Framework/interface/global/EDProducer.h" -#include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h" -#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h" - -/** - @file EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h - @class SiStripTrivialDigiSource - - @brief Creates a DetSetVector of SiStripDigis created using random - number generators and attaches the collection to the Event. Allows - to test the final DigiToRaw and RawToDigi converters. -*/ -class SiStripTrivialDigiSource : public edm::global::EDProducer<> { -public: - SiStripTrivialDigiSource(const edm::ParameterSet&); - ~SiStripTrivialDigiSource(); - - virtual void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override; - -private: - const edm::ESGetToken esTokenCabling_; - const float meanOcc_; - const float rmsOcc_; - const int ped_; - const bool raw_; - const bool useFedKey_; -}; - -#endif // EventFilter_SiStripRawToDigi_SiStripTrivialDigiSource_H diff --git a/EventFilter/SiStripRawToDigi/test/plugins/module.cc b/EventFilter/SiStripRawToDigi/test/plugins/module.cc deleted file mode 100644 index a1cf2ac0d3d7b..0000000000000 --- a/EventFilter/SiStripRawToDigi/test/plugins/module.cc +++ /dev/null @@ -1,23 +0,0 @@ -#include "FWCore/PluginManager/interface/ModuleDef.h" -#include "FWCore/Framework/interface/MakerMacros.h" - -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripFEDRawDataAnalyzer.h" -DEFINE_FWK_MODULE(SiStripFEDRawDataAnalyzer); - -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiAnalyzer.h" -DEFINE_FWK_MODULE(SiStripDigiAnalyzer); - -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialClusterSource.h" -DEFINE_FWK_MODULE(SiStripTrivialClusterSource); - -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripTrivialDigiSource.h" -DEFINE_FWK_MODULE(SiStripTrivialDigiSource); - -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.h" -DEFINE_FWK_MODULE(SiStripDigiValidator); - -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.h" -DEFINE_FWK_MODULE(SiStripClusterValidator); - -#include "EventFilter/SiStripRawToDigi/test/plugins/SiStripModuleTimer.h" -DEFINE_FWK_MODULE(SiStripModuleTimer); From caebbae54b6e129e74a87f206972f2664cfd855c Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 22 Apr 2022 10:51:38 +0200 Subject: [PATCH 5/6] get rid of residual deprecation warnings in RecoLocalTracker/SiStripRecHitConverter and RecoTracker/TkMSParametrization --- .../test/ClusterFilter.cc | 47 ++++++++----- .../test/ClusterFilter.h | 24 ------- .../SiStripRecHitConverter/test/ReadRecHit.cc | 66 ++++++++++++------- .../SiStripRecHitConverter/test/ReadRecHit.h | 37 ----------- .../TkMSParametrization/test/TestMS.cc | 22 ++++--- 5 files changed, 85 insertions(+), 111 deletions(-) delete mode 100644 RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.h delete mode 100644 RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.h diff --git a/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc b/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc index f8ce3366c4202..59236b468d3c8 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc +++ b/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc @@ -1,30 +1,41 @@ -#include "RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.h" +// system include #include -#include "DataFormats/SiStripCluster/interface/SiStripCluster.h" + +// user includes #include "DataFormats/Common/interface/DetSetVector.h" #include "DataFormats/Common/interface/Handle.h" +#include "DataFormats/SiStripCluster/interface/SiStripCluster.h" +#include "FWCore/Framework/interface/stream/EDFilter.h" #include "FWCore/Framework/interface/Event.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" + +namespace edm { + class ParameterSet; +} + +class ClusterFilter : public edm::stream::EDFilter<> { +public: + ClusterFilter(const edm::ParameterSet&); + ~ClusterFilter() override = default; + +private: + bool filter(edm::Event&, edm::EventSetup const&); + const int nMax_; + const edm::EDGetTokenT> clustersToken_; +}; + using namespace std; using namespace edm; -ClusterFilter::ClusterFilter(const ParameterSet& pset) : nMax_(pset.getParameter("maxClusters")), conf_(pset) {} - -ClusterFilter::~ClusterFilter() {} +ClusterFilter::ClusterFilter(const ParameterSet& pset) + : nMax_(pset.getParameter("maxClusters")), + clustersToken_(consumes>(pset.getParameter("ClusterProducer"))) {} bool ClusterFilter::filter(Event& e, EventSetup const& es) { - std::string clusterProducer = conf_.getParameter("ClusterProducer"); - edm::Handle > clusters; - e.getByLabel(clusterProducer, clusters); - // int size=clusters.product()->size(); + const edm::DetSetVector& clusters = e.get(clustersToken_); int size = 0; - for (edm::DetSetVector::const_iterator DSViter = clusters.product()->begin(); - DSViter != clusters.product()->end(); - ++DSViter) { - size += DSViter->data.size(); + for (const auto& DSViter : clusters) { + size += DSViter.data.size(); } - - if (size > nMax_) - return 0; - else - return 1; + return (size < nMax_); } diff --git a/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.h b/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.h deleted file mode 100644 index a0e9384986345..0000000000000 --- a/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef TkSeedGenerator_ClusterFilter_h -#define TkSeedGenerator_ClusterFilter_h - -#include "FWCore/Framework/interface/EDFilter.h" -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -namespace edm { - class ParameterSet; -} - -class ClusterFilter : public edm::EDFilter { -public: - ClusterFilter(const edm::ParameterSet&); - ~ClusterFilter(); - -private: - bool filter(edm::Event&, edm::EventSetup const&); - const int nMax_; - const edm::ParameterSet conf_; - // int n_; - // const bool verbose_; -}; - -#endif diff --git a/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc b/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc index e2660e1bcb82e..295a9ec58066e 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc +++ b/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc @@ -1,41 +1,63 @@ -// File: ReadRecHit.cc -// Description: see ReadRecHit.h -// Author: C.Genta -// -//-------------------------------------------- +/** \class ReadRecHit + * + * ReadRecHit is a analyzer which reads rechits + * + * \author C. Genta + * + */ + +// system includes #include #include #include -#include "RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.h" - -#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h" +// user includes +#include "DataFormats/Common/interface/Handle.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h" - -#include "FWCore/Framework/interface/ESHandle.h" +#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" +#include "FWCore/Framework/interface/Event.h" +#include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" +#include "FWCore/ParameterSet/interface/ParameterSet.h" +#include "RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHitAlgorithm.h" + namespace cms { + class ReadRecHit : public edm::one::EDAnalyzer<> { + public: + explicit ReadRecHit(const edm::ParameterSet& conf); + virtual ~ReadRecHit() override = default; - ReadRecHit::ReadRecHit(edm::ParameterSet const& conf) : readRecHitAlgorithm_(conf), conf_(conf) { - // produces(); - } + virtual void analyze(const edm::Event& e, const edm::EventSetup& c); + + private: + ReadRecHitAlgorithm readRecHitAlgorithm_; + const std::string recHitProducer_; + const edm::EDGetTokenT matchedRecHitToken_; + const edm::EDGetTokenT rphiToken_; + const edm::EDGetTokenT stereoToken_; + }; +} // namespace cms + +namespace cms { - // Virtual destructor needed. - ReadRecHit::~ReadRecHit() {} + ReadRecHit::ReadRecHit(edm::ParameterSet const& conf) + : readRecHitAlgorithm_(conf), + recHitProducer_(conf.getParameter("RecHitProducer")), + matchedRecHitToken_( + consumes(edm::InputTag{recHitProducer_, "matchedRecHit"})), + rphiToken_(consumes(edm::InputTag{recHitProducer_, "rphiRecHit"})), + stereoToken_(consumes(edm::InputTag{recHitProducer_, "stereoRecHit"})) {} // Functions that gets called by framework every event void ReadRecHit::analyze(const edm::Event& e, const edm::EventSetup& es) { using namespace edm; - std::string rechitProducer = conf_.getParameter("RecHitProducer"); // Step A: Get Inputs - edm::Handle rechitsmatched; - edm::Handle rechitsrphi; - edm::Handle rechitsstereo; - e.getByLabel(rechitProducer, "matchedRecHit", rechitsmatched); - e.getByLabel(rechitProducer, "rphiRecHit", rechitsrphi); - e.getByLabel(rechitProducer, "stereoRecHit", rechitsstereo); + edm::Handle rechitsmatched = e.getHandle(matchedRecHitToken_); + edm::Handle rechitsrphi = e.getHandle(rphiToken_); + edm::Handle rechitsstereo = e.getHandle(stereoToken_); edm::LogInfo("ReadRecHit") << "Matched hits:"; readRecHitAlgorithm_.run(rechitsmatched.product()); diff --git a/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.h b/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.h deleted file mode 100644 index 18083f70b3103..0000000000000 --- a/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef ReadRecHit_h -#define ReadRecHit_h - -/** \class ReadRecHit - * - * ReadRecHit is a analyzer which reads rechits - * - * \author C. Genta - * - * - ************************************************************/ - -#include "FWCore/Framework/interface/EDAnalyzer.h" -#include "FWCore/Framework/interface/Event.h" -#include "DataFormats/Common/interface/Handle.h" -#include "FWCore/Framework/interface/EventSetup.h" - -#include "FWCore/ParameterSet/interface/ParameterSet.h" - -#include "RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHitAlgorithm.h" - -namespace cms { - class ReadRecHit : public edm::EDAnalyzer { - public: - explicit ReadRecHit(const edm::ParameterSet& conf); - - virtual ~ReadRecHit(); - - virtual void analyze(const edm::Event& e, const edm::EventSetup& c); - - private: - ReadRecHitAlgorithm readRecHitAlgorithm_; - edm::ParameterSet conf_; - }; -} // namespace cms - -#endif diff --git a/RecoTracker/TkMSParametrization/test/TestMS.cc b/RecoTracker/TkMSParametrization/test/TestMS.cc index d001a5759d719..990df14f56cd7 100644 --- a/RecoTracker/TkMSParametrization/test/TestMS.cc +++ b/RecoTracker/TkMSParametrization/test/TestMS.cc @@ -1,6 +1,10 @@ +// system includes +#include + +// user includes #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Framework/interface/EDAnalyzer.h" +#include "FWCore/Framework/interface/one/EDAnalyzer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/EventSetup.h" #include "DataFormats/Common/interface/Handle.h" @@ -8,10 +12,8 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" - #include "RecoTracker/TkMSParametrization/interface/MultipleScatteringParametrisation.h" #include "RecoTracker/TkMSParametrization/interface/MultipleScatteringParametrisationMaker.h" - #include "TrackingTools/DetLayers/interface/BarrelDetLayer.h" #include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" @@ -20,28 +22,28 @@ #include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" -using namespace GeomDetEnumerators; - -#include - -using namespace std; -using namespace edm; +// ROOT includes #include "TFile.h" #include "TH1D.h" #include "TProfile.h" +using namespace GeomDetEnumerators; +using namespace std; +using namespace edm; + template T sqr(T t) { return t * t; } -class TestMS : public edm::EDAnalyzer { +class TestMS : public edm::one::EDAnalyzer { public: explicit TestMS(const edm::ParameterSet& conf); ~TestMS(); virtual void beginRun(edm::Run const& run, const edm::EventSetup& es) override; virtual void analyze(const edm::Event& ev, const edm::EventSetup& es) override; + virtual void endRun(edm::Run const& run, const edm::EventSetup& es){}; private: edm::ESGetToken trackerToken_; From 66e4a9fa13ef8a9e8dbeaa18f2194c3c72be7246 Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 22 Apr 2022 17:14:56 +0200 Subject: [PATCH 6/6] make clang happy --- .../SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc | 4 ++-- .../SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc | 4 ++-- RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc | 2 +- RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc | 2 +- RecoTracker/TkMSParametrization/test/TestMS.cc | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc index 0ead12781d1cb..93d6ae03d43a4 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripClusterValidator.cc @@ -17,8 +17,8 @@ class SiStripClusterValidator : public edm::one::EDAnalyzer<> { public: SiStripClusterValidator(const edm::ParameterSet& config); ~SiStripClusterValidator() override = default; - virtual void endJob(); - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void endJob() override; + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; void validate(const edm::DetSetVector&, const edm::DetSetVector&); void validate(const edmNew::DetSetVector&, const edmNew::DetSetVector&); diff --git a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc index 7f6f470fa979e..f0679a1ba1192 100644 --- a/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc +++ b/EventFilter/SiStripRawToDigi/test/plugins/SiStripDigiValidator.cc @@ -31,8 +31,8 @@ class SiStripDigiValidator : public edm::EDAnalyzer { SiStripDigiValidator(const edm::ParameterSet& config); ~SiStripDigiValidator() override = default; - virtual void endJob(); - virtual void analyze(const edm::Event& event, const edm::EventSetup& setup); + virtual void endJob() override; + virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) override; void validate(const edm::DetSetVector&, const edm::DetSetVector&); void validate(const edm::DetSetVector&, const edm::DetSetVector&); diff --git a/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc b/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc index 59236b468d3c8..65b82e4f812d9 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc +++ b/RecoLocalTracker/SiStripRecHitConverter/test/ClusterFilter.cc @@ -19,7 +19,7 @@ class ClusterFilter : public edm::stream::EDFilter<> { ~ClusterFilter() override = default; private: - bool filter(edm::Event&, edm::EventSetup const&); + bool filter(edm::Event&, edm::EventSetup const&) override; const int nMax_; const edm::EDGetTokenT> clustersToken_; }; diff --git a/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc b/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc index 295a9ec58066e..725c1be9d4def 100644 --- a/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc +++ b/RecoLocalTracker/SiStripRecHitConverter/test/ReadRecHit.cc @@ -29,7 +29,7 @@ namespace cms { explicit ReadRecHit(const edm::ParameterSet& conf); virtual ~ReadRecHit() override = default; - virtual void analyze(const edm::Event& e, const edm::EventSetup& c); + virtual void analyze(const edm::Event& e, const edm::EventSetup& c) override; private: ReadRecHitAlgorithm readRecHitAlgorithm_; diff --git a/RecoTracker/TkMSParametrization/test/TestMS.cc b/RecoTracker/TkMSParametrization/test/TestMS.cc index 990df14f56cd7..4f87eb173b125 100644 --- a/RecoTracker/TkMSParametrization/test/TestMS.cc +++ b/RecoTracker/TkMSParametrization/test/TestMS.cc @@ -43,7 +43,7 @@ class TestMS : public edm::one::EDAnalyzer { ~TestMS(); virtual void beginRun(edm::Run const& run, const edm::EventSetup& es) override; virtual void analyze(const edm::Event& ev, const edm::EventSetup& es) override; - virtual void endRun(edm::Run const& run, const edm::EventSetup& es){}; + virtual void endRun(edm::Run const& run, const edm::EventSetup& es) override; private: edm::ESGetToken trackerToken_; @@ -76,6 +76,7 @@ TestMS::~TestMS() { } void TestMS::analyze(const edm::Event& ev, const edm::EventSetup& es) {} +void TestMS::endRun(edm::Run const& run, const edm::EventSetup& es) {} void TestMS::beginRun(edm::Run const& run, const edm::EventSetup& es) { auto const& tracker = es.getData(trackerToken_);