From 208a149ffbbcb44065815b34077f5df132a38984 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 4 May 2023 13:24:03 +0200 Subject: [PATCH 1/2] [DQM] [CLANG] Fix warnings reported by llvm16 in CLANG IBs --- .../HcalTools/plugins/CMTRawAnalyzer.cc | 18 -------------- .../plugins/CSCDQM_StripClusterFinder.cc | 2 -- DQM/DTMonitorClient/src/DTOccupancyTest.cc | 8 ------- DQM/EcalCommon/src/MESetMulti.cc | 2 -- DQM/HcalTasks/src/RecoRunSummary.cc | 2 -- DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc | 3 --- .../src/L1TStage2uGTCaloLayer2Comp.cc | 2 -- DQM/L1TMonitor/src/L1TdeStage2CaloLayer2.cc | 2 -- .../src/L1EmulatorErrorFlagClient.cc | 9 ------- .../src/L1TEMTFEventInfoClient.cc | 6 ----- .../src/L1TEventInfoClient.cc | 4 ---- DQM/Physics/src/B2GDQM.cc | 2 -- DQM/Physics/src/EwkElecDQM.cc | 2 -- DQM/Physics/src/EwkMuDQM.cc | 4 ---- DQM/Physics/src/EwkMuLumiMonitorDQM.cc | 2 -- DQM/Physics/src/EwkTauDQM.cc | 21 ---------------- DQM/Physics/src/SingleTopTChannelLeptonDQM.cc | 9 ------- .../src/SingleTopTChannelLeptonDQM_miniAOD.cc | 7 ------ DQM/Physics/src/TopDiLeptonOfflineDQM.cc | 8 ------- DQM/Physics/src/TopSingleLeptonDQM.cc | 8 ------- DQM/Physics/src/TopSingleLeptonDQM_miniAOD.cc | 7 ------ DQM/RPCMonitorDigi/src/RPCTTUMonitor.cc | 4 ---- .../src/SiPixelActionExecutor.cc | 2 -- .../src/SiPixelInformationExtractor.cc | 2 -- .../src/SiPixelHitEfficiencySource.cc | 6 ----- .../src/SiPixelTrackResidualSource.cc | 2 -- .../src/ApvTimingAlgorithm.cc | 2 -- .../src/FedTimingAlgorithm.cc | 3 --- .../src/FedTimingHistograms.cc | 2 -- .../plugins/TrackerRemapper.cc | 2 -- .../src/Phase1PixelSummaryMap.cc | 2 +- DQM/TrackingMonitor/src/TrackAnalyzer.cc | 2 -- .../src/TrackSplittingMonitor.cc | 5 ---- .../src/TrackingQualityChecker.cc | 3 --- DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc | 16 ------------- DQMOffline/EGamma/plugins/ElectronAnalyzer.cc | 2 -- DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc | 9 ------- DQMOffline/JetMET/src/BeamHaloAnalyzer.cc | 2 -- DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc | 24 ------------------- .../src/JetAnalyzer_HeavyIons_matching.cc | 7 ------ DQMOffline/Muon/src/CSCOfflineMonitor.cc | 2 -- .../Trigger/plugins/HLTTauRefProducer.cc | 16 ++++++------- .../Trigger/plugins/JetMETHLTOfflineSource.cc | 4 ---- .../Components/plugins/DQMGenericClient.cc | 3 --- 44 files changed, 9 insertions(+), 241 deletions(-) diff --git a/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc b/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc index efe0026f92350..c49429936ea5d 100644 --- a/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc +++ b/DPGAnalysis/HcalTools/plugins/CMTRawAnalyzer.cc @@ -2788,10 +2788,6 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS int mcountmin3 = 0; int mcountmin6 = 0; int mcountmin8 = 0; - int pnnbins1 = 0; - int pnnbins3 = 0; - int pnnbins6 = 0; - int pnnbins8 = 0; int pnnmin1 = 999999999; int pnnmin3 = 999999999; int pnnmin6 = 999999999; @@ -3929,7 +3925,6 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS if (pcountmin1 < pnnmin1) pnnmin1 = pcountmin1; pcountmin1 = 0; - pnnbins1++; } if (mcountmin1 > 0) { if (mcountmin1 < mnnmin1) @@ -3944,7 +3939,6 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS if (pcountmin3 < pnnmin3) pnnmin3 = pcountmin3; pcountmin3 = 0; - pnnbins3++; } if (mcountmin3 > 0) { if (mcountmin3 < mnnmin3) @@ -3959,7 +3953,6 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS if (pcountmin8 < pnnmin8) pnnmin8 = pcountmin8; pcountmin8 = 0; - pnnbins8++; } if (mcountmin8 > 0) { if (mcountmin8 < mnnmin8) @@ -3974,7 +3967,6 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS if (pcountmin6 < pnnmin6) pnnmin6 = pcountmin6; pcountmin6 = 0; - pnnbins6++; } if (mcountmin6 > 0) { if (mcountmin6 < mnnmin6) @@ -5367,9 +5359,6 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS ////////////////////////////////////////////////////////////////////////// // // // // // // //sumamplitudes: - int testcount1 = 0; - int testcount2 = 0; - int testcount3 = 0; //////////////////////////////////////// // k0, k2, k3 loops LOOPS ////////// ///// ///// NO k1 loop over depthes !!! for (int k0 = 0; k0 < nsub; k0++) { int sumofchannels = 0; @@ -5378,13 +5367,6 @@ void CMTRawAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iS double sumamplitudesubdet0 = 0.; for (int k2 = 0; k2 < neta; k2++) { for (int k3 = 0; k3 < nphi; k3++) { - if (amplitudechannel[k0][0][k2][k3] != 0. && amplitudechannel[k0][1][k2][k3] != 0.) - testcount1++; - if (amplitudechannel[k0][0][k2][k3] != 0. && amplitudechannel[k0][1][k2][k3] == 0.) - testcount2++; - if (amplitudechannel[k0][0][k2][k3] == 0. && amplitudechannel[k0][1][k2][k3] != 0.) - testcount3++; - // HB if (k0 == 0) { double sumamplitudechannel_HB = amplitudechannel[k0][0][k2][k3] + amplitudechannel[k0][1][k2][k3]; diff --git a/DQM/CSCMonitorModule/plugins/CSCDQM_StripClusterFinder.cc b/DQM/CSCMonitorModule/plugins/CSCDQM_StripClusterFinder.cc index 66aaeb36457da..3c7a6e58064e6 100644 --- a/DQM/CSCMonitorModule/plugins/CSCDQM_StripClusterFinder.cc +++ b/DQM/CSCMonitorModule/plugins/CSCDQM_StripClusterFinder.cc @@ -249,7 +249,6 @@ namespace cscdqm { for (uint32_t i = 0; i < MEStripClusters.size(); i++) { MEStripClusters[i].localMax.clear(); - int ilocal = 0; int iLS = MEStripClusters[i].LFTBNDStrip; int iRS = MEStripClusters[i].IRTBNDStrip; int iLT = MEStripClusters[i].LFTBNDTime; @@ -272,7 +271,6 @@ namespace cscdqm { localMaxTMP.Strip = iS; localMaxTMP.Time = jT; MEStripClusters[i].localMax.push_back(localMaxTMP); - ilocal++; } } } diff --git a/DQM/DTMonitorClient/src/DTOccupancyTest.cc b/DQM/DTMonitorClient/src/DTOccupancyTest.cc index dee2ad51a36d8..20ec3d6ed763a 100644 --- a/DQM/DTMonitorClient/src/DTOccupancyTest.cc +++ b/DQM/DTMonitorClient/src/DTOccupancyTest.cc @@ -289,11 +289,8 @@ int DTOccupancyTest::runOccupancyTest(TH2F* histo, const DTChamberId& chId, floa int totalDeadCells = 0; int nDeadCellsInARow = 1; int nDeadCellsInARowMax = 0; - int nCellsZeroCount = 0; bool previousIsDead = false; - int interDeadCells = 0; - totCell += nWires; for (int cell = firstWire; cell != (nWires + firstWire); ++cell) { // loop over cells @@ -302,23 +299,18 @@ int DTOccupancyTest::runOccupancyTest(TH2F* histo, const DTChamberId& chId, floa totOccup += cellOccup; if (cellOccup == 0) { - nCellsZeroCount++; totalDeadCells++; if (previousIsDead) { nDeadCellsInARow++; } else { - // if(interDeadCells > 3) { if (nDeadCellsInARow > nDeadCellsInARowMax) nDeadCellsInARowMax = nDeadCellsInARow; nDeadCellsInARow = 1; - // } } previousIsDead = true; - interDeadCells = 0; LogTrace("DTDQM|DTMonitorClient|DTOccupancyTest") << " below reference" << endl; } else { previousIsDead = false; - interDeadCells++; } // // 3 cells not dead between a group of dead cells don't break the count if (nDeadCellsInARow > nDeadCellsInARowMax) diff --git a/DQM/EcalCommon/src/MESetMulti.cc b/DQM/EcalCommon/src/MESetMulti.cc index 3156d5e60b612..1c3494940eb2e 100644 --- a/DQM/EcalCommon/src/MESetMulti.cc +++ b/DQM/EcalCommon/src/MESetMulti.cc @@ -30,7 +30,6 @@ namespace ecaldqm { }); // [dim0 = 0, dim1 = 0] -> 0, [dim0 = 0, dim1 = 1] -> 1, ... - unsigned iM(0); while (true) { replacements.clear(); typename ReplCandidates::const_iterator rItr(replCandidates_.begin()); @@ -38,7 +37,6 @@ namespace ecaldqm { sets_.push_back(_seed.clone(formPath(replacements))); if (last) break; - ++iM; } current_ = sets_[0]; diff --git a/DQM/HcalTasks/src/RecoRunSummary.cc b/DQM/HcalTasks/src/RecoRunSummary.cc index 55efdd2394d5f..2b7c683727448 100644 --- a/DQM/HcalTasks/src/RecoRunSummary.cc +++ b/DQM/HcalTasks/src/RecoRunSummary.cc @@ -135,7 +135,6 @@ namespace hcaldqm { // summary flags std::vector sumflags; - int icrate = 0; for (std::vector::const_iterator it = _vhashCrates.begin(); it != _vhashCrates.end(); ++it) { flag::Flag fSum("RECO"); HcalElectronicsId eid(*it); @@ -164,7 +163,6 @@ namespace hcaldqm { ft->reset(); } sumflags.push_back(fSum); - icrate++; } return sumflags; diff --git a/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc b/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc index 1a613ced55bbf..0d99bb0ae7cd3 100644 --- a/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc +++ b/DQM/L1TMonitor/src/L1TMP7ZeroSupp.cc @@ -167,7 +167,6 @@ void L1TMP7ZeroSupp::analyze(const edm::Event& e, const edm::EventSetup& c) { for (const auto& id : definedMaskCapIds_) { evtGood[id] = true; } - unsigned valid_count = 0; for (const auto& fedId : fedIds_) { const FEDRawData& l1tRcd = feds->FEDData(fedId); @@ -193,8 +192,6 @@ void L1TMP7ZeroSupp::analyze(const edm::Event& e, const edm::EventSetup& c) { << fedId << "."; } continue; - } else { - valid_count++; } const unsigned char* data = l1tRcd.data(); diff --git a/DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc b/DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc index 93b9f06b0ca70..1acf998f76d0b 100644 --- a/DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc +++ b/DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc @@ -132,10 +132,8 @@ bool L1TStage2uGTCaloLayer2Comp::compareJets(const edm::Handleend() || col2It != col2->end()) { while (true) { - ++nJets; // object pt mismatch if (col1It->hwPt() != col2It->hwPt()) { diff --git a/DQM/L1TMonitor/src/L1TdeStage2CaloLayer2.cc b/DQM/L1TMonitor/src/L1TdeStage2CaloLayer2.cc index a08e4c32c5adf..58b718fca5996 100644 --- a/DQM/L1TMonitor/src/L1TdeStage2CaloLayer2.cc +++ b/DQM/L1TMonitor/src/L1TdeStage2CaloLayer2.cc @@ -422,10 +422,8 @@ bool L1TdeStage2CaloLayer2::compareJets(const edm::Handle& return false; } - int nJets = 0; if (dataIt != dataCol->end(currBx) || emulIt != emulCol->end(currBx)) { while (true) { - ++nJets; matchedEmulIt = emulIt; // object pt mismatch diff --git a/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc b/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc index 3915c56b86be8..03b81ded3d5ce 100644 --- a/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc +++ b/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc @@ -41,7 +41,6 @@ void L1EmulatorErrorFlagClient::initialize() { m_systemFolder.reserve(m_nrL1Systems); m_systemErrorFlag.reserve(m_nrL1Systems); - int indexSys = 0; for (std::vector::const_iterator itSystem = m_l1Systems.begin(); itSystem != m_l1Systems.end(); ++itSystem) { @@ -53,7 +52,6 @@ void L1EmulatorErrorFlagClient::initialize() { m_systemFolder.push_back(itSystem->getParameter("SystemFolder")); - indexSys++; } // [SYS]ErrorFlag histogram @@ -115,13 +113,6 @@ void L1EmulatorErrorFlagClient::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker m_summaryContent[iSys] = percAgree; } - int numUnMaskedSystems = 0; - for (unsigned int iMon = 0; iMon < m_nrL1Systems; iMon++) { - if (m_summaryContent[iMon] != -1) { - numUnMaskedSystems++; - } - } - // fill the SummaryErrorFlagMap histogram for L1 systems // (bin 0 - underflow, bin iSys + 1 overflow) for (unsigned int iSys = 0; iSys < m_nrL1Systems; ++iSys) { diff --git a/DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc b/DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc index 1246be3ddabeb..67206e35ce8c5 100644 --- a/DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc +++ b/DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc @@ -459,9 +459,7 @@ void L1TEMTFEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& std::cout << "Ran ibooker.setCurrentFolder(dirEventInfo" << std::endl; // general counters: // iAllQTest: all quality tests for all systems and objects - // iAllMon: all monitored systems and objects int iAllQTest = 0; - int iAllMon = 0; if (m_verbose) std::cout << "m_nrTrackObjects = " << m_nrTrackObjects << std::endl; @@ -500,7 +498,6 @@ void L1TEMTFEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& iAllQTest++; } - iAllMon++; } for (unsigned int iMon = 0; iMon < m_nrHitObjects; ++iMon) { @@ -530,7 +527,6 @@ void L1TEMTFEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& iAllQTest++; } - iAllMon++; } // for Noisy Strips ==================================================================== @@ -553,7 +549,6 @@ void L1TEMTFEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& iAllQTest++; } - iAllMon++; } // for Dead Strips ==================================================================== for (unsigned int iMon = 0; iMon < m_nrDeadStrip; ++iMon) { @@ -575,7 +570,6 @@ void L1TEMTFEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& iAllQTest++; } - iAllMon++; } if (m_verbose) diff --git a/DQM/L1TMonitorClient/src/L1TEventInfoClient.cc b/DQM/L1TMonitorClient/src/L1TEventInfoClient.cc index a0b8cd6f571ab..3e37f5a045858 100644 --- a/DQM/L1TMonitorClient/src/L1TEventInfoClient.cc +++ b/DQM/L1TMonitorClient/src/L1TEventInfoClient.cc @@ -313,9 +313,7 @@ void L1TEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& ige ibooker.setCurrentFolder(dirEventInfo + "/reportSummaryContents"); // general counters: // iAllQTest: all quality tests for all systems and objects - // iAllMon: all monitored systems and objects int iAllQTest = 0; - int iAllMon = 0; for (unsigned int iMon = 0; iMon < m_nrL1Systems; ++iMon) { m_summaryContent.push_back(dqm::qstatus::DISABLED); @@ -332,7 +330,6 @@ void L1TEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& ige iAllQTest++; } - iAllMon++; } for (unsigned int iMon = 0; iMon < m_nrL1Objects; ++iMon) { @@ -350,7 +347,6 @@ void L1TEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& ige iAllQTest++; } - iAllMon++; } ibooker.setCurrentFolder(dirEventInfo); diff --git a/DQM/Physics/src/B2GDQM.cc b/DQM/Physics/src/B2GDQM.cc index 615ae4c21de31..2bf539165ccfe 100644 --- a/DQM/Physics/src/B2GDQM.cc +++ b/DQM/Physics/src/B2GDQM.cc @@ -244,7 +244,6 @@ void B2GDQM::analyzeJets(const Event& iEvent, const edm::EventSetup& iSetup) { edm::View const& pfjets = *pfJetCollection; // Jet Correction - int countJet = 0; for (edm::View::const_iterator jet = pfjets.begin(), jetEnd = pfjets.end(); jet != jetEnd; ++jet) { if (jet->pt() < jetPtMins_[icoll]) @@ -299,7 +298,6 @@ void B2GDQM::analyzeJets(const Event& iEvent, const edm::EventSetup& iSetup) { } // end if collection is AK8 PFJets Puppi soft-drop } // end if basic jet != 0 - countJet++; } } diff --git a/DQM/Physics/src/EwkElecDQM.cc b/DQM/Physics/src/EwkElecDQM.cc index 8887cdc1afca8..7ac723e94ac1b 100644 --- a/DQM/Physics/src/EwkElecDQM.cc +++ b/DQM/Physics/src/EwkElecDQM.cc @@ -535,7 +535,6 @@ hltConfigProvider.prescaleValue(ps, trigName) ; float jet_et = -8.0; float jet_eta = -8.0; - int jet_count = 0; float jet2_et = -9.0; unsigned int jetCollectionSize = jetCollection->size(); int njets = 0; @@ -556,7 +555,6 @@ hltConfigProvider.prescaleValue(ps, trigName) ; if (jet.et() > eJetMin_) { njets++; - jet_count++; } if (jet_current_et > jet_et) { jet2_et = jet_et; // 2nd highest jet get's et from current highest diff --git a/DQM/Physics/src/EwkMuDQM.cc b/DQM/Physics/src/EwkMuDQM.cc index 8104c78b597ad..fec5204510936 100644 --- a/DQM/Physics/src/EwkMuDQM.cc +++ b/DQM/Physics/src/EwkMuDQM.cc @@ -499,7 +499,6 @@ void EwkMuDQM::analyze(const Event& ev, const EventSetup& iSet) { bool zmuon_sel[NFLAGSZ]; bool muon4Z = false; - double number_of_muons = 0; double number_of_goodMuons = 0; for (unsigned int i = 0; i < muonCollectionSize; i++) { @@ -507,8 +506,6 @@ void EwkMuDQM::analyze(const Event& ev, const EventSetup& iSet) { muon_sel[j] = false; } - number_of_muons++; - const Muon& mu = muonCollection->at(i); if (!mu.isGlobalMuon()) continue; @@ -831,7 +828,6 @@ void EwkMuDQM::analyze(const Event& ev, const EventSetup& iSet) { n_zselPt2thr_->Fill(nmuonsForZ2); } - // nmuons_->Fill(number_of_muons); // nmuons_->Fill(muonCollectionSize); ngoodmuons_->Fill(number_of_goodMuons); diff --git a/DQM/Physics/src/EwkMuLumiMonitorDQM.cc b/DQM/Physics/src/EwkMuLumiMonitorDQM.cc index 995d23beb23cb..e694ac50d788b 100644 --- a/DQM/Physics/src/EwkMuLumiMonitorDQM.cc +++ b/DQM/Physics/src/EwkMuLumiMonitorDQM.cc @@ -315,7 +315,6 @@ void EwkMuLumiMonitorDQM::analyze(const Event& ev, const EventSetup&) { } ev.getByToken(trigEvToken_, handleTriggerEvent); const trigger::TriggerObjectCollection& toc(handleTriggerEvent->getObjects()); - size_t nMuHLT = 0; std::vector HLTMuMatched; for (size_t ia = 0; ia < handleTriggerEvent->sizeFilters(); ++ia) { std::string fullname = handleTriggerEvent->filterTag(ia).encode(); @@ -337,7 +336,6 @@ void EwkMuLumiMonitorDQM::analyze(const Event& ev, const EventSetup&) { hlt_sel = true; nhlt++; HLTMuMatched.push_back(toc[*ki].particle()); - nMuHLT++; } } } diff --git a/DQM/Physics/src/EwkTauDQM.cc b/DQM/Physics/src/EwkTauDQM.cc index 922d63bfc83dc..bbf5435bd9cef 100644 --- a/DQM/Physics/src/EwkTauDQM.cc +++ b/DQM/Physics/src/EwkTauDQM.cc @@ -398,17 +398,6 @@ void EwkElecTauHistManager::fillHistograms(const edm::Event& evt, const edm::Eve // apply selection criteria; fill histograms //----------------------------------------------------------------------------- - //--- fill electron multiplicity histogram - unsigned numIdElectrons = 0; - for (reco::GsfElectronCollection::const_iterator electron = electrons->begin(); electron != electrons->end(); - ++electron) { - if (passesElectronId(*electron)) { - ++numIdElectrons; - } - } - - // hNumIdElectrons_->Fill(numIdElectrons); - ++numEventsAnalyzed_; bool isSelected = false; @@ -860,16 +849,6 @@ void EwkMuTauHistManager::fillHistograms(const edm::Event& evt, const edm::Event // apply selection criteria; fill histograms //----------------------------------------------------------------------------- - //--- fill muon multiplicity histogram - unsigned numGlobalMuons = 0; - for (reco::MuonCollection::const_iterator muon = muons->begin(); muon != muons->end(); ++muon) { - if (muon->isGlobalMuon()) { - ++numGlobalMuons; - } - } - - // hNumGlobalMuons_->Fill(numGlobalMuons); - ++numEventsAnalyzed_; bool isSelected = false; diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM.cc b/DQM/Physics/src/SingleTopTChannelLeptonDQM.cc index b802268890a6f..549cac994bc62 100644 --- a/DQM/Physics/src/SingleTopTChannelLeptonDQM.cc +++ b/DQM/Physics/src/SingleTopTChannelLeptonDQM.cc @@ -780,7 +780,6 @@ void SingleTopTChannelLeptonDQM::analyze(const edm::Event& event, const edm::Eve return; } // apply selection steps - unsigned int passed = 0; unsigned int nJetSteps = -1; unsigned int nPFJetSteps = -1; unsigned int nCaloJetSteps = -1; @@ -796,14 +795,12 @@ void SingleTopTChannelLeptonDQM::analyze(const edm::Event& event, const edm::Eve } if (type == "elecs" && ElectronStep != nullptr) { if (ElectronStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; } if (type == "elecs/pf" && PFElectronStep != nullptr) { if (PFElectronStep->select(event, "electron")) { - ++passed; selection_[key].second->fill(event, setup); @@ -812,14 +809,12 @@ void SingleTopTChannelLeptonDQM::analyze(const edm::Event& event, const edm::Eve } if (type == "muons" && MuonStep != nullptr) { if (MuonStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; } if (type == "muons/pf" && PFMuonStep != nullptr) { if (PFMuonStep->select(event, "muon")) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -828,7 +823,6 @@ void SingleTopTChannelLeptonDQM::analyze(const edm::Event& event, const edm::Eve nJetSteps++; if (JetSteps[nJetSteps]) { if (JetSteps[nJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -838,7 +832,6 @@ void SingleTopTChannelLeptonDQM::analyze(const edm::Event& event, const edm::Eve nPFJetSteps++; if (PFJetSteps[nPFJetSteps]) { if (PFJetSteps[nPFJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -848,7 +841,6 @@ void SingleTopTChannelLeptonDQM::analyze(const edm::Event& event, const edm::Eve nCaloJetSteps++; if (CaloJetSteps[nCaloJetSteps]) { if (CaloJetSteps[nCaloJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -856,7 +848,6 @@ void SingleTopTChannelLeptonDQM::analyze(const edm::Event& event, const edm::Eve } if (type == "met" && METStep != nullptr) { if (METStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.cc b/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.cc index 5fb99fbe77161..e056e6b0706c0 100644 --- a/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.cc +++ b/DQM/Physics/src/SingleTopTChannelLeptonDQM_miniAOD.cc @@ -821,7 +821,6 @@ void SingleTopTChannelLeptonDQM_miniAOD::analyze(const edm::Event& event, const return; } - unsigned int passed = 0; unsigned int nJetSteps = -1; for (std::vector::const_iterator selIt = selectionOrder_.begin(); selIt != selectionOrder_.end(); @@ -833,8 +832,6 @@ void SingleTopTChannelLeptonDQM_miniAOD::analyze(const edm::Event& event, const } if (type == "muons" && MuonStep != nullptr) { if (MuonStep->select(event)) { - ++passed; - selection_[key].second->fill(event, setup); } else break; @@ -842,7 +839,6 @@ void SingleTopTChannelLeptonDQM_miniAOD::analyze(const edm::Event& event, const if (type == "elecs" && ElectronStep != nullptr) { if (ElectronStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -850,7 +846,6 @@ void SingleTopTChannelLeptonDQM_miniAOD::analyze(const edm::Event& event, const if (type == "pvs" && PvStep != nullptr) { if (PvStep->selectVertex(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -860,7 +855,6 @@ void SingleTopTChannelLeptonDQM_miniAOD::analyze(const edm::Event& event, const nJetSteps++; if (JetSteps[nJetSteps] != nullptr) { if (JetSteps[nJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -869,7 +863,6 @@ void SingleTopTChannelLeptonDQM_miniAOD::analyze(const edm::Event& event, const if (type == "met" && METStep != nullptr) { if (METStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; diff --git a/DQM/Physics/src/TopDiLeptonOfflineDQM.cc b/DQM/Physics/src/TopDiLeptonOfflineDQM.cc index ea39ffa7def3e..d701d7c1c6c13 100644 --- a/DQM/Physics/src/TopDiLeptonOfflineDQM.cc +++ b/DQM/Physics/src/TopDiLeptonOfflineDQM.cc @@ -781,8 +781,6 @@ void TopDiLeptonOfflineDQM::analyze(const edm::Event& event, const edm::EventSet if (!(*beamspotSelect_)(*beamspot)) return; } - unsigned int passed = 0; - unsigned int nJetSteps = -1; unsigned int nPFJetSteps = -1; @@ -798,14 +796,12 @@ void TopDiLeptonOfflineDQM::analyze(const edm::Event& event, const edm::EventSet } if (type == "muons" && MuonStep != nullptr) { if (MuonStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; } if (type == "elecs" && ElectronStep != nullptr) { if (ElectronStep->select(event, "electron")) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -814,7 +810,6 @@ void TopDiLeptonOfflineDQM::analyze(const edm::Event& event, const edm::EventSet nJetSteps++; if (JetSteps[nJetSteps] != nullptr) { if (JetSteps[nJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -825,7 +820,6 @@ void TopDiLeptonOfflineDQM::analyze(const edm::Event& event, const edm::EventSet nPFJetSteps++; if (PFJetSteps[nPFJetSteps] != nullptr) { if (PFJetSteps[nPFJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -836,7 +830,6 @@ void TopDiLeptonOfflineDQM::analyze(const edm::Event& event, const edm::EventSet nCaloJetSteps++; if (CaloJetSteps[nCaloJetSteps] != nullptr) { if (CaloJetSteps[nCaloJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -844,7 +837,6 @@ void TopDiLeptonOfflineDQM::analyze(const edm::Event& event, const edm::EventSet } if (type == "met" && METStep != nullptr) { - ++passed; if (METStep->select(event)) { selection_[key].second->fill(event, setup); } else diff --git a/DQM/Physics/src/TopSingleLeptonDQM.cc b/DQM/Physics/src/TopSingleLeptonDQM.cc index 79c70ecd54e5d..7fe4891ac8a42 100644 --- a/DQM/Physics/src/TopSingleLeptonDQM.cc +++ b/DQM/Physics/src/TopSingleLeptonDQM.cc @@ -772,7 +772,6 @@ void TopSingleLeptonDQM::analyze(const edm::Event& event, const edm::EventSetup& return; } // cout<<" apply selection steps"<select(event)) { - ++passed; // cout<<"selected event! "<fill(event, setup); } else @@ -795,7 +793,6 @@ void TopSingleLeptonDQM::analyze(const edm::Event& event, const edm::EventSetup& if (type == "elecs" && ElectronStep != nullptr) { // cout<<"In electrons ..."<select(event, "electron")) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -803,7 +800,6 @@ void TopSingleLeptonDQM::analyze(const edm::Event& event, const edm::EventSetup& // cout<<" apply selection steps 3"<selectVertex(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -813,7 +809,6 @@ void TopSingleLeptonDQM::analyze(const edm::Event& event, const edm::EventSetup& nJetSteps++; if (JetSteps[nJetSteps] != nullptr) { if (JetSteps[nJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -823,7 +818,6 @@ void TopSingleLeptonDQM::analyze(const edm::Event& event, const edm::EventSetup& nPFJetSteps++; if (PFJetSteps[nPFJetSteps] != nullptr) { if (PFJetSteps[nPFJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -833,7 +827,6 @@ void TopSingleLeptonDQM::analyze(const edm::Event& event, const edm::EventSetup& nCaloJetSteps++; if (CaloJetSteps[nCaloJetSteps] != nullptr) { if (CaloJetSteps[nCaloJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -841,7 +834,6 @@ void TopSingleLeptonDQM::analyze(const edm::Event& event, const edm::EventSetup& } if (type == "met" && METStep != nullptr) { if (METStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; diff --git a/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.cc b/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.cc index 8e9ff28bae3a4..6be54b86a8308 100644 --- a/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.cc +++ b/DQM/Physics/src/TopSingleLeptonDQM_miniAOD.cc @@ -777,7 +777,6 @@ void TopSingleLeptonDQM_miniAOD::analyze(const edm::Event& event, const edm::Eve return; } - unsigned int passed = 0; unsigned int nJetSteps = -1; for (std::vector::const_iterator selIt = selectionOrder_.begin(); selIt != selectionOrder_.end(); @@ -789,8 +788,6 @@ void TopSingleLeptonDQM_miniAOD::analyze(const edm::Event& event, const edm::Eve } if (type == "muons" && MuonStep != nullptr) { if (MuonStep->select(event)) { - ++passed; - selection_[key].second->fill(event, setup); } else break; @@ -798,7 +795,6 @@ void TopSingleLeptonDQM_miniAOD::analyze(const edm::Event& event, const edm::Eve if (type == "elecs" && ElectronStep != nullptr) { if (ElectronStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -806,7 +802,6 @@ void TopSingleLeptonDQM_miniAOD::analyze(const edm::Event& event, const edm::Eve if (type == "pvs" && PvStep != nullptr) { if (PvStep->selectVertex(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -816,7 +811,6 @@ void TopSingleLeptonDQM_miniAOD::analyze(const edm::Event& event, const edm::Eve nJetSteps++; if (JetSteps[nJetSteps] != nullptr) { if (JetSteps[nJetSteps]->select(event, setup)) { - ++passed; selection_[key].second->fill(event, setup); } else break; @@ -825,7 +819,6 @@ void TopSingleLeptonDQM_miniAOD::analyze(const edm::Event& event, const edm::Eve if (type == "met" && METStep != nullptr) { if (METStep->select(event)) { - ++passed; selection_[key].second->fill(event, setup); } else break; diff --git a/DQM/RPCMonitorDigi/src/RPCTTUMonitor.cc b/DQM/RPCMonitorDigi/src/RPCTTUMonitor.cc index b922c91017344..6b9b2b40501ca 100644 --- a/DQM/RPCMonitorDigi/src/RPCTTUMonitor.cc +++ b/DQM/RPCMonitorDigi/src/RPCTTUMonitor.cc @@ -57,28 +57,24 @@ void RPCTTUMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe //. RPC if (m_rpcTrigger) { - int ndec(0); const int bx1 = (bxX - m_GMTcandidatesBx[0]); for (const auto& dec : ttuDec) { if (dec.second) { const int bx2 = dec.first; const float bxdiffPacTT = 1.0 * (bx1 - bx2); m_bxDistDiffPac[k]->Fill(bxdiffPacTT); - ++ndec; } } } //.. DT if (m_dtTrigger) { - int ndec(0); const int bx1 = (bxX - m_DTcandidatesBx[0]); for (const auto& dec : ttuDec) { if (dec.second) { const int bx2 = dec.first; const float bxdiffDtTT = 1.0 * (bx1 - bx2); m_bxDistDiffDt[k]->Fill(bxdiffDtTT); - ++ndec; } } } diff --git a/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc b/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc index f7ed01fdb6462..3abfa10dcd180 100644 --- a/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc +++ b/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc @@ -1273,7 +1273,6 @@ void SiPixelActionExecutor::fillGrandEndcapSummaryHistos(DQMStore::IBooker &iBoo (dir_name.find("Shell") == 0) || (dir_name.find("Layer") == 0) || (dir_name.find("Ladder") == 0)) return; vector subdirs = iGetter.getSubdirs(); - int iDir = 0; int nbin = 0; int nbin_i = 0; int nbin_subdir = 0; @@ -1568,7 +1567,6 @@ void SiPixelActionExecutor::fillGrandEndcapSummaryHistos(DQMStore::IBooker &iBoo } } - iDir++; first_subdir = false; // We are done processing the first directory, we // don't add any new MEs in the future passes. } // end for it (subdirs) diff --git a/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc b/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc index 262cf2673fc6b..2e7ba14130297 100644 --- a/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc +++ b/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc @@ -430,7 +430,6 @@ void SiPixelInformationExtractor::findNoisyPixels(DQMStore::IBooker &iBooker, std::map myfedmap; std::map mynamemap; int realfedID = -1; - int counter = 0; int n_noisyrocs_all = 0; int n_noisyrocs_barrel = 0; int n_noisyrocs_endcap = 0; @@ -483,7 +482,6 @@ void SiPixelInformationExtractor::findNoisyPixels(DQMStore::IBooker &iBooker, float Noise_frac = (*pxl).second; int offlineColumn = offlineaddress.first; int offlineRow = offlineaddress.second; - counter++; sipixelobjects::ElectronicIndex cabling; SiPixelFrameConverter formatter(theCablingMap, realfedID); diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc index 45b5deacbdc09..b2064dd62bb6a 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc @@ -375,10 +375,8 @@ void SiPixelHitEfficiencySource::analyze(const edm::Event &iEvent, const edm::Ev int L1hits = 0; int L2hits = 0; int L3hits = 0; - int L4hits = 0; int D1hits = 0; int D2hits = 0; - int D3hits = 0; std::vector tmeasColl = traj_iterator->measurements(); std::vector::const_iterator tmeasIt; // loop on measurements to find out what kind of hits there are @@ -408,8 +406,6 @@ void SiPixelHitEfficiencySource::analyze(const edm::Event &iEvent, const edm::Ev L2hits++; if (hit_layer == 3) L3hits++; - if (hit_layer == 4) - L4hits++; } if (testSubDetID == PixelSubdetector::PixelEndcap) { isFpixtrack = true; @@ -419,8 +415,6 @@ void SiPixelHitEfficiencySource::analyze(const edm::Event &iEvent, const edm::Ev D1hits++; if (hit_disk == 2) D2hits++; - if (hit_disk == 3) - D3hits++; } if (testSubDetID == StripSubdetector::TIB) nStripHits++; diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc index dba902bde3f2e..c8f7ad06dd8c3 100644 --- a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc +++ b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc @@ -908,13 +908,11 @@ void SiPixelTrackResidualSource::analyze(const edm::Event &iEvent, const edm::Ev if (!TracksForRes.isValid()) return; - int kk = -1; //---------------------------------------------------------------------------- // Residuals: // for (reco::TrackCollection::const_iterator iTrack = TracksForRes->begin(); iTrack != TracksForRes->end(); ++iTrack) { // count - kk++; // Calculate minimal track pt before curling // cpt = cqRB = 0.3*R[m]*B[T] = 1.14*R[m] for B=3.8T // D = 2R = 2*pt/1.14 diff --git a/DQM/SiStripCommissioningAnalysis/src/ApvTimingAlgorithm.cc b/DQM/SiStripCommissioningAnalysis/src/ApvTimingAlgorithm.cc index 6169acedb77ea..12fe67c1d719c 100644 --- a/DQM/SiStripCommissioningAnalysis/src/ApvTimingAlgorithm.cc +++ b/DQM/SiStripCommissioningAnalysis/src/ApvTimingAlgorithm.cc @@ -87,7 +87,6 @@ void ApvTimingAlgorithm::analyse() { } // Transfer histogram contents/errors/stats to containers - uint16_t non_zero = 0; float max = -1. * sistrip::invalid_; float min = 1. * sistrip::invalid_; uint16_t nbins = static_cast(histo->GetNbinsX()); @@ -108,7 +107,6 @@ void ApvTimingAlgorithm::analyse() { if (bin_contents[ibin] < min) { min = bin_contents[ibin]; } - non_zero++; } } if (bin_contents.size() < 100) { diff --git a/DQM/SiStripCommissioningAnalysis/src/FedTimingAlgorithm.cc b/DQM/SiStripCommissioningAnalysis/src/FedTimingAlgorithm.cc index 075cbee53a42e..7feb0a7eea08c 100644 --- a/DQM/SiStripCommissioningAnalysis/src/FedTimingAlgorithm.cc +++ b/DQM/SiStripCommissioningAnalysis/src/FedTimingAlgorithm.cc @@ -81,7 +81,6 @@ void FedTimingAlgorithm::analyse() { } // Transfer histogram contents/errors/stats to containers - uint16_t non_zero = 0; float max = -1.e9; float min = 1.e9; uint16_t nbins = static_cast(histo_.first->GetNbinsX()); @@ -102,11 +101,9 @@ void FedTimingAlgorithm::analyse() { if (bin_contents[ibin] < min) { min = bin_contents[ibin]; } - non_zero++; } } - //LogTrace(mlCommissioning_) << " Number of bins with non-zero entries: " << non_zero; if (bin_contents.size() < 100) { anal->addErrorCode(sistrip::numberOfBins_); return; diff --git a/DQM/SiStripCommissioningClients/src/FedTimingHistograms.cc b/DQM/SiStripCommissioningClients/src/FedTimingHistograms.cc index 99224fe576cef..fc8727adb38a6 100644 --- a/DQM/SiStripCommissioningClients/src/FedTimingHistograms.cc +++ b/DQM/SiStripCommissioningClients/src/FedTimingHistograms.cc @@ -115,12 +115,10 @@ void FedTimingHistograms::histoAnalysis(bool debug) { std::map::iterator ianal = data_.begin(); for (; ianal != data_.end(); ianal++) { ianal->second.max(time_max); - static uint16_t cntr = 0; if (debug) { std::stringstream ss; ianal->second.print(ss); cout << ss.str() << endl; - cntr++; } } } diff --git a/DQM/TrackerRemapper/plugins/TrackerRemapper.cc b/DQM/TrackerRemapper/plugins/TrackerRemapper.cc index 945a0d8e5f007..80fbb011a040f 100644 --- a/DQM/TrackerRemapper/plugins/TrackerRemapper.cc +++ b/DQM/TrackerRemapper/plugins/TrackerRemapper.cc @@ -422,7 +422,6 @@ void TrackerRemapper::readVertices(double& minx, double& maxx, double& miny, dou // TPolyline vertices stored at https://github.com/cms-data/DQM-SiStripMonitorClient in.open(edm::FileInPath("DQM/SiStripMonitorClient/data/Geometry/tracker_map_bare").fullPath().c_str()); - unsigned count = 0; if (!in.good()) { throw cms::Exception("TrackerRemapper") << "Error Reading File" << std::endl; @@ -433,7 +432,6 @@ void TrackerRemapper::readVertices(double& minx, double& maxx, double& miny, dou std::string line; std::getline(in, line); - ++count; TString string(line); TObjArray* array = string.Tokenize(" "); diff --git a/DQM/TrackerRemapper/src/Phase1PixelSummaryMap.cc b/DQM/TrackerRemapper/src/Phase1PixelSummaryMap.cc index bea0a2edf4140..ee49e3c2db91b 100644 --- a/DQM/TrackerRemapper/src/Phase1PixelSummaryMap.cc +++ b/DQM/TrackerRemapper/src/Phase1PixelSummaryMap.cc @@ -135,7 +135,7 @@ void Phase1PixelSummaryMap::printTrackerMap(TCanvas& canvas, const float topMarg txt.SetTextAngle(0); //# draw new-style title - txt.SetTextSize((topMargin == 0.02) ? 0.05 : 0.03); + txt.SetTextSize(0.03); txt.DrawLatex(0.5, ((index == 0) ? 0.95 : 0.93), (fmt::sprintf("Pixel Tracker Map: %s", m_title)).c_str()); txt.SetTextSize(0.03); diff --git a/DQM/TrackingMonitor/src/TrackAnalyzer.cc b/DQM/TrackingMonitor/src/TrackAnalyzer.cc index 18463bb1fb0ab..7768c59cea4f1 100644 --- a/DQM/TrackingMonitor/src/TrackAnalyzer.cc +++ b/DQM/TrackingMonitor/src/TrackAnalyzer.cc @@ -1140,7 +1140,6 @@ void TrackAnalyzer::setLumi(const edm::Event& iEvent, const edm::EventSetup& iSe // Count the number of clusters with at least a minimum // number of pixels per cluster and at least a minimum charge. size_t numClusters = 0; - size_t tot = 0; edmNew::DetSetVector::const_iterator pixCluDet = pixelClusters->begin(); for (; pixCluDet != pixelClusters->end(); ++pixCluDet) { @@ -1153,7 +1152,6 @@ void TrackAnalyzer::setLumi(const edm::Event& iEvent, const edm::EventSetup& iSe edmNew::DetSet::const_iterator pixClu = pixCluDet->begin(); for (; pixClu != pixCluDet->end(); ++pixClu) { - ++tot; if ((pixClu->size() >= minNumberOfPixelsPerCluster_) && (pixClu->charge() >= minPixelClusterCharge_)) { ++numClusters; } diff --git a/DQM/TrackingMonitor/src/TrackSplittingMonitor.cc b/DQM/TrackingMonitor/src/TrackSplittingMonitor.cc index 5c81a747fb6f0..4dce052b709d2 100644 --- a/DQM/TrackingMonitor/src/TrackSplittingMonitor.cc +++ b/DQM/TrackingMonitor/src/TrackSplittingMonitor.cc @@ -216,14 +216,9 @@ void TrackSplittingMonitor::analyze(const edm::Event& iEvent, const edm::EventSe } // looping through the hits for track 2 double nRechits2 = 0; - double nRechitinBPIX2 = 0; for (trackingRecHit_iterator iHit = track2.recHitsBegin(); iHit != track2.recHitsEnd(); ++iHit) { if ((*iHit)->isValid()) { nRechits2++; - int type = (*iHit)->geographicalId().subdetId(); - if (type == int(PixelSubdetector::PixelBarrel)) { - ++nRechitinBPIX2; - } } } diff --git a/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc b/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc index 4221bac50904e..8eac442706540 100644 --- a/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc +++ b/DQM/TrackingMonitorClient/src/TrackingQualityChecker.cc @@ -496,7 +496,6 @@ void TrackingQualityChecker::fillTrackingStatusAtLumi(DQMStore::IBooker& ibooker if (!TrackingUtility::goToDir(ibooker, igetter, TopFolderName_)) return; - int ibin = 0; for (std::map::iterator it = TrackingLSMEsMap.begin(); it != TrackingLSMEsMap.end(); it++) { if (verbose_) @@ -504,8 +503,6 @@ void TrackingQualityChecker::fillTrackingStatusAtLumi(DQMStore::IBooker& ibooker << " [" << it->second.TrackingFlag->getFullname() << "] flag: " << it->second.TrackingFlag->getFloatValue() << std::endl; - ibin++; - std::string localMEdirpath = it->second.HistoLSDir; std::string MEname = it->second.HistoLSName; float lower_cut = it->second.HistoLSLowerCut; diff --git a/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc b/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc index 11388c2454f2e..62164525b9f84 100644 --- a/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc +++ b/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc @@ -850,7 +850,6 @@ void DQMSourcePi0::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet // Selection, based on Simple clustering // pi0 candidates - int npi0_s = 0; // if (nClus <= 1) return; for (Int_t i = 0; i < nClus; i++) { @@ -921,14 +920,12 @@ void DQMSourcePi0::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet //"<Fill(s4s9ClusEndCap[i]); hS4S92Pi0EE_->Fill(s4s9ClusEndCap[j]); - npi0_se++; } } } } // End of the "j" loop over Simple Clusters } // End of the "i" loop over Simple Clusters - // cout<<" (Simple Clustering) EE Pi0 candidates #: - // "<Fill(s4s9ClusEndCap[i]); hS4S92EtaEE_->Fill(s4s9ClusEndCap[j]); - npi0_se++; } } } } // End of the "j" loop over Simple Clusters } // End of the "i" loop over Simple Clusters - // cout<<" (Simple Clustering) EE Eta candidates #: - // "<begin(); moIter != recoClusters->end(); moIter++) { // // number of matching objects - matchingObjectNum++; if (moIter->energy() / cosh(moIter->eta()) > maxPtMatchingObject_ || std::abs(moIter->eta()) > maxAbsEtaMatchingObject_) { diff --git a/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc b/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc index 1f69cb8bb5d4b..6e4538cc40da6 100644 --- a/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc +++ b/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc @@ -550,10 +550,6 @@ void HcalRecHitsAnalyzer::analyze(edm::Event const &ev, edm::EventSetup const &i // cuts for each subdet_ector mimiking "Scheme B" // double cutHB = 0.9, cutHE = 1.4, cutHO = 1.1, cutHFL = 1.2, cutHFS = 1.8; - // Total numbet of RecHits in HCAL, in the cone, above 1 GeV theshold - int nrechits = 0; - int nrechitsThresh = 0; - // energy in ECAL double eEcalCone = 0.; @@ -846,11 +842,6 @@ void HcalRecHitsAnalyzer::analyze(edm::Event const &ev, edm::EventSetup const &i clusEn += en; } - nrechits++; - - if (en > 1.) - nrechitsThresh++; - // The energy and overall timing histos are drawn while // the ones split by depth are not if (sub == 1 && (subdet_ == 1 || subdet_ == 5)) { diff --git a/DQMOffline/JetMET/src/BeamHaloAnalyzer.cc b/DQMOffline/JetMET/src/BeamHaloAnalyzer.cc index 923bd54eff4df..2b79b4f7a8a41 100644 --- a/DQMOffline/JetMET/src/BeamHaloAnalyzer.cc +++ b/DQMOffline/JetMET/src/BeamHaloAnalyzer.cc @@ -508,7 +508,6 @@ void BeamHaloAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& //Get EB RecHits edm::Handle TheEBRecHits; iEvent.getByToken(IT_EBRecHit, TheEBRecHits); - int EBHits = 0; if (TheEBRecHits.isValid()) { for (EBRecHitCollection::const_iterator iEBRecHit = TheEBRecHits->begin(); iEBRecHit != TheEBRecHits->end(); iEBRecHit++) { @@ -519,7 +518,6 @@ void BeamHaloAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& int ieta = EcalId.ieta(); if (!StandardDQM) hExtra_EcalToF->Fill(ieta, iEBRecHit->time()); - EBHits++; } } diff --git a/DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc b/DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc index 4f154851de33d..84b3b29d19be2 100644 --- a/DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc +++ b/DQMOffline/JetMET/src/HCALRecHitAnalyzer.cc @@ -258,12 +258,9 @@ void HCALRecHitAnalyzer::FillGeometry(const edm::EventSetup& iSetup) { int HBmin_iphi = 99, HBmax_iphi = -99; // Loop Over all Hcal Barrel DetId's - int nHBdetid = 0; std::vector HBids = HBgeom->getValidDetIds(DetId::Hcal, HcalBarrel); for (i = HBids.begin(); i != HBids.end(); i++) { - nHBdetid++; - HcalDetId HcalID(*i); int Calo_ieta = 42 + HcalID.ieta(); @@ -290,12 +287,9 @@ void HCALRecHitAnalyzer::FillGeometry(const edm::EventSetup& iSetup) { int HEmin_iphi = 99, HEmax_iphi = -99; // Loop Over all Hcal Endcap DetId's - int nHEdetid = 0; std::vector HEids = HEgeom->getValidDetIds(DetId::Hcal, HcalEndcap); for (i = HEids.begin(); i != HEids.end(); i++) { - nHEdetid++; - HcalDetId HcalID(*i); int Calo_ieta = 42 + HcalID.ieta(); @@ -323,12 +317,9 @@ void HCALRecHitAnalyzer::FillGeometry(const edm::EventSetup& iSetup) { int HFmin_iphi = 99, HFmax_iphi = -99; // Loop Over all Hcal Forward DetId's - int nHFdetid = 0; std::vector HFids = HFgeom->getValidDetIds(DetId::Hcal, HcalForward); for (i = HFids.begin(); i != HFids.end(); i++) { - nHFdetid++; - auto cell = HFgeom->getGeometry(*i); HcalDetId HcalID(i->rawId()); //GlobalPoint p = cell->getPosition(); @@ -358,12 +349,9 @@ void HCALRecHitAnalyzer::FillGeometry(const edm::EventSetup& iSetup) { int HOmin_iphi = 99, HOmax_iphi = -99; // Loop Over all Hcal Outer DetId's - int nHOdetid = 0; std::vector HOids = HOgeom->getValidDetIds(DetId::Hcal, HcalOuter); for (i = HOids.begin(); i != HOids.end(); i++) { - nHOdetid++; - auto cell = HOgeom->getGeometry(*i); HcalDetId HcalID(i->rawId()); //GlobalPoint p = cell->getPosition(); @@ -494,7 +482,6 @@ void HCALRecHitAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup // Loop over HBHERecHit's HBHERecHitCollection::const_iterator hbherechit; - int nHBrechit = 0, nHErechit = 0; for (hbherechit = HBHERecHits->begin(); hbherechit != HBHERecHits->end(); hbherechit++) { HcalDetId det = hbherechit->id(); @@ -569,11 +556,6 @@ void HCALRecHitAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup break; } // end switch - if (HcalNum == HcalBarrel) { - nHBrechit++; - } else { // HcalEndcap - nHErechit++; - } } // end loop over HBHERecHit's // Fill eta-ring MET quantities @@ -643,11 +625,8 @@ void HCALRecHitAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup // Loop over HORecHit's HORecHitCollection::const_iterator horechit; - int nHOrechit = 0; for (horechit = HORecHits->begin(); horechit != HORecHits->end(); horechit++) { - nHOrechit++; - HcalDetId det = horechit->id(); double Energy = horechit->energy(); ///Int_t depth = det.depth(); //always 4 @@ -722,11 +701,8 @@ void HCALRecHitAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup // Loop over HFRecHit's HFRecHitCollection::const_iterator hfrechit; - int nHFrechit = 0; for (hfrechit = HFRecHits->begin(); hfrechit != HFRecHits->end(); hfrechit++) { - nHFrechit++; - HcalDetId det = hfrechit->id(); double Energy = hfrechit->energy(); Int_t depth = det.depth(); diff --git a/DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc b/DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc index 7bd5a8ed6e472..681877c7f21bb 100644 --- a/DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc +++ b/DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc @@ -300,10 +300,6 @@ void JetAnalyzer_HeavyIons_matching::analyze(const edm::Event& mEvent, const edm bool onlyJet2 = (jet1 == 0 && jet2 > 0) ? true : false; bool bothJet1Jet2 = (jet1 > 0 && jet2 > 0) ? true : false; - int matchedJets = 0; - int unmatchedJet1 = 0; - int unmatchedJet2 = 0; - std::vector::const_iterator iJet, jJet; if (onlyJet1) { @@ -347,7 +343,6 @@ void JetAnalyzer_HeavyIons_matching::analyze(const edm::Event& mEvent, const edm Jet1_ID[Aj.id] = 1; Jet2_ID[Bj.id] = 1; - matchedJets++; } } @@ -360,7 +355,6 @@ void JetAnalyzer_HeavyIons_matching::analyze(const edm::Event& mEvent, const edm if (Jet1_ID[Aj.id] == 0) { mpT_Jet1_unmatched->Fill(recoJet1[Aj.id]->pt()); - unmatchedJet1++; Jet1_ID[Aj.id] = 1; if (std::string("VsCalo") == JetType1 || std::string("PuCalo") == JetType1) { @@ -387,7 +381,6 @@ void JetAnalyzer_HeavyIons_matching::analyze(const edm::Event& mEvent, const edm if (Jet2_ID[Bj.id] == 0) { mpT_Jet2_unmatched->Fill(recoJet2[Bj.id]->pt()); - unmatchedJet2++; Jet2_ID[Bj.id] = 2; if (std::string("VsCalo") == JetType2 || std::string("PuCalo") == JetType2) { mHadEnergy_Jet2_unmatched->Fill((*caloJet2)[Bj.id].hadEnergyInHO() + (*caloJet2)[Bj.id].hadEnergyInHB() + diff --git a/DQMOffline/Muon/src/CSCOfflineMonitor.cc b/DQMOffline/Muon/src/CSCOfflineMonitor.cc index b37c0cf1d52e4..d117007e1baa3 100644 --- a/DQMOffline/Muon/src/CSCOfflineMonitor.cc +++ b/DQMOffline/Muon/src/CSCOfflineMonitor.cc @@ -1342,11 +1342,9 @@ void CSCOfflineMonitor::doResolution(edm::Handle cscSegmen // try to get the CSC recHits that contribute to this segment. std::vector theseRecHits = (*dSiter).specificRecHits(); int nRH = (*dSiter).nRecHits(); - int jRH = 0; CLHEP::HepMatrix sp(6, 1); CLHEP::HepMatrix se(6, 1); for (vector::const_iterator iRH = theseRecHits.begin(); iRH != theseRecHits.end(); iRH++) { - jRH++; CSCDetId idRH = (CSCDetId)(*iRH).cscDetId(); //int kEndcap = idRH.endcap(); int kRing = idRH.ring(); diff --git a/DQMOffline/Trigger/plugins/HLTTauRefProducer.cc b/DQMOffline/Trigger/plugins/HLTTauRefProducer.cc index 2abf16f72e549..e88a2488c0674 100644 --- a/DQMOffline/Trigger/plugins/HLTTauRefProducer.cc +++ b/DQMOffline/Trigger/plugins/HLTTauRefProducer.cc @@ -221,7 +221,7 @@ void HLTTauRefProducer::doPFTaus(edm::StreamID iID, edm::Event& iEvent) const { } } } - iEvent.put(move(product_PFTaus), "PFTaus"); + iEvent.put(std::move(product_PFTaus), "PFTaus"); } void HLTTauRefProducer::doElectrons(edm::Event& iEvent) const { @@ -230,7 +230,7 @@ void HLTTauRefProducer::doElectrons(edm::Event& iEvent) const { edm::Handle pCtfTracks; if (!iEvent.getByToken(e_ctfTrackCollection_, pCtfTracks)) { edm::LogInfo("") << "Error! Can't get " << e_ctfTrackCollectionSrc_.label() << " by label. "; - iEvent.put(move(product_Electrons), "Electrons"); + iEvent.put(std::move(product_Electrons), "Electrons"); return; } @@ -268,7 +268,7 @@ void HLTTauRefProducer::doElectrons(edm::Event& iEvent) const { } } } - iEvent.put(move(product_Electrons), "Electrons"); + iEvent.put(std::move(product_Electrons), "Electrons"); } void HLTTauRefProducer::doMuons(edm::Event& iEvent) const { @@ -283,7 +283,7 @@ void HLTTauRefProducer::doMuons(edm::Event& iEvent) const { } } } - iEvent.put(move(product_Muons), "Muons"); + iEvent.put(std::move(product_Muons), "Muons"); } void HLTTauRefProducer::doJets(edm::Event& iEvent) const { @@ -298,7 +298,7 @@ void HLTTauRefProducer::doJets(edm::Event& iEvent) const { } } } - iEvent.put(move(product_Jets), "Jets"); + iEvent.put(std::move(product_Jets), "Jets"); } void HLTTauRefProducer::doTowers(edm::Event& iEvent) const { @@ -323,7 +323,7 @@ void HLTTauRefProducer::doTowers(edm::Event& iEvent) const { } } } - iEvent.put(move(product_Towers), "Towers"); + iEvent.put(std::move(product_Towers), "Towers"); } void HLTTauRefProducer::doPhotons(edm::Event& iEvent) const { @@ -338,7 +338,7 @@ void HLTTauRefProducer::doPhotons(edm::Event& iEvent) const { } } } - iEvent.put(move(product_Gammas), "Photons"); + iEvent.put(std::move(product_Gammas), "Photons"); } void HLTTauRefProducer::doMET(edm::Event& iEvent) const { @@ -349,7 +349,7 @@ void HLTTauRefProducer::doMET(edm::Event& iEvent) const { auto const& metMom = met->front().p4(); product_MET->emplace_back(metMom.Px(), metMom.Py(), 0, metMom.Pt()); } - iEvent.put(move(product_MET), "MET"); + iEvent.put(std::move(product_MET), "MET"); } #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/DQMOffline/Trigger/plugins/JetMETHLTOfflineSource.cc b/DQMOffline/Trigger/plugins/JetMETHLTOfflineSource.cc index 8f49a103a191b..88e06473e0450 100644 --- a/DQMOffline/Trigger/plugins/JetMETHLTOfflineSource.cc +++ b/DQMOffline/Trigger/plugins/JetMETHLTOfflineSource.cc @@ -817,15 +817,11 @@ void JetMETHLTOfflineSource::fillMEforEffAllTrigger(const Event& iEvent, const e if (!triggerResults_.isValid()) return; - int num = -1; - int denom = -1; bool denompassed = false; bool numpassed = false; const trigger::TriggerObjectCollection& toc(triggerObj_->getObjects()); for (auto& v : hltPathsEff_) { - num++; - denom++; denompassed = false; numpassed = false; diff --git a/DQMServices/Components/plugins/DQMGenericClient.cc b/DQMServices/Components/plugins/DQMGenericClient.cc index 82c87352b1b3f..bd4999eebcf21 100644 --- a/DQMServices/Components/plugins/DQMGenericClient.cc +++ b/DQMServices/Components/plugins/DQMGenericClient.cc @@ -1143,9 +1143,6 @@ void DQMGenericClient::makeNoFlowDist(DQMStore::IBooker& ibooker, void DQMGenericClient::limitedFit(MonitorElement* srcME, MonitorElement* meanME, MonitorElement* sigmaME) { TH2F* histo = srcME->getTH2F(); - static int i = 0; - i++; - // Fit slices projected along Y from bins in X double cont_min = 100; //Minimum number of entries Int_t binx = histo->GetXaxis()->GetNbins(); From c097a56773270e3803c37892b37588c4f52c6e89 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 4 May 2023 13:25:32 +0200 Subject: [PATCH 2/2] apply code format --- DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc | 1 - DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc | 2 -- DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc | 2 -- DQM/L1TMonitorClient/src/L1TEventInfoClient.cc | 2 -- DQM/Physics/src/SingleTopTChannelLeptonDQM.cc | 1 - DQM/TrackerRemapper/plugins/TrackerRemapper.cc | 1 - DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc | 6 ------ DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc | 1 - 8 files changed, 16 deletions(-) diff --git a/DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc b/DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc index 1acf998f76d0b..c6c828e99e5fc 100644 --- a/DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc +++ b/DQM/L1TMonitor/src/L1TStage2uGTCaloLayer2Comp.cc @@ -134,7 +134,6 @@ bool L1TStage2uGTCaloLayer2Comp::compareJets(const edm::Handleend() || col2It != col2->end()) { while (true) { - // object pt mismatch if (col1It->hwPt() != col2It->hwPt()) { comparisonNum->Fill(JETBADET); diff --git a/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc b/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc index 03b81ded3d5ce..1e460a058f02a 100644 --- a/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc +++ b/DQM/L1TMonitorClient/src/L1EmulatorErrorFlagClient.cc @@ -41,7 +41,6 @@ void L1EmulatorErrorFlagClient::initialize() { m_systemFolder.reserve(m_nrL1Systems); m_systemErrorFlag.reserve(m_nrL1Systems); - for (std::vector::const_iterator itSystem = m_l1Systems.begin(); itSystem != m_l1Systems.end(); ++itSystem) { m_systemLabel.push_back(itSystem->getParameter("SystemLabel")); @@ -51,7 +50,6 @@ void L1EmulatorErrorFlagClient::initialize() { m_systemMask.push_back(itSystem->getParameter("SystemMask")); m_systemFolder.push_back(itSystem->getParameter("SystemFolder")); - } // [SYS]ErrorFlag histogram diff --git a/DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc b/DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc index 67206e35ce8c5..6e9e55be9808b 100644 --- a/DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc +++ b/DQM/L1TMonitorClient/src/L1TEMTFEventInfoClient.cc @@ -497,7 +497,6 @@ void L1TEMTFEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& iAllQTest++; } - } for (unsigned int iMon = 0; iMon < m_nrHitObjects; ++iMon) { @@ -526,7 +525,6 @@ void L1TEMTFEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& iAllQTest++; } - } // for Noisy Strips ==================================================================== diff --git a/DQM/L1TMonitorClient/src/L1TEventInfoClient.cc b/DQM/L1TMonitorClient/src/L1TEventInfoClient.cc index 3e37f5a045858..8ac12686ec1ea 100644 --- a/DQM/L1TMonitorClient/src/L1TEventInfoClient.cc +++ b/DQM/L1TMonitorClient/src/L1TEventInfoClient.cc @@ -329,7 +329,6 @@ void L1TEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& ige iAllQTest++; } - } for (unsigned int iMon = 0; iMon < m_nrL1Objects; ++iMon) { @@ -346,7 +345,6 @@ void L1TEventInfoClient::book(DQMStore::IBooker& ibooker, DQMStore::IGetter& ige iAllQTest++; } - } ibooker.setCurrentFolder(dirEventInfo); diff --git a/DQM/Physics/src/SingleTopTChannelLeptonDQM.cc b/DQM/Physics/src/SingleTopTChannelLeptonDQM.cc index 549cac994bc62..0633d6becb838 100644 --- a/DQM/Physics/src/SingleTopTChannelLeptonDQM.cc +++ b/DQM/Physics/src/SingleTopTChannelLeptonDQM.cc @@ -801,7 +801,6 @@ void SingleTopTChannelLeptonDQM::analyze(const edm::Event& event, const edm::Eve } if (type == "elecs/pf" && PFElectronStep != nullptr) { if (PFElectronStep->select(event, "electron")) { - selection_[key].second->fill(event, setup); } else diff --git a/DQM/TrackerRemapper/plugins/TrackerRemapper.cc b/DQM/TrackerRemapper/plugins/TrackerRemapper.cc index 80fbb011a040f..51c1f816868bd 100644 --- a/DQM/TrackerRemapper/plugins/TrackerRemapper.cc +++ b/DQM/TrackerRemapper/plugins/TrackerRemapper.cc @@ -422,7 +422,6 @@ void TrackerRemapper::readVertices(double& minx, double& maxx, double& miny, dou // TPolyline vertices stored at https://github.com/cms-data/DQM-SiStripMonitorClient in.open(edm::FileInPath("DQM/SiStripMonitorClient/data/Geometry/tracker_map_bare").fullPath().c_str()); - if (!in.good()) { throw cms::Exception("TrackerRemapper") << "Error Reading File" << std::endl; } diff --git a/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc b/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc index 62164525b9f84..1a3e5986713f0 100644 --- a/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc +++ b/DQMOffline/CalibCalo/plugins/DQMSourcePi0.cc @@ -919,14 +919,12 @@ void DQMSourcePi0::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet // pt, eta, phi, Iso, m_inv, i, j : "<Fill(Iso / pt_pair); hS4S91Pi0EE_->Fill(s4s9ClusEndCap[i]); hS4S92Pi0EE_->Fill(s4s9ClusEndCap[j]); - } } } @@ -1723,7 +1718,6 @@ void DQMSourcePi0::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet hIsoEtaEE_->Fill(Iso / pt_pair); hS4S91EtaEE_->Fill(s4s9ClusEndCap[i]); hS4S92EtaEE_->Fill(s4s9ClusEndCap[j]); - } } } diff --git a/DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc b/DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc index 681877c7f21bb..7c8aa2f63866e 100644 --- a/DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc +++ b/DQMOffline/JetMET/src/JetAnalyzer_HeavyIons_matching.cc @@ -342,7 +342,6 @@ void JetAnalyzer_HeavyIons_matching::analyze(const edm::Event& mEvent, const edm Jet1_ID[Aj.id] = 1; Jet2_ID[Bj.id] = 1; - } }