Thread friendly modules in EventFilter/EcalTBRawToDigi

Convert to thread friendly module types
cms-sw · Jun 8, 2022 · e85ab2c · e85ab2c
1 parent 03c0e6a
commit e85ab2c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 36 deletions.
diff --git a/EventFilter/EcalTBRawToDigi/interface/EcalDCC07UnpackingModule.h b/EventFilter/EcalTBRawToDigi/interface/EcalDCC07UnpackingModule.h
@@ -10,7 +10,7 @@
  */
 
 #include <FWCore/Framework/interface/MakerMacros.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include <FWCore/Framework/interface/stream/EDProducer.h>
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include <iostream>
@@ -22,7 +22,7 @@ class CamacTBDataFormatter;
 class TableDataFormatter;
 class MatacqTBDataFormatter;
 
-class EcalDCCTB07UnpackingModule : public edm::EDProducer {
+class EcalDCCTB07UnpackingModule : public edm::stream::EDProducer<> {
 public:
   /// Constructor
   EcalDCCTB07UnpackingModule(const edm::ParameterSet& pset);
@@ -33,12 +33,6 @@ class EcalDCCTB07UnpackingModule : public edm::EDProducer {
   /// Produce digis out of raw data
   void produce(edm::Event& e, const edm::EventSetup& c) override;
 
-  // BeginJob
-  void beginJob() override;
-
-  // EndJob
-  void endJob(void) override;
-
 private:
   EcalTB07DaqFormatter* formatter_;
   EcalSupervisorTBDataFormatter* ecalSupervisorFormatter_;

diff --git a/EventFilter/EcalTBRawToDigi/interface/EcalDCCUnpackingModule.h b/EventFilter/EcalTBRawToDigi/interface/EcalDCCUnpackingModule.h
@@ -9,7 +9,7 @@
  */
 
 #include <FWCore/Framework/interface/MakerMacros.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include <FWCore/Framework/interface/stream/EDProducer.h>
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include <iostream>
@@ -21,7 +21,7 @@ class CamacTBDataFormatter;
 class TableDataFormatter;
 class MatacqTBDataFormatter;
 
-class EcalDCCTBUnpackingModule : public edm::EDProducer {
+class EcalDCCTBUnpackingModule : public edm::stream::EDProducer<> {
 public:
   /// Constructor
   EcalDCCTBUnpackingModule(const edm::ParameterSet& pset);
@@ -32,12 +32,6 @@ class EcalDCCTBUnpackingModule : public edm::EDProducer {
   /// Produce digis out of raw data
   void produce(edm::Event& e, const edm::EventSetup& c) override;
 
-  // BeginJob
-  void beginJob() override;
-
-  // EndJob
-  void endJob(void) override;
-
 private:
   EcalTBDaqFormatter* formatter_;
   EcalSupervisorTBDataFormatter* ecalSupervisorFormatter_;

diff --git a/EventFilter/EcalTBRawToDigi/src/EcalDCC07UnpackingModule.cc b/EventFilter/EcalTBRawToDigi/src/EcalDCC07UnpackingModule.cc
@@ -154,10 +154,6 @@ EcalDCCTB07UnpackingModule::EcalDCCTB07UnpackingModule(const edm::ParameterSet&
 
 EcalDCCTB07UnpackingModule::~EcalDCCTB07UnpackingModule() { delete formatter_; }
 
-void EcalDCCTB07UnpackingModule::beginJob() {}
-
-void EcalDCCTB07UnpackingModule::endJob() {}
-
 void EcalDCCTB07UnpackingModule::produce(edm::Event& e, const edm::EventSetup& c) {
   edm::Handle<FEDRawDataCollection> rawdata;
   e.getByLabel(fedRawDataCollectionTag_, rawdata);

diff --git a/EventFilter/EcalTBRawToDigi/src/EcalDCCUnpackingModule.cc b/EventFilter/EcalTBRawToDigi/src/EcalDCCUnpackingModule.cc
@@ -74,10 +74,6 @@ EcalDCCTBUnpackingModule::EcalDCCTBUnpackingModule(const edm::ParameterSet& pset
 
 EcalDCCTBUnpackingModule::~EcalDCCTBUnpackingModule() { delete formatter_; }
 
-void EcalDCCTBUnpackingModule::beginJob() {}
-
-void EcalDCCTBUnpackingModule::endJob() {}
-
 void EcalDCCTBUnpackingModule::produce(edm::Event& e, const edm::EventSetup& c) {
   edm::Handle<FEDRawDataCollection> rawdata;
   e.getByLabel(fedRawDataCollectionTag_, rawdata);

diff --git a/EventFilter/EcalTBRawToDigi/test/stubs/EcalDCCHeaderDumperModule.cc b/EventFilter/EcalTBRawToDigi/test/stubs/EcalDCCHeaderDumperModule.cc
@@ -8,14 +8,14 @@
  *
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include <DataFormats/EcalRawData/interface/EcalRawDataCollections.h>
 #include <iostream>
 #include <vector>
 
-class EcalDCCHeaderDumperModule : public edm::EDAnalyzer {
+class EcalDCCHeaderDumperModule : public edm::one::EDAnalyzer<> {
 public:
   EcalDCCHeaderDumperModule(const edm::ParameterSet& ps) {}
 

diff --git a/EventFilter/EcalTBRawToDigi/test/stubs/EcalDigiDumperModule.cc b/EventFilter/EcalTBRawToDigi/test/stubs/EcalDigiDumperModule.cc
@@ -8,7 +8,7 @@
  *
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include <DataFormats/EcalDigi/interface/EcalDigiCollections.h>
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <vector>
 
-class EcalDigiDumperModule : public edm::EDAnalyzer {
+class EcalDigiDumperModule : public edm::one::EDAnalyzer<> {
 public:
   EcalDigiDumperModule(const edm::ParameterSet& ps) {
     verbosity = ps.getUntrackedParameter<int>("verbosity", 1);

diff --git a/EventFilter/EcalTBRawToDigi/test/stubs/EcalGraphDumperModule.cc b/EventFilter/EcalTBRawToDigi/test/stubs/EcalGraphDumperModule.cc
@@ -8,7 +8,7 @@
  *
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include <DataFormats/EcalDigi/interface/EcalDigiCollections.h>
@@ -21,7 +21,7 @@
 #include "TFile.h"
 #include "TGraph.h"
 
-class EcalGraphDumperModule : public edm::EDAnalyzer {
+class EcalGraphDumperModule : public edm::one::EDAnalyzer<> {
 public:
   EcalGraphDumperModule(const edm::ParameterSet& ps);
   ~EcalGraphDumperModule();

diff --git a/EventFilter/EcalTBRawToDigi/test/stubs/EcalHexDumperModule.cc b/EventFilter/EcalTBRawToDigi/test/stubs/EcalHexDumperModule.cc
@@ -4,7 +4,7 @@
  *
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <DataFormats/Common/interface/Handle.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
@@ -23,7 +23,7 @@
 
 #include <iomanip>
 
-class EcalHexDumperModule : public edm::EDAnalyzer {
+class EcalHexDumperModule : public edm::one::EDAnalyzer<> {
 public:
   EcalHexDumperModule(const edm::ParameterSet& ps)
       : fedRawDataCollectionTag_(ps.getParameter<edm::InputTag>("fedRawDataCollectionTag")) {

diff --git a/EventFilter/EcalTBRawToDigi/test/stubs/EcalMatacqHist.h b/EventFilter/EcalTBRawToDigi/test/stubs/EcalMatacqHist.h
@@ -14,7 +14,7 @@
  * </UL>
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 
@@ -24,7 +24,7 @@
 class TProfile;
 class TH1D;
 
-class EcalMatacqHist : public edm::EDAnalyzer {
+class EcalMatacqHist : public edm::one::EDAnalyzer<> {
 public:
   EcalMatacqHist(const edm::ParameterSet& ps);
 

diff --git a/EventFilter/EcalTBRawToDigi/test/stubs/EcalPnGraphDumperModule.cc b/EventFilter/EcalTBRawToDigi/test/stubs/EcalPnGraphDumperModule.cc
@@ -9,7 +9,7 @@
  *
  */
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include <DataFormats/EcalDigi/interface/EcalDigiCollections.h>
@@ -24,7 +24,7 @@
 #include "TFile.h"
 #include "TGraph.h"
 
-class EcalPnGraphDumperModule : public edm::EDAnalyzer {
+class EcalPnGraphDumperModule : public edm::one::EDAnalyzer<> {
 public:
   EcalPnGraphDumperModule(const edm::ParameterSet& ps);
   ~EcalPnGraphDumperModule();