Merge pull request #35885 from bsunanda/Run3-hcx325

Run3-hcx325 Update the analyzer codes in CondTools/Hcal to conform with multithreaded application
cms-sw · Oct 30, 2021 · f1d564e · f1d564e
2 parents 9d91a00 + d1f95c7
commit f1d564e
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/CondTools/Hcal/interface/BoostIODBReader.h b/CondTools/Hcal/interface/BoostIODBReader.h
@@ -26,7 +26,7 @@
 #include "CondFormats/Serialization/interface/eos/portable_oarchive.hpp"
 
 #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"
 
@@ -39,7 +39,7 @@
 // class declaration
 //
 template <class DataType, class RecordType>
-class BoostIODBReader : public edm::EDAnalyzer {
+class BoostIODBReader : public edm::one::EDAnalyzer<> {
 public:
   typedef DataType data_type;
   typedef RecordType record_type;

diff --git a/CondTools/Hcal/interface/BoostIODBWriter.h b/CondTools/Hcal/interface/BoostIODBWriter.h
@@ -27,7 +27,7 @@
 #include "CondFormats/Serialization/interface/eos/portable_iarchive.hpp"
 
 #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/Utilities/interface/Exception.h"
@@ -41,7 +41,7 @@
 // class declaration
 //
 template <class DataType>
-class BoostIODBWriter : public edm::EDAnalyzer {
+class BoostIODBWriter : public edm::one::EDAnalyzer<> {
 public:
   typedef DataType data_type;
 

diff --git a/CondTools/Hcal/interface/HcalAutoPedestalValidator.h b/CondTools/Hcal/interface/HcalAutoPedestalValidator.h
@@ -12,7 +12,7 @@
 #include <vector>
 #include <algorithm>
 
-#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"
 
@@ -37,7 +37,7 @@
 #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 
-class HcalAutoPedestalValidator : public edm::EDAnalyzer {
+class HcalAutoPedestalValidator : public edm::one::EDAnalyzer<> {
 public:
   HcalAutoPedestalValidator(edm::ParameterSet const& ps);
 

diff --git a/CondTools/Hcal/interface/HcalGainsCheck.h b/CondTools/Hcal/interface/HcalGainsCheck.h
@@ -14,7 +14,7 @@
 #include <vector>
 #include <algorithm>
 
-#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"
 
@@ -43,7 +43,7 @@
 #include "TH1.h"
 #include "TH2.h"
 
-class HcalGainsCheck : public edm::EDAnalyzer {
+class HcalGainsCheck : public edm::one::EDAnalyzer<> {
 public:
   HcalGainsCheck(edm::ParameterSet const& ps);
 

diff --git a/CondTools/Hcal/interface/HcalPedestalWidthsCheck.h b/CondTools/Hcal/interface/HcalPedestalWidthsCheck.h
@@ -14,7 +14,7 @@
 #include <vector>
 #include <algorithm>
 
-#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"
 
@@ -39,7 +39,7 @@
 #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 
-class HcalPedestalWidthsCheck : public edm::EDAnalyzer {
+class HcalPedestalWidthsCheck : public edm::one::EDAnalyzer<> {
 public:
   HcalPedestalWidthsCheck(edm::ParameterSet const& ps);
 

diff --git a/CondTools/Hcal/interface/HcalPedestalsCheck.h b/CondTools/Hcal/interface/HcalPedestalsCheck.h
@@ -14,7 +14,7 @@
 #include <vector>
 #include <algorithm>
 
-#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"
 
@@ -39,7 +39,7 @@
 #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 
-class HcalPedestalsCheck : public edm::EDAnalyzer {
+class HcalPedestalsCheck : public edm::one::EDAnalyzer<> {
 public:
   HcalPedestalsCheck(edm::ParameterSet const& ps);
 

diff --git a/CondTools/Hcal/interface/HcalQIEDataCheck.h b/CondTools/Hcal/interface/HcalQIEDataCheck.h
@@ -13,7 +13,7 @@
 #include <vector>
 #include <algorithm>
 
-#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"
 
@@ -34,7 +34,7 @@
 #include "CalibCalorimetry/HcalAlgos/interface/HcalDbASCIIIO.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 
-class HcalQIEDataCheck : public edm::EDAnalyzer {
+class HcalQIEDataCheck : public edm::one::EDAnalyzer<> {
 public:
   HcalQIEDataCheck(edm::ParameterSet const& ps);
 

diff --git a/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc b/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc
@@ -7,7 +7,7 @@
 #include <memory>
 
 #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/MakerMacros.h"
 
@@ -20,7 +20,7 @@
 //
 // class declaration
 //
-class BufferedBoostIODBWriter : public edm::EDAnalyzer {
+class BufferedBoostIODBWriter : public edm::one::EDAnalyzer<> {
 public:
   explicit BufferedBoostIODBWriter(const edm::ParameterSet&);
   ~BufferedBoostIODBWriter() override {}

diff --git a/CondTools/Hcal/plugins/HcalDumpConditions.cc b/CondTools/Hcal/plugins/HcalDumpConditions.cc
@@ -16,7 +16,7 @@ September 21, 2009  Added HcalLutMetadata - Gena Kukartsev
 #include <iostream>
 #include <fstream>
 #include <sstream>
-#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"
 
@@ -35,7 +35,7 @@ September 21, 2009  Added HcalLutMetadata - Gena Kukartsev
 #include "CondFormats/HcalObjects/interface/AllObjects.h"
 
 namespace edmtest {
-  class HcalDumpConditions : public edm::EDAnalyzer {
+  class HcalDumpConditions : public edm::one::EDAnalyzer<> {
   public:
     explicit HcalDumpConditions(edm::ParameterSet const& p) {
       front = p.getUntrackedParameter<std::string>("outFilePrefix", "Dump");

diff --git a/CondTools/Hcal/test/HcalConditionsTest.cc b/CondTools/Hcal/test/HcalConditionsTest.cc
@@ -14,7 +14,7 @@ R.Ofierzynski - 2.Oct. 2007
 #include <fstream>
 #include <sstream>
 #include <map>
-#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"
 
@@ -41,7 +41,7 @@ R.Ofierzynski - 2.Oct. 2007
 #include "FWCore/Framework/interface/IOVSyncValue.h"
 
 namespace edmtest {
-  class HcalConditionsTest : public edm::EDAnalyzer {
+  class HcalConditionsTest : public edm::one::EDAnalyzer<> {
   public:
     explicit HcalConditionsTest(edm::ParameterSet const& p) {
       front = p.getUntrackedParameter<std::string>("outFilePrefix", "Dump");