Skip to content

Commit

Permalink
Merge pull request #38662 from bsunanda/Run3-alca223
Browse files Browse the repository at this point in the history 
Run3-alca223 Fixes the issue reported in #38656
  • Loading branch information
@cmsbuild
cmsbuild committed Jul 11, 2022
2 parents 2b29454 + 25f0bca commit 51a2ec1
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 43 deletions.
15 changes: 8 additions & 7 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonFilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,20 @@
// class declaration
//

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

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

std::shared_ptr<alcaHcalHBHEMuon::Counters> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override;
std::shared_ptr<alcaHcalHBHEMuonFilter::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 @@ -108,10 +109,10 @@ bool AlCaHcalHBHEMuonFilter::filter(edm::StreamID, edm::Event& iEvent, edm::Even
} // AlCaHcalHBHEMuonFilter::filter

// ------------ method called when starting to processes a run ------------
std::shared_ptr<alcaHcalHBHEMuon::Counters> AlCaHcalHBHEMuonFilter::globalBeginRun(edm::Run const& iRun,
edm::EventSetup const&) const {
std::shared_ptr<alcaHcalHBHEMuonFilter::Counters> AlCaHcalHBHEMuonFilter::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<alcaHcalHBHEMuonFilter::Counters>();
}

// ------------ method called when ending the processing of a run ------------
Expand Down
19 changes: 10 additions & 9 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaHcalHBHEMuonProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,27 +69,27 @@

//#define EDM_ML_DEBUG

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

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

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

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);

Expand Down Expand Up @@ -156,7 +156,8 @@ class AlCaHcalHBHEMuonProducer : public edm::stream::EDProducer<edm::GlobalCache
////////////////////////////////////////////////////////////
};

AlCaHcalHBHEMuonProducer::AlCaHcalHBHEMuonProducer(const edm::ParameterSet& iConfig, const alcaHcalHBHEMuon::Counters*)
AlCaHcalHBHEMuonProducer::AlCaHcalHBHEMuonProducer(const edm::ParameterSet& iConfig,
const alcaHcalHBHEMuonProducer::Counters*)
: trigNames_(iConfig.getParameter<std::vector<std::string>>("triggers")),
processName_(iConfig.getParameter<std::string>("processName")),
triggerResults_(iConfig.getParameter<edm::InputTag>("triggerResults")),
Expand Down Expand Up @@ -973,7 +974,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";
}

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

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

class AlCaIsoTracksFilter : public edm::stream::EDFilter<edm::GlobalCache<AlCaIsoTracks::Counters>> {
class AlCaIsoTracksFilter : public edm::stream::EDFilter<edm::GlobalCache<alCaIsoTracksFilter::Counters>> {
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<AlCaIsoTracks::Counters> initializeGlobalCache(edm::ParameterSet const& iConfig) {
return std::make_unique<AlCaIsoTracks::Counters>();
static std::unique_ptr<alCaIsoTracksFilter::Counters> initializeGlobalCache(edm::ParameterSet const& iConfig) {
return std::make_unique<alCaIsoTracksFilter::Counters>();
}

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:
Expand Down Expand Up @@ -134,7 +134,7 @@ class AlCaIsoTracksFilter : public edm::stream::EDFilter<edm::GlobalCache<AlCaIs
//
// constructors and destructor
//
AlCaIsoTracksFilter::AlCaIsoTracksFilter(const edm::ParameterSet& iConfig, const AlCaIsoTracks::Counters* count)
AlCaIsoTracksFilter::AlCaIsoTracksFilter(const edm::ParameterSet& iConfig, const alCaIsoTracksFilter::Counters* count)
: trigNames_(iConfig.getParameter<std::vector<std::string>>("triggers")),
labelGenTrack_(iConfig.getParameter<edm::InputTag>("labelTrack")),
labelRecVtx_(iConfig.getParameter<edm::InputTag>("labelVertex")),
Expand Down Expand Up @@ -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";
Expand Down
19 changes: 10 additions & 9 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,25 @@
// class declaration
//

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

class AlCaIsoTracksProducer : public edm::stream::EDProducer<edm::GlobalCache<AlCaIsoTracks::Counters> > {
class AlCaIsoTracksProducer : public edm::stream::EDProducer<edm::GlobalCache<alCaIsoTracksProducer::Counters> > {
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<AlCaIsoTracks::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<AlCaIsoTracks::Counters>();
static std::unique_ptr<alCaIsoTracksProducer::Counters> initializeGlobalCache(edm::ParameterSet const&) {
return std::make_unique<alCaIsoTracksProducer::Counters>();
}

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:
Expand Down Expand Up @@ -147,7 +147,8 @@ class AlCaIsoTracksProducer : public edm::stream::EDProducer<edm::GlobalCache<Al
edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> 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),
Expand Down Expand Up @@ -456,7 +457,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";
}
Expand Down
18 changes: 9 additions & 9 deletions Calibration/HcalAlCaRecoProducers/plugins/AlCaIsoTracksProducerFilter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@
// class declaration
//

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

class AlCaIsoTracksProducerFilter : public edm::stream::EDFilter<edm::GlobalCache<AlCaIsoTracksProdFilter::Counters> > {
class AlCaIsoTracksProducerFilter : public edm::stream::EDFilter<edm::GlobalCache<alCaIsoTracksProdFilter::Counters> > {
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<AlCaIsoTracksProdFilter::Counters> initializeGlobalCache(edm::ParameterSet const& iConfig) {
return std::make_unique<AlCaIsoTracksProdFilter::Counters>();
static std::unique_ptr<alCaIsoTracksProdFilter::Counters> initializeGlobalCache(edm::ParameterSet const& iConfig) {
return std::make_unique<alCaIsoTracksProdFilter::Counters>();
}

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:
Expand All @@ -63,7 +63,7 @@ class AlCaIsoTracksProducerFilter : public edm::stream::EDFilter<edm::GlobalCach
};

AlCaIsoTracksProducerFilter::AlCaIsoTracksProducerFilter(const edm::ParameterSet& iConfig,
const AlCaIsoTracksProdFilter::Counters* count)
const alCaIsoTracksProdFilter::Counters* count)
: nRun_(0),
nAll_(0),
nGood_(0),
Expand Down Expand Up @@ -127,7 +127,7 @@ void AlCaIsoTracksProducerFilter::endStream() {
globalCache()->nGood_ += 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;
}

Expand Down

0 comments on commit 51a2ec1

Please sign in to comment.