Skip to content

Commit 338290a

Browse files
thomreisthomreis
committed
Implement some review comments.
1 parent ae95ae2 commit 338290a

File tree

14 files changed

+67
-99
lines changed

14 files changed

+67
-99
lines changed

‎CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
*
77
*/
88

9-
#include <FWCore/Framework/interface/one/EDAnalyzer.h>
10-
#include <FWCore/Framework/interface/Event.h>
11-
#include <FWCore/Framework/interface/MakerMacros.h>
9+
#include "FWCore/Framework/interface/global/EDAnalyzer.h"
10+
#include "FWCore/Framework/interface/Event.h"
11+
#include "FWCore/Framework/interface/MakerMacros.h"
1212
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1313

1414
#include "CondFormats/DataRecord/interface/EcalGlobalShowerContainmentCorrectionsVsEtaRcd.h"
@@ -17,14 +17,14 @@
1717

1818
#include "DataFormats/EcalDetId/interface/EBDetId.h"
1919

20-
class EcalContainmentCorrectionAnalyzer : public edm::one::EDAnalyzer<> {
20+
class EcalContainmentCorrectionAnalyzer : public edm::global::EDAnalyzer<> {
2121
public:
22-
EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps);
23-
~EcalContainmentCorrectionAnalyzer();
22+
explicit EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps);
23+
~EcalContainmentCorrectionAnalyzer() override = default;
2424

25-
protected:
26-
void analyze(edm::Event const &iEvent, const edm::EventSetup &iSetup);
25+
void analyze(edm::StreamID, edm::Event const &, edm::EventSetup const &) const override;
2726

27+
protected:
2828
const edm::ESGetToken<EcalGlobalShowerContainmentCorrectionsVsEta, EcalGlobalShowerContainmentCorrectionsVsEtaRcd>
2929
esToken_;
3030
};
@@ -34,9 +34,9 @@ DEFINE_FWK_MODULE(EcalContainmentCorrectionAnalyzer);
3434
EcalContainmentCorrectionAnalyzer::EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps)
3535
: esToken_(esConsumes()) {}
3636

