Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions L1Trigger/DTTriggerPhase2/src/MuonPathAssociator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ void MuonPathAssociator::correlateMPaths(edm::Handle<DTDigiCollection> dtdigis,
sl3 = 0;
for (auto SL3metaPrimitive = SL3metaPrimitives.begin(); SL3metaPrimitive != SL3metaPrimitives.end();
++SL3metaPrimitive, sl3++) {
if (useFitSL3[sl3])
[[clang::suppress]] if (useFitSL3[sl3])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forgive my ignorance, but are these things I should fix, or task the relevant L1T person to fix, instead of suppressing warnings?

continue;
if ((at_least_one_correlation == false || clean_chi2_correlation_) &&
allow_confirmation_) { //no correlation was found, trying with pairs of two digis in the other SL
Expand Down Expand Up @@ -841,7 +841,7 @@ void MuonPathAssociator::correlateMPaths(edm::Handle<DTDigiCollection> dtdigis,
sl1 = 0;
for (auto SL1metaPrimitive = SL1metaPrimitives.begin(); SL1metaPrimitive != SL1metaPrimitives.end();
++SL1metaPrimitive, sl1++) {
if (useFitSL1[sl1])
[[clang::suppress]] if (useFitSL1[sl1])
continue;

DTSuperLayerId SLId(SL1metaPrimitive->rawId);
Expand Down Expand Up @@ -902,7 +902,7 @@ void MuonPathAssociator::correlateMPaths(edm::Handle<DTDigiCollection> dtdigis,
sl3 = 0;
for (auto SL3metaPrimitive = SL3metaPrimitives.begin(); SL3metaPrimitive != SL3metaPrimitives.end();
++SL3metaPrimitive, sl3++) {
if (useFitSL3[sl3])
[[clang::suppress]] if (useFitSL3[sl3])
continue;
DTSuperLayerId SLId(SL3metaPrimitive->rawId);
DTChamberId(SLId.wheel(), SLId.station(), SLId.sector());
Expand Down Expand Up @@ -1008,12 +1008,12 @@ void MuonPathAssociator::removeSharingFits(vector<metaPrimitive> &chamberMPaths,
for (unsigned int i = 0; i < chamberMPaths.size(); i++) {
if (debug_)
LogDebug("MuonPathAssociator") << "Looking at prim" << i;
if (!useFit[i])
[[clang::suppress]] if (!useFit[i])
continue;
for (unsigned int j = i + 1; j < chamberMPaths.size(); j++) {
if (debug_)
LogDebug("MuonPathAssociator") << "Comparing with prim " << j;
if (!useFit[j])
[[clang::suppress]] if (!useFit[j])
continue;
metaPrimitive first = chamberMPaths[i];
metaPrimitive second = chamberMPaths[j];
Expand Down
6 changes: 3 additions & 3 deletions L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,9 @@ void DTTSPhi::runTSPhi() {
ntsm[is - 1 - DTConfigTSPhi::NSTEPF][i_tsmd] >
0) { // it means that the last BX with sort 2 was not the
// previous one
existSecondPrevBx =
((is - 1 - DTConfigTSPhi::NSTEPF >= 0) && (ntsm[is - 1 - DTConfigTSPhi::NSTEPF][i_tsmd] > 1) &&
(secondPrevBx->tracoTr()->code() > 0));
existSecondPrevBx = secondPrevBx && ((is - 1 - DTConfigTSPhi::NSTEPF >= 0) &&
(ntsm[is - 1 - DTConfigTSPhi::NSTEPF][i_tsmd] > 1) &&
(secondPrevBx->tracoTr()->code() > 0));
if (existSecondPrevBx) {
_cache.push_back(DTChambPhSegm(ChamberId(), is - 1, secondPrevBx->tracoTr(), 2));

Expand Down
3 changes: 2 additions & 1 deletion L1Trigger/L1TCalorimeter/plugins/L1TPhysicalEtAdder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "DataFormats/L1TCalorimeter/interface/CaloRegion.h"

#include "FWCore/Framework/interface/ESHandle.h"
#include <cassert>
#include <vector>

namespace {
Expand Down Expand Up @@ -54,7 +55,7 @@ namespace {
3.750,
4.250,
4.750};
if (etaIndex < 11) {
if (0 <= etaIndex && etaIndex < 11) {
return -rgnEtaValues[-(etaIndex - 10)]; // 0-10 are negative eta values
} else if (etaIndex < 22) {
return rgnEtaValues[etaIndex - 11]; // 11-21 are positive eta values
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ int l1t::Stage1Layer2EtSumAlgorithmImpPP::DiJetPhi(const std::vector<l1t::Jet>*
uint16_t l1t::Stage1Layer2EtSumAlgorithmImpPP::MHToverHT(uint16_t num, uint16_t den) const {
uint16_t result;
uint32_t numerator(num), denominator(den);
assert(den != 0);

if (numerator == denominator)
result = 0x7f;
Expand Down
3 changes: 3 additions & 0 deletions L1Trigger/L1THGCal/src/HGCalVFECompressionImpl.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#include <cassert>

#include "L1Trigger/L1THGCal/interface/HGCalVFECompressionImpl.h"

#include "FWCore/Utilities/interface/Exception.h"
Expand Down Expand Up @@ -40,6 +42,7 @@ void HGCalVFECompressionImpl::compressSingle(const uint64_t value,

// build exponent and mantissa
const uint32_t exponent = bitlen - mantissaBits_;
assert(exponent - 1 < 64);
const uint64_t mantissa = (shifted_value >> (exponent - 1)) & ~(1ULL << mantissaBits_);

// assemble floating-point
Expand Down
4 changes: 2 additions & 2 deletions L1Trigger/L1THGCal/src/backend/HGCalClusteringImpl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void HGCalClusteringImpl::clusterizeDR(const std::vector<edm::Ptr<l1t::HGCalTrig
}
}

if (targetClu < 0 && isSeed[itc])
[[clang::suppress]] if (targetClu < 0 && isSeed[itc])
clustersTmp.emplace_back(*tc);
else if (targetClu >= 0)
clustersTmp.at(targetClu).addConstituent(*tc);
Expand Down Expand Up @@ -298,7 +298,7 @@ void HGCalClusteringImpl::clusterizeDRNN(const std::vector<edm::Ptr<l1t::HGCalTr
/* continue if not passing the threshold */
if ((*tc)->mipPt() < threshold)
continue;
if (isSeed[itc])
[[clang::suppress]] if (isSeed[itc])
continue; //No sharing of seeds between clusters (TBC)

/* searching for TC near the centre of the cluster */
Expand Down
1 change: 1 addition & 0 deletions L1Trigger/L1TMuonOverlap/interface/AlgoMuon.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class AlgoMuon {
m_bx(bx),
m_pt(pt),
m_charge(charge),
m_phiRHit(9999),
m_patNumb(999),
m_rhitNumb(999) {}

Expand Down