Merge pull request #37657 from mmusich/getRidOfRemainingDepWarningsRECO

Get rid of remaining tracker / tracking deprecation warnings in reco area

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 <iostream>
+// system includes
+#include <algorithm>
+#include <cstdint>
 #include <iomanip>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <time.h>
-#include <algorithm>
+#include <vector>
+
+// 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<uint32_t>&);
+};
 
 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);

DataFormats/SiStripCommon/test/plugins/perf_SiStripFecKey.cc

@@ -1,17 +1,64 @@
-
-#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 <vector>
+#include <cstdint>
 #include <iostream>
 #include <iomanip>
 #include <sstream>
 #include <string>
 #include <time.h>
 #include <algorithm>
 
+// 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<Value>&,
+             std::vector<uint32_t>&,
+             std::vector<std::string>&,
+             std::vector<SiStripFecKey>&,
+             std::vector<SiStripKey>&);
+
+  void build(const std::vector<Value>&) const;
+  void build(const std::vector<uint32_t>&) const;
+  void build(const std::vector<std::string>&) const;
+  void build(const std::vector<SiStripFecKey>&) const;
+  void build(const std::vector<SiStripKey>&) const;
+
+  void test(const std::vector<SiStripFecKey>&) const;
+
+  uint32_t loops_;
+};
+
 using namespace sistrip;
 
 // -----------------------------------------------------------------------------
@@ -205,3 +252,6 @@ void perfSiStripFecKey::build(std::vector<Value>& values,
   //   std::sort( derived.begin(), derived.end() );
   //   std::sort( base.begin(), base.end() );
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(perfSiStripFecKey);

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 <iostream>
+
+// system includes
 #include <iomanip>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>
 
+/**
+   @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);

DataFormats/SiStripCommon/test/plugins/test_SiStripFecKey.cc

@@ -1,12 +1,37 @@
+// system includes
+#include <sstream>
 
-#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 <sstream>
+
+/**
+   @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);