get rid of deprection warnings in EventFilter/SiStripRawToDigi

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 <sstream>
+
+// 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<SiStripCluster>&, const edm::DetSetVector<SiStripCluster>&);
+  void validate(const edmNew::DetSetVector<SiStripCluster>&, const edmNew::DetSetVector<SiStripCluster>&);
+
+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<SiStripCluster>&);
+std::ostream& operator<<(std::ostream&, const edm::DetSetVector<SiStripCluster>&);
 
 SiStripClusterValidator::SiStripClusterValidator(const edm::ParameterSet& conf)
     : collection1Tag_(conf.getUntrackedParameter<edm::InputTag>("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<SiStripCluste
   }
   return ss;
 }
+
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(SiStripClusterValidator);

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 <cstdint>
+#include <iomanip>
+#include <sstream>
+#include <string>
+#include <vector>
+
+// 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 <sstream>
-#include <iomanip>
+#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<uint16_t>& pos();
+  inline const std::vector<uint16_t>& adc();
+
+public:
+  uint32_t events_;
+  uint32_t feds_;
+  uint32_t channels_;
+  uint32_t strips_;
+  uint32_t digis_;
+
+  const uint16_t size_;
+
+private:
+  std::vector<uint16_t> pos_;
+  std::vector<uint16_t> 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<SiStripFedCabling, SiStripFedCablingRcd> 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<uint16_t>& SiStripTrivialDigiAnalysis::pos() { return pos_; }
+const std::vector<uint16_t>& 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);