Skip to content

Run3-hcx325 Update the analyzer codes in CondTools/Hcal to conform with multithreaded application #35885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Oct 30, 2021
Merged

Run3-hcx325 Update the analyzer codes in CondTools/Hcal to conform with multithreaded application #35885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CondTools/Hcal/interface/BoostIODBReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/interface/BoostIODBWriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/interface/HcalAutoPedestalValidator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/interface/HcalGainsCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/interface/HcalPedestalWidthsCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/interface/HcalPedestalsCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/interface/HcalQIEDataCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/plugins/BufferedBoostIODBWriter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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 {}
Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/plugins/HcalDumpConditions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions CondTools/Hcal/test/HcalConditionsTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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");
Expand Down