Skip to content

Commit eb45085

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46247 from iarspider/iarspider-patch-20241003-2
[LLVM Analyzer][DQM] Fix some static analyzer warnings
2 parents a69a71c + 5a4eb4f commit eb45085

File tree

22 files changed

+39
-195
lines changed

22 files changed

+39
-195
lines changed

‎DQM/BeamMonitor/plugins/BeamMonitor.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,6 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
923923
DipPVInfo_.push_back(h_nVtx_st->getRMSError());
924924
DipPVInfo_.push_back((float)MaxPVs);
925925
DipPVInfo_.push_back((float)countTotPV_);
926-
MaxPVs = 0;
927926
} else {
928927
for (size_t i = 0; i < 7; i++) {
929928
if (i > 0) {
@@ -934,7 +933,6 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
934933
}
935934
}
936935
theBeamFitter->SetPVInfo(DipPVInfo_);
937-
countEvtLastNLS_ = 0;
938936

939937
if (onlineMode_) { // filling LS gap
940938
// FIXME: need to add protection for the case if the gap is at the resetting LS!

‎DQM/DTMonitorClient/src/DTLocalTriggerTest.cc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,6 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker& ibooker, DQMStor
200200
delete QualDistr;
201201
}
202202

203-
std::map<std::string, MonitorElement*>* innerME = &(secME[sector_id]);
204-
205203
if (whME[wh].find(fullName("CorrectBXPhiIn")) == whME[wh].end()) {
206204
bookWheelHistos(ibooker, wh, "ResidualBXPhiIn");
207205
bookWheelHistos(ibooker, wh, "CorrectBXPhiIn");
@@ -210,7 +208,7 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker& ibooker, DQMStor
210208
bookWheelHistos(ibooker, wh, "TriggerInclusivePhiIn");
211209
}
212210

213-
innerME = &(whME[wh]);
211+
std::map<std::string, MonitorElement*>* innerME = &(whME[wh]);
214212
innerME->find(fullName("CorrectBXPhiIn"))->second->setBinContent(sect, stat, BX_OK + 0.00001);
215213
innerME->find(fullName("ResidualBXPhiIn"))
216214
->second->setBinContent(sect, stat, round(25. * (BXMean - BX_OK)) + 0.00001);
@@ -297,8 +295,6 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker& ibooker, DQMStor
297295
delete QualDistr;
298296
}
299297

