From d1f95c71f624c03ae2bcddf481ade74ac0636f44 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 28 Oct 2021 17:45:19 +0200 Subject: [PATCH] Update the analyzer codes in CondTools/Hcal to conform with multithreaded application --- CondTools/Hcal/interface/BoostIODBReader.h | 4 ++-- CondTools/Hcal/interface/BoostIODBWriter.h | 4 ++-- CondTools/Hcal/interface/HcalAutoPedestalValidator.h | 4 ++-- CondTools/Hcal/interface/HcalGainsCheck.h | 4 ++-- CondTools/Hcal/interface/HcalPedestalWidthsCheck.h | 4 ++-- CondTools/Hcal/interface/HcalPedestalsCheck.h | 4 ++-- CondTools/Hcal/interface/HcalQIEDataCheck.h | 4 ++-- CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc | 4 ++-- CondTools/Hcal/plugins/HcalDumpConditions.cc | 4 ++-- CondTools/Hcal/test/HcalConditionsTest.cc | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CondTools/Hcal/interface/BoostIODBReader.h b/CondTools/Hcal/interface/BoostIODBReader.h index 95fc36c19357e..2c9d24448c2f9 100644 --- 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 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 index 0f661e72e3394..e3669ac3deb4a 100644 --- 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 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 index a90a0f725d15b..6098d63d3f777 100644 --- a/CondTools/Hcal/interface/HcalAutoPedestalValidator.h +++ b/CondTools/Hcal/interface/HcalAutoPedestalValidator.h @@ -12,7 +12,7 @@ #include #include -#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 index 6a39c30475d95..5a2e9e029d83e 100644 --- a/CondTools/Hcal/interface/HcalGainsCheck.h +++ b/CondTools/Hcal/interface/HcalGainsCheck.h @@ -14,7 +14,7 @@ #include #include -#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 index d96c775bb88fe..a9a80c4e190b8 100644 --- a/CondTools/Hcal/interface/HcalPedestalWidthsCheck.h +++ b/CondTools/Hcal/interface/HcalPedestalWidthsCheck.h @@ -14,7 +14,7 @@ #include #include -#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 index 3112ee24c211f..173b1b5f39b43 100644 --- a/CondTools/Hcal/interface/HcalPedestalsCheck.h +++ b/CondTools/Hcal/interface/HcalPedestalsCheck.h @@ -14,7 +14,7 @@ #include #include -#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 index 3ea71c0b1b3ae..b2e0ed06b9aab 100644 --- a/CondTools/Hcal/interface/HcalQIEDataCheck.h +++ b/CondTools/Hcal/interface/HcalQIEDataCheck.h @@ -13,7 +13,7 @@ #include #include -#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 index 1c2517d0d0331..cbda375679554 100644 --- a/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc +++ b/CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc @@ -7,7 +7,7 @@ #include #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 index 4061182459d49..a1e783cb9f3c1 100644 --- a/CondTools/Hcal/plugins/HcalDumpConditions.cc +++ b/CondTools/Hcal/plugins/HcalDumpConditions.cc @@ -16,7 +16,7 @@ September 21, 2009 Added HcalLutMetadata - Gena Kukartsev #include #include #include -#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("outFilePrefix", "Dump"); diff --git a/CondTools/Hcal/test/HcalConditionsTest.cc b/CondTools/Hcal/test/HcalConditionsTest.cc index 32fab2ee0e87a..ebb7430515534 100644 --- a/CondTools/Hcal/test/HcalConditionsTest.cc +++ b/CondTools/Hcal/test/HcalConditionsTest.cc @@ -14,7 +14,7 @@ R.Ofierzynski - 2.Oct. 2007 #include #include #include -#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("outFilePrefix", "Dump");