From e4b0c8359593185941d8ea37abd751a1033d4002 Mon Sep 17 00:00:00 2001 From: ccaillol Date: Wed, 28 Sep 2022 11:36:31 +0200 Subject: [PATCH] upgrade's comments (cherry picked from commit b07a309623a172ea488aeacbd7473c180e6394aa) --- .../regionizer/multififo_regionizer_elements_ref.icc | 6 ++++-- .../plugins/L1TCorrelatorLayer1Producer.cc | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/L1Trigger/Phase2L1ParticleFlow/interface/regionizer/multififo_regionizer_elements_ref.icc b/L1Trigger/Phase2L1ParticleFlow/interface/regionizer/multififo_regionizer_elements_ref.icc index e4feaef449d5a..66b0538ac38fe 100644 --- a/L1Trigger/Phase2L1ParticleFlow/interface/regionizer/multififo_regionizer_elements_ref.icc +++ b/L1Trigger/Phase2L1ParticleFlow/interface/regionizer/multififo_regionizer_elements_ref.icc @@ -53,10 +53,12 @@ void l1ct::multififo_regionizer::RegionBuffer::initFifos(unsigned int nfifos) for (auto& t : queues_.back().second) t.clear(); } - if (!(nfifos == 1 || nfifos == 2 || nfifos == 3 || nfifos == 4 || nfifos == 6 || nfifos == 8 || nfifos == 12)) { + bool isGood = + (nfifos == 1 || nfifos == 2 || nfifos == 3 || nfifos == 4 || nfifos == 6 || nfifos == 8 || nfifos == 12); + if (!isGood) { dbgCerr() << "Error, created regionizer for nfifos == " << nfifos << ", not supported." << std::endl; } - assert(nfifos == 1 || nfifos == 2 || nfifos == 3 || nfifos == 4 || nfifos == 6 || nfifos == 8 || nfifos == 12); + assert(isGood); } template diff --git a/L1Trigger/Phase2L1ParticleFlow/plugins/L1TCorrelatorLayer1Producer.cc b/L1Trigger/Phase2L1ParticleFlow/plugins/L1TCorrelatorLayer1Producer.cc index d74a2b3060973..3eee113d3b15a 100644 --- a/L1Trigger/Phase2L1ParticleFlow/plugins/L1TCorrelatorLayer1Producer.cc +++ b/L1Trigger/Phase2L1ParticleFlow/plugins/L1TCorrelatorLayer1Producer.cc @@ -77,7 +77,7 @@ class L1TCorrelatorLayer1Producer : public edm::stream::EDProducer<> { const std::string regionDumpName_; bool writeRawHgcalCluster_; std::fstream fRegionDump_; - std::vector patternWriterConfigs_; + const std::vector patternWriterConfigs_; std::vector> patternWriters_; // region of interest debugging