300-
std::map<std::string, MonitorElement*>* innerME = &(secME[sector_id]);
301-
302298
if (whME[wh].find(fullName("CorrectBXPhiOut")) == whME[wh].end()) {
303299
bookWheelHistos(ibooker, wh, "ResidualBXPhiOut");
304300
bookWheelHistos(ibooker, wh, "CorrectBXPhiOut");
@@ -307,7 +303,7 @@ void DTLocalTriggerTest::runClientDiagnostic(DQMStore::IBooker& ibooker, DQMStor
307303
bookWheelHistos(ibooker, wh, "TriggerInclusivePhiOut");
308304
}
309305

310-
innerME = &(whME[wh]);
306+
std::map<std::string, MonitorElement*>* innerME = &(whME[wh]);
311307
innerME->find(fullName("CorrectBXPhiOut"))->second->setBinContent(sect, stat, BX_OK + 0.00001);
312308
innerME->find(fullName("ResidualBXPhiOut"))
313309
->second->setBinContent(sect, stat, round(25. * (BXMean - BX_OK)) + 0.00001);

‎DQM/DTMonitorModule/src/DTChamberEfficiencyTask.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ void DTChamberEfficiencyTask::analyze(const edm::Event& event, const edm::EventS
215215
DTChamberId TopId14(wheel, top, 14);
216216
DTRecSegment4DCollection::range segsTop14 = segs->get(TopId14);
217217
int nSegsTop14 = segsTop14.second - segsTop14.first;
218-
nSegsTop += nSegsTop14;
219218
if (nSegsTop14) {
220219
DTRecSegment4D* pBestTopSeg14 = const_cast<DTRecSegment4D*>(&getBestSegment(segsTop14));
221220
// get best between sector 10 and 14

‎DQM/L1TMonitorClient/src/L1TOccupancyClient.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ double L1TOccupancyClient::getAvrg(TH2F* iHist, string iTestName, int iAxis, int
610610

611611
// median
612612
case 2:
613-
marked = hservice_->maskBins(iTestName, histo, iBinStrip, iAxis);
613+
hservice_->maskBins(iTestName, histo, iBinStrip, iAxis);
614614
proj = histo->ProjectionY("_py", iBinStrip, iBinStrip);
615615
for (int i = 0; i < iNBins; i++) {
616616
values.push_back(proj->GetBinContent(i + 1));
@@ -633,7 +633,7 @@ double L1TOccupancyClient::getAvrg(TH2F* iHist, string iTestName, int iAxis, int
633633
break;
634634
// median
635635
case 2:
636-
marked = hservice_->maskBins(iTestName, histo, iBinStrip, iAxis);
636+
hservice_->maskBins(iTestName, histo, iBinStrip, iAxis);
637637
proj = histo->ProjectionX("_px", iBinStrip, iBinStrip);
638638
for (int i = 0; i < iNBins; i++) {
639639
values.push_back(proj->GetBinContent(i + 1));

‎DQM/Physics/src/QcdPhotonsDQM.cc‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ void QcdPhotonsDQM::analyze(const Event& iEvent, const EventSetup& iSetup) {
340340
float photon_eta = -9.0;
341341
float photon_phi = -9.0;
342342
bool photon_passPhotonID = false;
343-
bool found_lead_pho = false;
344343
int photon_count_bar = 0;
345344
int photon_count_end = 0;
346345
// False Assumption: reco photons are ordered by Et
@@ -389,13 +388,10 @@ void QcdPhotonsDQM::analyze(const Event& iEvent, const EventSetup& iSetup) {
389388
photon_count_end++;
390389
}
391390

392-
if (!found_lead_pho) {
393-
found_lead_pho = true;
394-
photon_passPhotonID = pho_current_passPhotonID;
395-
photon_et = pho_maxet->et();
396-
photon_eta = pho_maxet->eta();
397-
photon_phi = pho_maxet->phi();
398-
}
391+
photon_passPhotonID = pho_current_passPhotonID;
392+
photon_et = pho_maxet->et();
393+
photon_eta = pho_maxet->eta();
394+
photon_phi = pho_maxet->phi();
399395
}
400396

401397
// If user requires a photon to be found, but none is, return.

‎DQM/Physics/src/TopDiLeptonDQM.cc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ void TopDiLeptonDQM::analyze(const edm::Event& evt, const edm::EventSetup& conte
177177
bool Fired_Signal_Trigger[100] = {false};
178178
bool Fired_Control_Trigger[100] = {false};
179179

180-
int N_leptons = 0;
181180
int N_iso_mu = 0;
182181
int N_iso_el = 0;
183182

@@ -260,8 +259,6 @@ void TopDiLeptonDQM::analyze(const edm::Event& evt, const edm::EventSetup& conte
260259
if (!muons.failedToGet()) {
261260
Nmuons_->Fill(muons->size());
262261

263-
N_leptons = N_leptons + muons->size();
264-
265262
for (muon = muons->begin(); muon != muons->end(); ++muon) {
266263
float N_muons = muons->size();
267264
float Q_muon = muon->charge();
@@ -331,8 +328,6 @@ void TopDiLeptonDQM::analyze(const edm::Event& evt, const edm::EventSetup& conte
331328
if (!elecs.failedToGet()) {
332329
Nelecs_->Fill(elecs->size());
333330

334-
N_leptons = N_leptons + elecs->size();
335-
336331
for (elec = elecs->begin(); elec != elecs->end(); ++elec) {
337332
float N_elecs = elecs->size();
338333
float Q_elec = elec->charge();

‎DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ void SiPixelDataQuality::computeGlobalQualityFlag(
299299
digiCounterBarrel = 0, clusterCounterBarrel = 0, trackCounterBarrel = 0;
300300
digiStatsEndcap = false, clusterStatsEndcap = false, trackStatsEndcap = false;
301301
digiCounterEndcap = 0, clusterCounterEndcap = 0, trackCounterEndcap = 0;
302-
init = false;
303302
}
304303
if (nFEDs == 0)
305304
return;
@@ -652,9 +651,7 @@ void SiPixelDataQuality::computeGlobalQualityFlag(
652651
endcapFlag = endcap_errors_temp[0] * combinedCuts;
653652

654653
// Track results:
655-
combinedCuts = 1.;
656-
numerator = 0;
657-
denominator = 0;
654+
658655
me = iGetter.get("Pixel/Tracks/PixelTracksCut");
659656
if (me)
660657
pixel_cuts_temp[0] = me->getIntValue();
@@ -799,7 +796,6 @@ void SiPixelDataQuality::fillGlobalQualityPlot(DQMStore::IBooker &iBooker,
799796
if (init) {
800797
count = 0;
801798
errcount = 0;
802-
init = false;
803799
count1 = 0;
804800
count2 = 0;
805801
count3 = 0;

‎DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -344,32 +344,9 @@ void SiPixelClusterSource::buildStructure(const edm::EventSetup &iSetup) {
344344
thePixelStructure.insert(pair<uint32_t, SiPixelClusterModule *>(id, theModule));
345345
} else if (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) {
346346
LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
347-
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
348347
int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
349348
if (disk > noOfDisks)
350349
noOfDisks = disk;
351-
int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
352-
int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
353-
int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
354-
char sside[80];
355-
sprintf(sside, "HalfCylinder_%i", side);
356-
char sdisk[80];
357-
sprintf(sdisk, "Disk_%i", disk);
358-
char sblade[80];
359-
sprintf(sblade, "Blade_%02i", blade);
360-
char spanel[80];
361-
sprintf(spanel, "Panel_%i", panel);
362-
char smodule[80];
363-
sprintf(smodule, "Module_%i", module);
364-
std::string side_str = sside;
365-
std::string disk_str = sdisk;
366-
bool mask = side_str.find("HalfCylinder_1") != string::npos ||
367-
side_str.find("HalfCylinder_2") != string::npos ||
368-
side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
369-
// clutch to take all of FPIX, but no BPIX:
370-
mask = false;
371-
if (isPIB && mask)
372-
continue;
373350
SiPixelClusterModule *theModule = new SiPixelClusterModule(id, ncols, nrows);
374351
thePixelStructure.insert(pair<uint32_t, SiPixelClusterModule *>(id, theModule));
375352
}

‎DQM/SiPixelMonitorDigi/src/SiPixelDigiSource.cc‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,68 +1138,18 @@ void SiPixelDigiSource::buildStructure(const edm::EventSetup& iSetup) {
11381138
uint32_t id = detId();
11391139
SiPixelDigiModule* theModule = new SiPixelDigiModule(id, ncols, nrows);
11401140

1141-
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
11421141
int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
11431142
if (disk > noOfDisks)
11441143
noOfDisks = disk;
1145-
int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
1146-
int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
1147-
int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
1148-
1149-
char sside[80];
1150-
sprintf(sside, "HalfCylinder_%i", side);
1151-
char sdisk[80];
1152-
sprintf(sdisk, "Disk_%i", disk);
1153-
char sblade[80];
1154-
sprintf(sblade, "Blade_%02i", blade);
1155-
char spanel[80];
1156-
sprintf(spanel, "Panel_%i", panel);
1157-
char smodule[80];
1158-
sprintf(smodule, "Module_%i", module);
1159-
std::string side_str = sside;
1160-
std::string disk_str = sdisk;
1161-
bool mask = side_str.find("HalfCylinder_1") != string::npos ||
1162-
side_str.find("HalfCylinder_2") != string::npos ||
1163-
side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
1164-
// clutch to take all of FPIX, but no BPIX:
1165-
mask = false;
1166-
if (isPIB && mask)
1167-
continue;
1168-
11691144
thePixelStructure.insert(pair<uint32_t, SiPixelDigiModule*>(id, theModule));
11701145
} else if ((detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (isUpgrade)) {
11711146
LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
11721147
uint32_t id = detId();
11731148
SiPixelDigiModule* theModule = new SiPixelDigiModule(id, ncols, nrows);
11741149

1175-
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
11761150
int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
11771151
if (disk > noOfDisks)
11781152
noOfDisks = disk;
1179-
int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
1180-
int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
1181-
int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
1182-
1183-
char sside[80];
1184-
sprintf(sside, "HalfCylinder_%i", side);
1185-
char sdisk[80];
1186-
sprintf(sdisk, "Disk_%i", disk);
1187-
char sblade[80];
1188-
sprintf(sblade, "Blade_%02i", blade);
1189-
char spanel[80];
1190-
sprintf(spanel, "Panel_%i", panel);
1191-
char smodule[80];
1192-
sprintf(smodule, "Module_%i", module);
1193-
std::string side_str = sside;
1194-
std::string disk_str = sdisk;
1195-
bool mask = side_str.find("HalfCylinder_1") != string::npos ||
1196-
side_str.find("HalfCylinder_2") != string::npos ||
1197-
side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
1198-
// clutch to take all of FPIX, but no BPIX:
1199-
mask = false;
1200-
if (isPIB && mask)
1201-
continue;
1202-
12031153
thePixelStructure.insert(pair<uint32_t, SiPixelDigiModule*>(id, theModule));
12041154
} //end_elseif(isUpgrade)
12051155
}

‎DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@ void SiPixelRawDataErrorSource::buildStructure(const edm::EventSetup &iSetup) {
187187

188188
edm::ESHandle<TrackerGeometry> pDD = iSetup.getHandle(trackerGeomTokenBeginRun_);
189189

190-
edm::ESHandle<TrackerTopology> tTopoHandle = iSetup.getHandle(trackerTopoTokenBeginRun_);
191-
const TrackerTopology *pTT = tTopoHandle.product();
192-
193190
LogVerbatim("PixelDQM") << " *** Geometry node for TrackerGeom is " << &(*pDD) << std::endl;
194191
LogVerbatim("PixelDQM") << " *** I have " << pDD->detsPXB().size() << " barrel pixel detectors" << std::endl;
195192
LogVerbatim("PixelDQM") << " *** I have " << pDD->detsPXF().size() << " endcap pixel detectors" << std::endl;
@@ -199,8 +196,10 @@ void SiPixelRawDataErrorSource::buildStructure(const edm::EventSetup &iSetup) {
199196
for (TrackerGeometry::DetContainer::const_iterator it = pDD->detsPXB().begin(); it != pDD->detsPXB().end(); it++) {
200197
const GeomDetUnit *geoUnit = dynamic_cast<const GeomDetUnit *>(*it);
201198
// check if it is a detUnit
202-
if (geoUnit == nullptr)
199+
if (geoUnit == nullptr) {
203200
LogError("PixelDQM") << "Pixel GeomDet is not a GeomDetUnit!" << std::endl;
201+
continue;
202+
}
204203
const PixelGeomDetUnit *pixDet = dynamic_cast<const PixelGeomDetUnit *>(geoUnit);
205204
int nrows = (pixDet->specificTopology()).nrows();
206205
int ncols = (pixDet->specificTopology()).ncolumns();
@@ -227,32 +226,6 @@ void SiPixelRawDataErrorSource::buildStructure(const edm::EventSetup &iSetup) {
227226
LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
228227
uint32_t id = detId();
229228
SiPixelRawDataErrorModule *theModule = new SiPixelRawDataErrorModule(id, ncols, nrows);
230-
231-
PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
232-
int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
233-
int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
234-
int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
235-
int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
236-
237-
char sside[80];
238-
sprintf(sside, "HalfCylinder_%i", side);
239-
char sdisk[80];
240-
sprintf(sdisk, "Disk_%i", disk);
241-
char sblade[80];
242-
sprintf(sblade, "Blade_%02i", blade);
243-
char spanel[80];
244-
sprintf(spanel, "Panel_%i", panel);
245-
char smodule[80];
246-
sprintf(smodule, "Module_%i", module);
247-
std::string side_str = sside;
248-
std::string disk_str = sdisk;
249-
bool mask = side_str.find("HalfCylinder_1") != string::npos || side_str.find("HalfCylinder_2") != string::npos ||
250-
side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
251-
// clutch to take all of FPIX, but no BPIX:
252-
mask = false;
253-
if (isPIB && mask)
254-
continue;
255-
256229
thePixelStructure.insert(pair<uint32_t, SiPixelRawDataErrorModule *>(id, theModule));
257230
}
258231

0 commit comments

Comments
 (0)