37-
EcalContainmentCorrectionAnalyzer::~EcalContainmentCorrectionAnalyzer() {}
38-
39-
void EcalContainmentCorrectionAnalyzer::analyze(edm::Event const &iEvent, const edm::EventSetup &iSetup) {
37+
void EcalContainmentCorrectionAnalyzer::analyze(edm::StreamID,
38+
edm::Event const &iEvent,
39+
const edm::EventSetup &iSetup) const {
4040
const auto &corr = iSetup.getData(esToken_);
4141

4242
for (int i = 1; i < 86; ++i) {

‎CalibCalorimetry/EcalLaserCorrection/test/EcalLaserDbAnalyzer.cc

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <memory>
77

88
// user include files
9-
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
9+
#include "FWCore/Framework/interface/global/EDAnalyzer.h"
1010
#include "FWCore/Framework/interface/MakerMacros.h"
1111
#include "FWCore/Framework/interface/EventSetup.h"
1212

@@ -20,12 +20,12 @@
2020

2121
#include "DataFormats/EcalDetId/interface/EBDetId.h"
2222

23-
class EcalLaserDbAnalyzer : public edm::one::EDAnalyzer<> {
23+
class EcalLaserDbAnalyzer : public edm::global::EDAnalyzer<> {
2424
public:
2525
explicit EcalLaserDbAnalyzer(const edm::ParameterSet&);
26-
~EcalLaserDbAnalyzer();
26+
~EcalLaserDbAnalyzer() override = default;
2727

28-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
28+
void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override;
2929

3030
private:
3131
// ----------member data ---------------------------
@@ -45,14 +45,12 @@ class EcalLaserDbAnalyzer : public edm::one::EDAnalyzer<> {
4545
//
4646
EcalLaserDbAnalyzer::EcalLaserDbAnalyzer(const edm::ParameterSet& iConfig) : laserDbToken_(esConsumes()) {}
4747

48-
EcalLaserDbAnalyzer::~EcalLaserDbAnalyzer() {}
49-
5048
//
5149
// member functions
5250
//
5351

5452
// ------------ method called to produce the data ------------
55-
void EcalLaserDbAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
53+
void EcalLaserDbAnalyzer::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const& iSetup) const {
5654
// get record from offline DB
5755
const auto& setup = iSetup.getData(laserDbToken_);
5856
edm::LogInfo("EcalLaserDbService") << "EcalLaserDbAnalyzer::analyze-> got EcalLaserDbRecord:";

‎CalibCalorimetry/EcalLaserCorrection/test/EcalLaserTestAnalyzer.cc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ using namespace std;
3131
class EcalLaserTestAnalyzer : public edm::one::EDAnalyzer<> {
3232
public:
3333
explicit EcalLaserTestAnalyzer(const edm::ParameterSet&);
34-
~EcalLaserTestAnalyzer();
34+
~EcalLaserTestAnalyzer() override = default;
3535

36-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
36+
void analyze(edm::Event const&, edm::EventSetup const&) override;
3737

3838
private:
3939
// std::string m_timetype;
@@ -84,11 +84,6 @@ EcalLaserTestAnalyzer::EcalLaserTestAnalyzer(const edm::ParameterSet& iConfig)
8484
// }
8585
}
8686

87-
EcalLaserTestAnalyzer::~EcalLaserTestAnalyzer() {
88-
// do anything here that needs to be done at desctruction time
89-
// (e.g. close files, deallocate resources etc.)
90-
}
91-
9287
//
9388
// member functions
9489
//

‎Calibration/Tools/test/testEcalRingCalibrationTools.cc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
class testEcalRingCalibrationTools : public edm::one::EDAnalyzer<> {
3939
public:
4040
explicit testEcalRingCalibrationTools(const edm::ParameterSet&);
41-
~testEcalRingCalibrationTools();
41+
~testEcalRingCalibrationTools() override = default;
4242

43-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
43+
void analyze(const edm::Event&, const edm::EventSetup&) override;
4444

4545
private:
4646
// ----------member data ---------------------------
@@ -67,11 +67,6 @@ testEcalRingCalibrationTools::testEcalRingCalibrationTools(const edm::ParameterS
6767
// fullEcalDump_=iConfig.getUntrackedParameter<bool>("fullEcalDump",false);
6868
}
6969

70-
testEcalRingCalibrationTools::~testEcalRingCalibrationTools() {
71-
// do anything here that needs to be done at desctruction time
72-
// (e.g. close files, deallocate resources etc.)
73-
}
74-
7570
void testEcalRingCalibrationTools::build(const CaloGeometry& cg, DetId::Detector det, int subdetn, const char* name) {
7671
std::fstream f(name, std::ios_base::out);
7772
const CaloSubdetectorGeometry* geom = cg.getSubdetectorGeometry(det, subdetn);

‎CondFormats/EcalObjects/test/stubs/EcalObjectAnalyzer.cc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ simple analyzer to dump information about ECAL cond objects
77
----------------------------------------------------------------------*/
88

99
#include <sstream>
10-
#include "FWCore/Framework/interface/one/EDAnalyzer.h"
10+
#include "FWCore/Framework/interface/global/EDAnalyzer.h"
1111
#include "FWCore/Framework/interface/Event.h"
1212
#include "FWCore/Framework/interface/MakerMacros.h"
1313
#include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -57,11 +57,12 @@ simple analyzer to dump information about ECAL cond objects
5757

5858
using namespace std;
5959

60-
class EcalObjectAnalyzer : public edm::one::EDAnalyzer<> {
60+
class EcalObjectAnalyzer : public edm::global::EDAnalyzer<> {
6161
public:
6262
explicit EcalObjectAnalyzer(edm::ParameterSet const &p);
63-
virtual ~EcalObjectAnalyzer() {}
64-
virtual void analyze(const edm::Event &e, const edm::EventSetup &c);
63+
~EcalObjectAnalyzer() override = default;
64+
65+
void analyze(edm::StreamID, edm::Event const &, edm::EventSetup const &) const override;
6566

6667
private:
6768
const edm::ESGetToken<EcalPedestals, EcalPedestalsRcd> pedestalsToken_;
@@ -96,7 +97,7 @@ EcalObjectAnalyzer::EcalObjectAnalyzer(edm::ParameterSet const &p)
9697
laserAPDPNRatiosRefToken_(esConsumes()),
9798
mappingElectronicsToken_(esConsumes()) {}
9899

99-
void EcalObjectAnalyzer::analyze(const edm::Event &e, const edm::EventSetup &context) {
100+
void EcalObjectAnalyzer::analyze(edm::StreamID, const edm::Event &e, const edm::EventSetup &context) const {
100101
using namespace edm::eventsetup;
101102
// Context is not used.
102103
edm::LogVerbatim("EcalObjectAnalyzer") << ">>> EcalObjectAnalyzer: processing run " << e.id().run()

‎CondTools/Ecal/test/stubs/EcalTestConditionAnalyzer.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@
5555
class EcalTestConditionAnalyzer : public edm::one::EDAnalyzer<> {
5656
public:
5757
explicit EcalTestConditionAnalyzer(const edm::ParameterSet&);
58+
~EcalTestConditionAnalyzer() override = default;
5859

59-
private:
60-
virtual void beginJob() {}
61-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
62-
virtual void endJob() {}
60+
void analyze(edm::Event const&, edm::EventSetup const&) override;
6361

62+
private:
6463
const edm::ESGetToken<EcalADCToGeVConstant, EcalADCToGeVConstantRcd> adcToGeVConstantToken_;
6564
const edm::ESGetToken<EcalChannelStatus, EcalChannelStatusRcd> channelStatusToken_;
6665
const edm::ESGetToken<EcalGainRatios, EcalGainRatiosRcd> gainRatiosToken_;

‎RecoCaloTools/Navigation/test/stubs/CaloNavigationAnalyzer.cc

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
class CaloNavigationAnalyzer : public edm::one::EDAnalyzer<> {
2828
public:
2929
explicit CaloNavigationAnalyzer(const edm::ParameterSet&);
30-
~CaloNavigationAnalyzer();
30+
~CaloNavigationAnalyzer() override = default;
3131

32-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
32+
void analyze(edm::Event const&, edm::EventSetup const&) override;
3333

3434
private:
3535
const edm::ESGetToken<CaloTopology, CaloTopologyRecord> esToken_;
@@ -41,11 +41,6 @@ class CaloNavigationAnalyzer : public edm::one::EDAnalyzer<> {
4141
//
4242
CaloNavigationAnalyzer::CaloNavigationAnalyzer(const edm::ParameterSet& iConfig) : esToken_(esConsumes()), pass_(0) {}
4343

44-
CaloNavigationAnalyzer::~CaloNavigationAnalyzer() {
45-
// do anything here that needs to be done at desctruction time
46-
// (e.g. close files, deallocate resources etc.)
47-
}
48-
4944
//
5045
// member functions
5146
//

‎RecoEcal/EgammaCoreTools/test/filterProbClusters.cc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
class ProbClustersFilter : public edm::stream::EDFilter<> {
3030
public:
3131
explicit ProbClustersFilter(const edm::ParameterSet&);
32-
~ProbClustersFilter();
32+
~ProbClustersFilter() override = default;
3333

34-
private:
35-
virtual bool filter(edm::Event&, const edm::EventSetup&);
34+
bool filter(edm::Event&, const edm::EventSetup&) override;
3635

3736
private:
3837
int maxDistance_;
@@ -62,8 +61,6 @@ ProbClustersFilter::ProbClustersFilter(const edm::ParameterSet& iConfig)
6261
topologyToken_(esConsumes()),
6362
severityLevelAlgoToken_(esConsumes()) {}
6463

65-
ProbClustersFilter::~ProbClustersFilter() {}
66-
6764
bool ProbClustersFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
6865
int problematicClusters = 0;
6966

‎RecoEcal/EgammaCoreTools/test/testEcalClusterSeverityAlgo.cc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,16 @@ Description: <one line class summary>
5454
class testEcalClusterSeverityAlgo : public edm::one::EDAnalyzer<> {
5555
public:
5656
explicit testEcalClusterSeverityAlgo(const edm::ParameterSet&);
57-
~testEcalClusterSeverityAlgo();
57+
~testEcalClusterSeverityAlgo() override;
5858

59-
edm::InputTag barrelClusterCollection_;
60-
edm::InputTag endcapClusterCollection_;
61-
edm::InputTag reducedBarrelRecHitCollection_;
62-
edm::InputTag reducedEndcapRecHitCollection_;
63-
edm::InputTag mcTruthCollection_;
59+
void analyze(const edm::Event&, const edm::EventSetup&) override;
60+
void endJob() override;
61+
62+
const edm::InputTag barrelClusterCollection_;
63+
const edm::InputTag endcapClusterCollection_;
64+
const edm::InputTag reducedBarrelRecHitCollection_;
65+
const edm::InputTag reducedEndcapRecHitCollection_;
66+
const edm::InputTag mcTruthCollection_;
6467

6568
struct ClusterSeverityTreeContent {
6669
#define NMAXOBJ 50
@@ -123,9 +126,6 @@ class testEcalClusterSeverityAlgo : public edm::one::EDAnalyzer<> {
123126
}
124127

125128
private:
126-
virtual void analyze(const edm::Event&, const edm::EventSetup&);
127-
virtual void endJob();
128-
129129
const edm::EDGetTokenT<reco::SuperClusterCollection> ebSCToken_;
130130
const edm::EDGetTokenT<reco::SuperClusterCollection> eeSCToken_;
131131
const edm::EDGetTokenT<EcalRecHitCollection> ebRecHitsToken_;

‎RecoEcal/EgammaCoreTools/test/testEcalClusterTools.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ Description: <one line class summary>
3535
class testEcalClusterTools : public edm::one::EDAnalyzer<> {
3636
public:
3737
explicit testEcalClusterTools(const edm::ParameterSet&);
38+
~testEcalClusterTools() override = default;
3839

39-
private:
40-
virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
40+
void analyze(const edm::Event&, const edm::EventSetup&) override;
4141

42+
private:
4243
using ClusterTools = noZS::EcalClusterTools; // alternatively just EcalClusterTools
4344

4445
const edm::EDGetToken barrelClusterToken_;

0 commit comments

Comments
 (0)