From 9bb9d032b973fc802def7c7ccfd9fa5730874853 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sat, 9 Jul 2022 09:35:37 +0200 Subject: [PATCH] Try to address the issue reported in #38656 --- .../plugins/AlCaHcalHBHEMuonFilter.cc | 12 ++++++------ .../plugins/AlCaHcalHBHEMuonProducer.cc | 18 +++++++++--------- .../plugins/AlCaIsoTracksFilter.cc | 18 +++++++++--------- .../plugins/AlCaIsoTracksProducer.cc | 18 +++++++++--------- .../plugins/AlCaIsoTracksProducerFilter.cc | 18 +++++++++--------- 5 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonFilter.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonFilter.cc index af3f1452cb0a2..b890dc92c73ad 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonFilter.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonFilter.cc @@ -22,19 +22,19 @@ // class declaration // -namespace alcaHcalHBHEMuon { +namespace alcaHcalHBHEMuonFilter { struct Counters { Counters() : nAll_(0), nGood_(0), nFinal_(0) {} mutable std::atomic nAll_, nGood_, nFinal_; }; -} // namespace alcaHcalHBHEMuon +} // namespace alcaHcalHBHEMuonFilter -class AlCaHcalHBHEMuonFilter : public edm::global::EDFilter > { +class AlCaHcalHBHEMuonFilter : public edm::global::EDFilter > { public: AlCaHcalHBHEMuonFilter(edm::ParameterSet const&); ~AlCaHcalHBHEMuonFilter() override = default; - std::shared_ptr globalBeginRun(edm::Run const&, edm::EventSetup const&) const override; + std::shared_ptr 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; @@ -108,10 +108,10 @@ bool AlCaHcalHBHEMuonFilter::filter(edm::StreamID, edm::Event& iEvent, edm::Even } // AlCaHcalHBHEMuonFilter::filter // ------------ method called when starting to processes a run ------------ -std::shared_ptr AlCaHcalHBHEMuonFilter::globalBeginRun(edm::Run const& iRun, +std::shared_ptr AlCaHcalHBHEMuonFilter::globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const { edm::LogVerbatim("HBHEMuon") << "Start the Run " << iRun.run(); - return std::make_shared(); + return std::make_shared(); } // ------------ method called when ending the processing of a run ------------ diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonProducer.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonProducer.cc index 875f112db07c4..3c0889f4d801b 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonProducer.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonProducer.cc @@ -69,27 +69,27 @@ //#define EDM_ML_DEBUG -namespace alcaHcalHBHEMuon { +namespace alcaHcalHBHEMuonProducer { struct Counters { Counters() : nAll_(0), nGood_(0) {} mutable std::atomic nAll_, nGood_; }; -} // namespace alcaHcalHBHEMuon +} // namespace alcaHcalHBHEMuonProducer -class AlCaHcalHBHEMuonProducer : public edm::stream::EDProducer> { +class AlCaHcalHBHEMuonProducer : public edm::stream::EDProducer> { public: - explicit AlCaHcalHBHEMuonProducer(const edm::ParameterSet&, const alcaHcalHBHEMuon::Counters*); + explicit AlCaHcalHBHEMuonProducer(const edm::ParameterSet&, const alcaHcalHBHEMuonProducer::Counters*); ~AlCaHcalHBHEMuonProducer() override = default; - static std::unique_ptr initializeGlobalCache(edm::ParameterSet const&) { - return std::make_unique(); + static std::unique_ptr initializeGlobalCache(edm::ParameterSet const&) { + return std::make_unique(); } void produce(edm::Event&, const edm::EventSetup&) override; void endStream() override; - static void globalEndJob(const alcaHcalHBHEMuon::Counters* counters); + static void globalEndJob(const alcaHcalHBHEMuonProducer::Counters* counters); static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); @@ -156,7 +156,7 @@ class AlCaHcalHBHEMuonProducer : public edm::stream::EDProducer>("triggers")), processName_(iConfig.getParameter("processName")), triggerResults_(iConfig.getParameter("triggerResults")), @@ -973,7 +973,7 @@ void AlCaHcalHBHEMuonProducer::endStream() { globalCache()->nGood_ += nGood_; } -void AlCaHcalHBHEMuonProducer::globalEndJob(const alcaHcalHBHEMuon::Counters* count) { +void AlCaHcalHBHEMuonProducer::globalEndJob(const alcaHcalHBHEMuonProducer::Counters* count) { edm::LogVerbatim("HBHEMuon") << "Selects " << count->nGood_ << " out of " << count->nAll_ << " total # of events\n"; } diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc index ac8f49125e1ef..bf106c6bcd431 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksFilter.cc @@ -62,25 +62,25 @@ // class declaration // -namespace AlCaIsoTracks { +namespace alCaIsoTracksFilter { struct Counters { Counters() : nAll_(0), nGood_(0), nRange_(0), nHigh_(0) {} mutable std::atomic nAll_, nGood_, nRange_, nHigh_; }; -} // namespace AlCaIsoTracks +} // namespace alCaIsoTracksFilter -class AlCaIsoTracksFilter : public edm::stream::EDFilter> { +class AlCaIsoTracksFilter : public edm::stream::EDFilter> { public: - explicit AlCaIsoTracksFilter(edm::ParameterSet const&, const AlCaIsoTracks::Counters* count); + explicit AlCaIsoTracksFilter(edm::ParameterSet const&, const alCaIsoTracksFilter::Counters* count); ~AlCaIsoTracksFilter() override = default; - static std::unique_ptr initializeGlobalCache(edm::ParameterSet const& iConfig) { - return std::make_unique(); + static std::unique_ptr initializeGlobalCache(edm::ParameterSet const& iConfig) { + return std::make_unique(); } bool filter(edm::Event&, edm::EventSetup const&) override; void endStream() override; - static void globalEndJob(const AlCaIsoTracks::Counters* counters); + static void globalEndJob(const alCaIsoTracksFilter::Counters* counters); static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: @@ -134,7 +134,7 @@ class AlCaIsoTracksFilter : public edm::stream::EDFilter>("triggers")), labelGenTrack_(iConfig.getParameter("labelTrack")), labelRecVtx_(iConfig.getParameter("labelVertex")), @@ -479,7 +479,7 @@ void AlCaIsoTracksFilter::endStream() { globalCache()->nHigh_ += nHigh_; } -void AlCaIsoTracksFilter::globalEndJob(const AlCaIsoTracks::Counters* count) { +void AlCaIsoTracksFilter::globalEndJob(const alCaIsoTracksFilter::Counters* count) { edm::LogVerbatim("HcalIsoTrack") << "Selects " << count->nGood_ << " in " << count->nAll_ << " events and with " << count->nRange_ << " events in the p-range" << count->nHigh_ << " events with high p"; diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducer.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducer.cc index 32c86fbd9cf33..4338248c5605d 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducer.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducer.cc @@ -76,25 +76,25 @@ // class declaration // -namespace AlCaIsoTracks { +namespace alCaIsoTracksProducer { struct Counters { Counters() : nAll_(0), nGood_(0), nRange_(0) {} mutable std::atomic nAll_, nGood_, nRange_; }; -} // namespace AlCaIsoTracks +} // namespace alCaIsoTracksProducer -class AlCaIsoTracksProducer : public edm::stream::EDProducer > { +class AlCaIsoTracksProducer : public edm::stream::EDProducer > { public: - explicit AlCaIsoTracksProducer(edm::ParameterSet const&, const AlCaIsoTracks::Counters* count); + explicit AlCaIsoTracksProducer(edm::ParameterSet const&, const alCaIsoTracksProducer::Counters* count); ~AlCaIsoTracksProducer() override; - static std::unique_ptr initializeGlobalCache(edm::ParameterSet const&) { - return std::make_unique(); + static std::unique_ptr initializeGlobalCache(edm::ParameterSet const&) { + return std::make_unique(); } void produce(edm::Event&, edm::EventSetup const&) override; void endStream() override; - static void globalEndJob(const AlCaIsoTracks::Counters* counters); + static void globalEndJob(const alCaIsoTracksProducer::Counters* counters); static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: @@ -147,7 +147,7 @@ class AlCaIsoTracksProducer : public edm::stream::EDProducer tok_magField_; }; -AlCaIsoTracksProducer::AlCaIsoTracksProducer(edm::ParameterSet const& iConfig, const AlCaIsoTracks::Counters* counters) +AlCaIsoTracksProducer::AlCaIsoTracksProducer(edm::ParameterSet const& iConfig, const alCaIsoTracksProducer::Counters* counters) : nRun_(0), nAll_(0), nGood_(0), @@ -456,7 +456,7 @@ void AlCaIsoTracksProducer::endStream() { globalCache()->nRange_ += nRange_; } -void AlCaIsoTracksProducer::globalEndJob(const AlCaIsoTracks::Counters* count) { +void AlCaIsoTracksProducer::globalEndJob(const alCaIsoTracksProducer::Counters* count) { edm::LogVerbatim("HcalIsoTrack") << "Finds " << count->nGood_ << " good tracks in " << count->nAll_ << " events and " << count->nRange_ << " events in the momentum raange"; } diff --git a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducerFilter.cc b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducerFilter.cc index c76a143bf2fa8..be0480e0d94b1 100644 --- a/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducerFilter.cc +++ b/Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducerFilter.cc @@ -28,25 +28,25 @@ // class declaration // -namespace AlCaIsoTracksProdFilter { +namespace alCaIsoTracksProdFilter { struct Counters { Counters() : nAll_(0), nGood_(0) {} mutable std::atomic nAll_, nGood_; }; -} // namespace AlCaIsoTracksProdFilter +} // namespace alCaIsoTracksProdFilter -class AlCaIsoTracksProducerFilter : public edm::stream::EDFilter > { +class AlCaIsoTracksProducerFilter : public edm::stream::EDFilter > { public: - explicit AlCaIsoTracksProducerFilter(edm::ParameterSet const&, const AlCaIsoTracksProdFilter::Counters* count); + explicit AlCaIsoTracksProducerFilter(edm::ParameterSet const&, const alCaIsoTracksProdFilter::Counters* count); ~AlCaIsoTracksProducerFilter() override; - static std::unique_ptr initializeGlobalCache(edm::ParameterSet const& iConfig) { - return std::make_unique(); + static std::unique_ptr initializeGlobalCache(edm::ParameterSet const& iConfig) { + return std::make_unique(); } bool filter(edm::Event&, edm::EventSetup const&) override; void endStream() override; - static void globalEndJob(const AlCaIsoTracksProdFilter::Counters* counters); + static void globalEndJob(const alCaIsoTracksProdFilter::Counters* counters); static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); private: @@ -63,7 +63,7 @@ class AlCaIsoTracksProducerFilter : public edm::stream::EDFilternGood_ += nGood_; } -void AlCaIsoTracksProducerFilter::globalEndJob(const AlCaIsoTracksProdFilter::Counters* count) { +void AlCaIsoTracksProducerFilter::globalEndJob(const alCaIsoTracksProdFilter::Counters* count) { edm::LogVerbatim("HcalIsoTrack") << "Selects " << count->nGood_ << " in " << count->nAll_ << " events " << std::endl; }