modernize OnlineDB/SiStripESSources

cms-sw · Dec 8, 2021 · 7f51171 · 7f51171
1 parent a6366f4
commit 7f51171
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 171 deletions.
diff --git a/OnlineDB/SiStripESSources/test/stubs/SealModule.cc b/OnlineDB/SiStripESSources/test/stubs/SealModule.cc
diff --git a/OnlineDB/SiStripESSources/test/stubs/testSiStripGainBuilderFromDb.cc b/OnlineDB/SiStripESSources/test/stubs/testSiStripGainBuilderFromDb.cc
@@ -1,22 +1,40 @@
-
-#include "OnlineDB/SiStripESSources/test/stubs/testSiStripGainBuilderFromDb.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripFecCabling.h"
 #include "CondFormats/DataRecord/interface/SiStripApvGainRcd.h"
 #include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.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/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
 #include <cmath>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 
+/**
+   @class testSiStripGainBuilderFromDb 
+   @brief Analyzes FEC (and FED) cabling object(s)
+*/
+class testSiStripGainBuilderFromDb : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
+public:
+  testSiStripGainBuilderFromDb(const edm::ParameterSet&) : gainToken_(esConsumes<edm::Transition::BeginRun>()) {}
+
+  ~testSiStripGainBuilderFromDb() override = default;
+  void beginRun(const edm::Run&, const edm::EventSetup&);
+  void endRun(const edm::Run&, const edm::EventSetup&) {}
+  void analyze(const edm::Event&, const edm::EventSetup&) { ; }
+
+private:
+  const edm::ESGetToken<SiStripApvGain, SiStripApvGainRcd> gainToken_;
+};
+
 // -----------------------------------------------------------------------------
