Skip to content

Commit 847e52d

Browse files
committed
Fix clang warnings
1 parent b8c9237 commit 847e52d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

L1Trigger/Phase2L1ParticleFlow/plugins/PFClusterProducerFromL1EGClusters.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ void l1tpf::PFClusterProducerFromL1EGClusters::produce(edm::Event &iEvent, const
8888
// bit 0: standaloneWP: is_iso && is_ss
8989
// bit 1: looseL1TkMatchWP: is_looseTkiso && is_looseTkss
9090
// bit 2: photonWP:
91-
unsigned int qual = (digiCryCl.passes_iso() & digiCryCl.passes_ss()) |
92-
((digiCryCl.passes_looseTkiso() & digiCryCl.passes_looseTkss()) << 1) | (false << 2);
91+
unsigned int qual = (digiCryCl.passes_iso() && digiCryCl.passes_ss()) |
92+
((digiCryCl.passes_looseTkiso() && digiCryCl.passes_looseTkss()) << 1) | (false << 2);
9393
cluster.setHwQual(qual);
9494
// cluster.setDigiWord(digiCryCl.data());
9595
out->push_back(cluster);
@@ -109,8 +109,8 @@ void l1tpf::PFClusterProducerFromL1EGClusters::produce(edm::Event &iEvent, const
109109
if (corrector_.valid())
110110
corrector_.correctPt(cluster);
111111
cluster.setPtError(resol_(cluster.pt(), std::abs(cluster.eta())));
112-
unsigned int qual = (digiCryCl.passes_iso() & digiCryCl.passes_ss()) |
113-
((digiCryCl.passes_looseTkiso() & digiCryCl.passes_looseTkss()) << 1) | (false << 2);
112+
unsigned int qual = (digiCryCl.passes_iso() && digiCryCl.passes_ss()) |
113+
((digiCryCl.passes_looseTkiso() && digiCryCl.passes_looseTkss()) << 1) | (false << 2);
114114
cluster.setHwQual(qual);
115115

116116
// cluster.setDigiWord(digiCryCl.data());

L1Trigger/Phase2L1ParticleFlow/src/l1-converters/gcteminput_ref.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ l1ct::EmCaloObjEmu l1ct::GctEmClusterDecoderEmulator::decode(const l1ct::PFRegio
5252
// bit 0: standaloneWP: is_iso && is_ss
5353
// bit 1: looseL1TkMatchWP: is_looseTkiso && is_looseTkss
5454
// bit 2: photonWP:
55-
calo.hwEmID = (passes_iso(in) & passes_ss(in)) | ((passes_looseTkiso(in) & passes_looseTkss(in)) << 1) |
56-
((passes_looseTkiso(in) & passes_looseTkss(in)) << 2);
55+
calo.hwEmID = (passes_iso(in) && passes_ss(in)) | ((passes_looseTkiso(in) && passes_looseTkss(in)) << 1) |
56+
((passes_looseTkiso(in) && passes_looseTkss(in)) << 2);
5757

5858
// convert eta to local
5959
if (sector.hwEtaCenter < 0) {

0 commit comments

Comments
 (0)