Skip to content

Commit

Permalink
Try to avoid LTO warnings from Calibration/HcalAlCaRecoProducers as r…
Browse files Browse the repository at this point in the history 
…eported in the issue cms-sw#38656
  • Loading branch information
Sunanda committed Aug 19, 2022
1 parent af34412 commit 357fbf7
Show file tree
Hide file tree
Showing 12 changed files with 99 additions and 101 deletions.
10 changes: 5 additions & 5 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaDiJetsProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@
#include "Geometry/Records/interface/CaloGeometryRecord.h"
#include <iostream>

namespace alcaHcalDiJet {
namespace alCaHcalDiJetsProducer {
struct Counters {
Counters() : nAll_(0), nSelect_(0) {}
mutable std::atomic<unsigned int> nAll_, nSelect_;
};
} // namespace alcaHcalDiJet
} // namespace alCaHcalDiJetsProducer

//
// class declaration
//

class AlCaDiJetsProducer : public edm::global::EDProducer<edm::RunCache<alcaHcalDiJet::Counters>> {
class AlCaDiJetsProducer : public edm::global::EDProducer<edm::RunCache<alCaHcalDiJetsProducer::Counters>> {
public:
explicit AlCaDiJetsProducer(const edm::ParameterSet&);
~AlCaDiJetsProducer() override = default;

std::shared_ptr<alcaHcalDiJet::Counters> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
return std::make_shared<alcaHcalDiJet::Counters>();
std::shared_ptr<alCaHcalDiJetsProducer::Counters> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
return std::make_shared<alCaHcalDiJetsProducer::Counters>();
}
void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override;
Expand Down
18 changes: 9 additions & 9 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaGammaJetSelector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,26 @@
// class declaration
//

namespace AlCaGammaJet {
namespace alCaGammaJetSelector {
struct Counters {
Counters() : nProcessed_(0), nSelected_(0) {}
mutable std::atomic<unsigned int> nProcessed_, nSelected_;
};
} // namespace AlCaGammaJet
} // namespace alCaGammaJetSelector

class AlCaGammaJetSelector : public edm::stream::EDFilter<edm::GlobalCache<AlCaGammaJet::Counters> > {
class AlCaGammaJetSelector : public edm::stream::EDFilter<edm::GlobalCache<alCaGammaJetSelector::Counters> > {
public:
explicit AlCaGammaJetSelector(const edm::ParameterSet&, const AlCaGammaJet::Counters* count);
explicit AlCaGammaJetSelector(const edm::ParameterSet&, const alCaGammaJetSelector::Counters* count);
~AlCaGammaJetSelector() override = default;

static std::unique_ptr<AlCaGammaJet::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<AlCaGammaJet::Counters>();
static std::unique_ptr<alCaGammaJetSelector::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<alCaGammaJetSelector::Counters>();
}

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
bool filter(edm::Event&, const edm::EventSetup&) override;
void endStream() override;
static void globalEndJob(const AlCaGammaJet::Counters* counters);
static void globalEndJob(const alCaGammaJetSelector::Counters* counters);

private:
void beginRun(edm::Run const&, edm::EventSetup const&) override {}
Expand Down Expand Up @@ -87,7 +87,7 @@ class AlCaGammaJetSelector : public edm::stream::EDFilter<edm::GlobalCache<AlCaG
//
// constructors and destructor
//
AlCaGammaJetSelector::AlCaGammaJetSelector(const edm::ParameterSet& iConfig, const AlCaGammaJet::Counters* counters) {
AlCaGammaJetSelector::AlCaGammaJetSelector(const edm::ParameterSet& iConfig, const alCaGammaJetSelector::Counters* counters) {
nProcessed_ = 0;
nSelected_ = 0;

Expand Down Expand Up @@ -153,7 +153,7 @@ void AlCaGammaJetSelector::endStream() {

// ------------ method called once each job just after ending the event loop ------------

void AlCaGammaJetSelector::globalEndJob(const AlCaGammaJet::Counters* count) {
void AlCaGammaJetSelector::globalEndJob(const alCaGammaJetSelector::Counters* count) {
edm::LogWarning("AlCaGammaJet") << "Finds " << count->nSelected_ << " good events out of " << count->nProcessed_;
}

Expand Down
22 changes: 10 additions & 12 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaHBHEMuonFilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,25 @@
// class declaration
//

namespace AlCaHBHEMuons {
namespace alCaHBHEMuonFilter {
struct Counters {
Counters() : nAll_(0), nGood_(0), nFinal_(0) {}
mutable std::atomic<unsigned int> nAll_, nGood_, nFinal_;
};
} // namespace AlCaHBHEMuons
} // namespace alCaHBHEMuonFilter

class AlCaHBHEMuonFilter : public edm::stream::EDFilter<edm::GlobalCache<AlCaHBHEMuons::Counters> > {
class AlCaHBHEMuonFilter : public edm::stream::EDFilter<edm::GlobalCache<alCaHBHEMuonFilter::Counters> > {
public:
explicit AlCaHBHEMuonFilter(edm::ParameterSet const&, const AlCaHBHEMuons::Counters* count);
~AlCaHBHEMuonFilter() override;
explicit AlCaHBHEMuonFilter(edm::ParameterSet const&, const alCaHBHEMuonFilter::Counters* count);
~AlCaHBHEMuonFilter() override = default;

static std::unique_ptr<AlCaHBHEMuons::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<AlCaHBHEMuons::Counters>();
static std::unique_ptr<alCaHBHEMuonFilter::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<alCaHBHEMuonFilter::Counters>();
}

bool filter(edm::Event&, edm::EventSetup const&) override;
void endStream() override;
static void globalEndJob(const AlCaHBHEMuons::Counters* counters);
static void globalEndJob(const alCaHBHEMuonFilter::Counters* counters);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
Expand Down Expand Up @@ -91,7 +91,7 @@ class AlCaHBHEMuonFilter : public edm::stream::EDFilter<edm::GlobalCache<AlCaHBH
//
// constructors and destructor
//
AlCaHBHEMuonFilter::AlCaHBHEMuonFilter(edm::ParameterSet const& iConfig, const AlCaHBHEMuons::Counters* count)
AlCaHBHEMuonFilter::AlCaHBHEMuonFilter(edm::ParameterSet const& iConfig, const alCaHBHEMuonFilter::Counters* count)
: nRun_(0),
nAll_(0),
nGood_(0),
Expand Down Expand Up @@ -121,8 +121,6 @@ AlCaHBHEMuonFilter::AlCaHBHEMuonFilter(edm::ParameterSet const& iConfig, const A
edm::LogVerbatim("HBHEMuon") << "Trigger[" << k << "] " << trigNames_[k] << "\n";
} // AlCaHBHEMuonFilter::AlCaHBHEMuonFilter constructor

AlCaHBHEMuonFilter::~AlCaHBHEMuonFilter() {}

//
// member functions
//
Expand Down Expand Up @@ -236,7 +234,7 @@ void AlCaHBHEMuonFilter::endStream() {
globalCache()->nFinal_ += nFinal_;
}

void AlCaHBHEMuonFilter::globalEndJob(const AlCaHBHEMuons::Counters* count) {
void AlCaHBHEMuonFilter::globalEndJob(const alCaHBHEMuonFilter::Counters* count) {
edm::LogVerbatim("HBHEMuon") << "Selects " << count->nFinal_ << " out of " << count->nGood_ << " good events out of "
<< count->nAll_ << " total # of events\n";
}
Expand Down
18 changes: 9 additions & 9 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaHBHEMuonProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,25 @@
// class declaration
//

namespace AlCaHBHEMuons {
namespace alCaHBHEMuonProducer {
struct Counters {
Counters() : nAll_(0), nGood_(0) {}
mutable std::atomic<unsigned int> nAll_, nGood_;
};
} // namespace AlCaHBHEMuons
} // namespace alCaHBHEMuonProducer

class AlCaHBHEMuonProducer : public edm::stream::EDProducer<edm::GlobalCache<AlCaHBHEMuons::Counters> > {
class AlCaHBHEMuonProducer : public edm::stream::EDProducer<edm::GlobalCache<alCaHBHEMuonProducer::Counters> > {
public:
explicit AlCaHBHEMuonProducer(edm::ParameterSet const&, const AlCaHBHEMuons::Counters* count);
explicit AlCaHBHEMuonProducer(edm::ParameterSet const&, const alCaHBHEMuonProducer::Counters* count);
~AlCaHBHEMuonProducer() override;

static std::unique_ptr<AlCaHBHEMuons::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<AlCaHBHEMuons::Counters>();
static std::unique_ptr<alCaHBHEMuonProducer::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<alCaHBHEMuonProducer::Counters>();
}

void produce(edm::Event&, const edm::EventSetup&) override;
void endStream() override;
static void globalEndJob(const AlCaHBHEMuons::Counters* counters);
static void globalEndJob(const alCaHBHEMuonProducer::Counters* counters);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
Expand All @@ -78,7 +78,7 @@ class AlCaHBHEMuonProducer : public edm::stream::EDProducer<edm::GlobalCache<AlC
edm::EDGetTokenT<reco::MuonCollection> tok_Muon_;
};

AlCaHBHEMuonProducer::AlCaHBHEMuonProducer(edm::ParameterSet const& iConfig, const AlCaHBHEMuons::Counters* count)
AlCaHBHEMuonProducer::AlCaHBHEMuonProducer(edm::ParameterSet const& iConfig, const alCaHBHEMuonProducer::Counters* count)
: nRun_(0),
nAll_(0),
nGood_(0),
Expand Down Expand Up @@ -216,7 +216,7 @@ void AlCaHBHEMuonProducer::endStream() {
globalCache()->nGood_ += nGood_;
}

void AlCaHBHEMuonProducer::globalEndJob(const AlCaHBHEMuons::Counters* count) {
void AlCaHBHEMuonProducer::globalEndJob(const alCaHBHEMuonProducer::Counters* count) {
edm::LogVerbatim("HcalHBHEMuon") << "Finds " << count->nGood_ << " good tracks in " << count->nAll_ << " events";
}

Expand Down
18 changes: 9 additions & 9 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaHEMuonFilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,25 @@
// class declaration
//

namespace AlCaHEMuons {
namespace alCaHEMuonFilter {
struct Counters {
Counters() : nAll_(0), nGood_(0), nFinal_(0) {}
mutable std::atomic<unsigned int> nAll_, nGood_, nFinal_;
};
} // namespace AlCaHEMuons
} // namespace alCaHEMuonFilter

class AlCaHEMuonFilter : public edm::stream::EDFilter<edm::GlobalCache<AlCaHEMuons::Counters> > {
class AlCaHEMuonFilter : public edm::stream::EDFilter<edm::GlobalCache<alCaHEMuonFilter::Counters> > {
public:
explicit AlCaHEMuonFilter(edm::ParameterSet const&, const AlCaHEMuons::Counters* count);
explicit AlCaHEMuonFilter(edm::ParameterSet const&, const alCaHEMuonFilter::Counters* count);
~AlCaHEMuonFilter() override;

static std::unique_ptr<AlCaHEMuons::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<AlCaHEMuons::Counters>();
static std::unique_ptr<alCaHEMuonFilter::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<alCaHEMuonFilter::Counters>();
}

bool filter(edm::Event&, edm::EventSetup const&) override;
void endStream() override;
static void globalEndJob(const AlCaHEMuons::Counters* counters);
static void globalEndJob(const alCaHEMuonFilter::Counters* counters);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
Expand Down Expand Up @@ -89,7 +89,7 @@ class AlCaHEMuonFilter : public edm::stream::EDFilter<edm::GlobalCache<AlCaHEMuo
//
// constructors and destructor
//
AlCaHEMuonFilter::AlCaHEMuonFilter(edm::ParameterSet const& iConfig, const AlCaHEMuons::Counters* count)
AlCaHEMuonFilter::AlCaHEMuonFilter(edm::ParameterSet const& iConfig, const alCaHEMuonFilter::Counters* count)
: nRun_(0),
nAll_(0),
nGood_(0),
Expand Down Expand Up @@ -226,7 +226,7 @@ void AlCaHEMuonFilter::endStream() {
globalCache()->nFinal_ += nFinal_;
}

void AlCaHEMuonFilter::globalEndJob(const AlCaHEMuons::Counters* count) {
void AlCaHEMuonFilter::globalEndJob(const alCaHEMuonFilter::Counters* count) {
edm::LogVerbatim("HEMuon") << "Selects " << count->nFinal_ << " out of " << count->nGood_ << " good events out of "
<< count->nAll_ << " total # of events\n";
}
Expand Down
12 changes: 6 additions & 6 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHEMuonFilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
// class declaration
//

namespace alcaHcalHBHEMuon {
namespace alCaHcalHEMuonFilter {
struct Counters {
Counters() : nAll_(0), nGood_(0), nFinal_(0) {}
mutable std::atomic<unsigned int> nAll_, nGood_, nFinal_;
};
} // namespace alcaHcalHBHEMuon
} // namespace alCaHcalHEMuonFilter

class AlCaHcalHEMuonFilter : public edm::global::EDFilter<edm::RunCache<alcaHcalHBHEMuon::Counters> > {
class AlCaHcalHEMuonFilter : public edm::global::EDFilter<edm::RunCache<alCaHcalHEMuonFilter::Counters> > {
public:
AlCaHcalHEMuonFilter(edm::ParameterSet const&);
~AlCaHcalHEMuonFilter() override = default;

std::shared_ptr<alcaHcalHBHEMuon::Counters> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override;
std::shared_ptr<alCaHcalHEMuonFilter::Counters> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override;

bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override;
Expand Down Expand Up @@ -112,10 +112,10 @@ bool AlCaHcalHEMuonFilter::filter(edm::StreamID, edm::Event& iEvent, edm::EventS
} // AlCaHcalHEMuonFilter::filter

// ------------ method called when starting to processes a run ------------
std::shared_ptr<alcaHcalHBHEMuon::Counters> AlCaHcalHEMuonFilter::globalBeginRun(edm::Run const& iRun,
std::shared_ptr<alCaHcalHEMuonFilter::Counters> AlCaHcalHEMuonFilter::globalBeginRun(edm::Run const& iRun,
edm::EventSetup const&) const {
edm::LogVerbatim("HBHEMuon") << "Start the Run " << iRun.run();
return std::make_shared<alcaHcalHBHEMuon::Counters>();
return std::make_shared<alCaHcalHEMuonFilter::Counters>();
}

// ------------ method called when ending the processing of a run ------------
Expand Down
12 changes: 6 additions & 6 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalIsotrkFilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
// class declaration
//

namespace alcaHcalIsoTrk {
namespace alCaHcalIsoTrkFilter {
struct Counters {
Counters() : nAll_(0), nGood_(0), nLow_(0), nHigh_(0) {}
mutable std::atomic<unsigned int> nAll_, nGood_, nLow_, nHigh_;
};
} // namespace alcaHcalIsoTrk
} // namespace alCaHcalIsoTrkFilter

class AlCaHcalIsotrkFilter : public edm::global::EDFilter<edm::RunCache<alcaHcalIsoTrk::Counters>> {
class AlCaHcalIsotrkFilter : public edm::global::EDFilter<edm::RunCache<alCaHcalIsoTrkFilter::Counters>> {
public:
AlCaHcalIsotrkFilter(edm::ParameterSet const&);
~AlCaHcalIsotrkFilter() override = default;

std::shared_ptr<alcaHcalIsoTrk::Counters> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override;
std::shared_ptr<alCaHcalIsoTrkFilter::Counters> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override;

bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override;
Expand Down Expand Up @@ -146,10 +146,10 @@ bool AlCaHcalIsotrkFilter::filter(edm::StreamID, edm::Event& iEvent, edm::EventS
} // AlCaHcalIsotrkFilter::filter

// ------------ method called when starting to processes a run ------------
std::shared_ptr<alcaHcalIsoTrk::Counters> AlCaHcalIsotrkFilter::globalBeginRun(edm::Run const& iRun,
std::shared_ptr<alCaHcalIsoTrkFilter::Counters> AlCaHcalIsotrkFilter::globalBeginRun(edm::Run const& iRun,
edm::EventSetup const&) const {
edm::LogVerbatim("HcalIsoTrack") << "Start the Run " << iRun.run();
return std::make_shared<alcaHcalIsoTrk::Counters>();
return std::make_shared<alCaHcalIsoTrkFilter::Counters>();
}

// ------------ method called when ending the processing of a run ------------
Expand Down
18 changes: 9 additions & 9 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalIsotrkProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,25 +83,25 @@
// class declaration
//

namespace alcaHcalIsoTracks {
namespace alCaHcalIsotrkProducer {
struct Counters {
Counters() : nAll_(0), nGood_(0), nRange_(0) {}
mutable std::atomic<unsigned int> nAll_, nGood_, nRange_;
};
} // namespace alcaHcalIsoTracks
} // namespace alCaHcalIsotrkProducer

class AlCaHcalIsotrkProducer : public edm::stream::EDProducer<edm::GlobalCache<alcaHcalIsoTracks::Counters>> {
class AlCaHcalIsotrkProducer : public edm::stream::EDProducer<edm::GlobalCache<alCaHcalIsotrkProducer::Counters>> {
public:
explicit AlCaHcalIsotrkProducer(edm::ParameterSet const&, const alcaHcalIsoTracks::Counters*);
explicit AlCaHcalIsotrkProducer(edm::ParameterSet const&, const alCaHcalIsotrkProducer::Counters*);
~AlCaHcalIsotrkProducer() override = default;

static std::unique_ptr<alcaHcalIsoTracks::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<alcaHcalIsoTracks::Counters>();
static std::unique_ptr<alCaHcalIsotrkProducer::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<alCaHcalIsotrkProducer::Counters>();
}

void produce(edm::Event&, edm::EventSetup const&) override;
void endStream() override;
static void globalEndJob(const alcaHcalIsoTracks::Counters* counters);
static void globalEndJob(const alCaHcalIsotrkProducer::Counters* counters);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
Expand Down Expand Up @@ -211,7 +211,7 @@ class AlCaHcalIsotrkProducer : public edm::stream::EDProducer<edm::GlobalCache<a
};

AlCaHcalIsotrkProducer::AlCaHcalIsotrkProducer(edm::ParameterSet const& iConfig,
const alcaHcalIsoTracks::Counters* counters)
const alCaHcalIsotrkProducer::Counters* counters)
: nRun_(0),
nAll_(0),
nGood_(0),
Expand Down Expand Up @@ -744,7 +744,7 @@ void AlCaHcalIsotrkProducer::endStream() {
globalCache()->nRange_ += nRange_;
}

void AlCaHcalIsotrkProducer::globalEndJob(const alcaHcalIsoTracks::Counters* count) {
void AlCaHcalIsotrkProducer::globalEndJob(const alCaHcalIsotrkProducer::Counters* count) {
edm::LogVerbatim("HcalIsoTrack") << "Finds " << count->nGood_ << " good tracks in " << count->nAll_ << " events and "
<< count->nRange_ << " events in the momentum range";
}
Expand Down
Loading

0 comments on commit 357fbf7

Please sign in to comment.