-//
 void testSiStripGainBuilderFromDb::beginRun(const edm::Run& run, const edm::EventSetup& setup) {
-  edm::ESHandle<SiStripApvGain> gain;
-  setup.get<SiStripApvGainRcd>().get(gain);
-
+  const SiStripApvGain* gain = &setup.getData(gainToken_);
   std::vector<uint32_t> ids;
   gain->getDetIds(ids);
 
@@ -69,3 +87,6 @@ void testSiStripGainBuilderFromDb::beginRun(const edm::Run& run, const edm::Even
   sss << std::endl << " Is set (!=0.8)    : " << isset << std::endl << " Not set (=0.8)    : " << unset;
   edm::LogVerbatim("TEST") << sss.str();
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(testSiStripGainBuilderFromDb);
diff --git a/OnlineDB/SiStripESSources/test/stubs/testSiStripGainBuilderFromDb.h b/OnlineDB/SiStripESSources/test/stubs/testSiStripGainBuilderFromDb.h
diff --git a/OnlineDB/SiStripESSources/test/stubs/test_AnalyzeCabling.cc b/OnlineDB/SiStripESSources/test/stubs/test_AnalyzeCabling.cc
@@ -1,25 +1,42 @@
-
-#include "OnlineDB/SiStripESSources/test/stubs/test_AnalyzeCabling.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
+#include "CalibFormats/SiStripObjects/interface/SiStripFecCabling.h"
 #include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
 #include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
-#include "CalibFormats/SiStripObjects/interface/SiStripFecCabling.h"
+#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
 #include <iostream>
 #include <sstream>
 
+/**
+   @class test_AnalyzeCabling 
+   @brief Analyzes FEC (and FED) cabling object(s)
+*/
+class test_AnalyzeCabling : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
+public:
+  test_AnalyzeCabling(const edm::ParameterSet&) : cablingToken_(esConsumes<edm::Transition::BeginRun>()) {}
+  ~test_AnalyzeCabling() override = default;
+  void beginRun(const edm::Run&, const edm::EventSetup&);
+  void analyze(const edm::Event&, const edm::EventSetup&) {}
+  void endRun(const edm::Run&, const edm::EventSetup&) {}
+
+private:
+  const edm::ESGetToken<SiStripFedCabling, SiStripFedCablingRcd> cablingToken_;
+};
+
 // -----------------------------------------------------------------------------
-//
 void test_AnalyzeCabling::beginRun(const edm::Run& run, const edm::EventSetup& setup) {
   using namespace sistrip;
 
   // fed cabling
   LogTrace(mlCabling_) << "[test_AnalyzeCabling::" << __func__ << "]"
                        << " Dumping all connection objects in FED cabling..." << std::endl;
-  edm::ESHandle<SiStripFedCabling> fed_cabling;
-  setup.get<SiStripFedCablingRcd>().get(fed_cabling);
 
+  const SiStripFedCabling* fed_cabling = &setup.getData(cablingToken_);
   // fec cabling
   SiStripFecCabling fec_cabling(*fed_cabling);
   std::stringstream ss;
@@ -28,3 +45,6 @@ void test_AnalyzeCabling::beginRun(const edm::Run& run, const edm::EventSetup& s
      << fec_cabling;
   LogTrace(mlCabling_) << ss.str();
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(test_AnalyzeCabling);
diff --git a/OnlineDB/SiStripESSources/test/stubs/test_AnalyzeCabling.h b/OnlineDB/SiStripESSources/test/stubs/test_AnalyzeCabling.h
diff --git a/OnlineDB/SiStripESSources/test/stubs/test_FedCablingBuilder.cc b/OnlineDB/SiStripESSources/test/stubs/test_FedCablingBuilder.cc
@@ -1,22 +1,43 @@
-
-#include "OnlineDB/SiStripESSources/test/stubs/test_FedCablingBuilder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
 #include "CondFormats/DataRecord/interface/SiStripFedCablingRcd.h"
 #include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
+#include "DataFormats/SiStripCommon/interface/SiStripConstants.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"
 #include <iostream>
 #include <sstream>
 
+/**
+   @class test_FedCablingBuilder 
+   @brief Simple class that analyzes Digis produced by RawToDigi unpacker
+*/
+class test_FedCablingBuilder : public edm::one::EDAnalyzer<> {
+public:
+  test_FedCablingBuilder(const edm::ParameterSet&) : cablingToken_(esConsumes()) {}
+  ~test_FedCablingBuilder() override = default;
+  void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  const edm::ESGetToken<SiStripFedCabling, SiStripFedCablingRcd> cablingToken_;
+};
+
 using namespace std;
 using namespace sistrip;
 
 // -----------------------------------------------------------------------------
-//
 void test_FedCablingBuilder::analyze(const edm::Event& event, const edm::EventSetup& setup) {
   LogTrace(mlCabling_) << "[test_FedCablingBuilder::" << __func__ << "]"
                        << " Dumping all FED connections...";
-
-  edm::ESHandle<SiStripFedCabling> fed_cabling;
-  setup.get<SiStripFedCablingRcd>().get(fed_cabling);
+  const SiStripFedCabling* fed_cabling = &setup.getData(cablingToken_);
+  // fec cabling
+  std::stringstream ss;
+  ss << "[test_AnalyzeCabling::" << __func__ << "]"
+     << " Dumping all SiStripModule objects in FED cabling..." << std::endl
+     << fed_cabling;
+  LogTrace(mlCabling_) << ss.str();
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(test_FedCablingBuilder);
diff --git a/OnlineDB/SiStripESSources/test/stubs/test_FedCablingBuilder.h b/OnlineDB/SiStripESSources/test/stubs/test_FedCablingBuilder.h
diff --git a/OnlineDB/SiStripESSources/test/stubs/test_NoiseBuilder.cc b/OnlineDB/SiStripESSources/test/stubs/test_NoiseBuilder.cc
@@ -1,13 +1,30 @@
-
-#include "OnlineDB/SiStripESSources/test/stubs/test_NoiseBuilder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
 #include "CondFormats/DataRecord/interface/SiStripNoisesRcd.h"
 #include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
+#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
+#include "FWCore/Framework/interface/one/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 <iostream>
 #include <sstream>
 
+/**
+   @class test_NoiseBuilder 
+   @brief Simple class that analyzes Digis produced by RawToDigi unpacker
+*/
+class test_NoiseBuilder : public edm::one::EDAnalyzer<> {
+public:
+  test_NoiseBuilder(const edm::ParameterSet&) : noiseToken_(esConsumes()) {}
+  ~test_NoiseBuilder() override = default;
+  void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  const edm::ESGetToken<SiStripNoises, SiStripNoisesRcd> noiseToken_;
+};
+
 using namespace std;
 using namespace sistrip;
 
@@ -17,8 +34,7 @@ void test_NoiseBuilder::analyze(const edm::Event& event, const edm::EventSetup&
   LogTrace(mlCabling_) << "[test_NoiseBuilder::" << __func__ << "]"
                        << " Dumping all FED connections...";
 
-  edm::ESHandle<SiStripNoises> noise;
-  setup.get<SiStripNoisesRcd>().get(noise);
+  const SiStripNoises* noise = &setup.getData(noiseToken_);
 
   // Retrieve DetIds in Noise object
   vector<uint32_t> det_ids;
@@ -51,3 +67,6 @@ void test_NoiseBuilder::analyze(const edm::Event& event, const edm::EventSetup&
     LogTrace(mlCabling_) << ss.str();
   }
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(test_NoiseBuilder);
diff --git a/OnlineDB/SiStripESSources/test/stubs/test_NoiseBuilder.h b/OnlineDB/SiStripESSources/test/stubs/test_NoiseBuilder.h
diff --git a/OnlineDB/SiStripESSources/test/stubs/test_PedestalsBuilder.cc b/OnlineDB/SiStripESSources/test/stubs/test_PedestalsBuilder.cc
@@ -1,5 +1,9 @@
 
-#include "OnlineDB/SiStripESSources/test/stubs/test_PedestalsBuilder.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 "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
@@ -8,17 +12,29 @@
 #include <iostream>
 #include <sstream>
 
+/**
+   @class test_PedestalsBuilder 
+   @brief Simple class that analyzes Digis produced by RawToDigi unpacker
+*/
+class test_PedestalsBuilder : public edm::EDAnalyzer {
+public:
+  test_PedestalsBuilder(const edm::ParameterSet&) : pedToken_(esConsumes()) {}
+  virtual ~test_PedestalsBuilder() override = default;
+  void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  const edm::ESGetToken<SiStripPedestals, SiStripPedestalsRcd> pedToken_;
+};
+
 using namespace std;
 using namespace sistrip;
 
 // -----------------------------------------------------------------------------
-//
 void test_PedestalsBuilder::analyze(const edm::Event& event, const edm::EventSetup& setup) {
   LogTrace(mlCabling_) << "[test_PedestalsBuilder::" << __func__ << "]"
                        << " Dumping all FED connections...";
 
-  edm::ESHandle<SiStripPedestals> peds;
-  setup.get<SiStripPedestalsRcd>().get(peds);
+  const SiStripPedestals* peds = &setup.getData(pedToken_);
 
   // Retrieve DetIds in Pedestals object
   vector<uint32_t> det_ids;
@@ -50,3 +66,6 @@ void test_PedestalsBuilder::analyze(const edm::Event& event, const edm::EventSet
     LogTrace(mlCabling_) << ss.str();
   }
 }
+
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(test_PedestalsBuilder);