diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc index 8356e04218af0..37db65b670727 100644 --- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc +++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/EcalTestPulseAnalyzer.cc @@ -288,7 +288,6 @@ void EcalTestPulseAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& double chi2pn = 0; double ypnrange[50]; double dsum = 0.; - double dsum1 = 0.; double bl = 0.; double val_max = 0.; int samplemax = 0; @@ -435,10 +434,8 @@ void EcalTestPulseAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& } // Remove pedestal //==================== - for (dsum = 0., dsum1 = 0., k = 0; k < _presample; k++) { + for (dsum = 0., k = 0; k < _presample; k++) { dsum += adc[k]; - if (k < _presample - 1) - dsum1 += adc[k]; } bl = dsum / ((double)_presample); @@ -561,10 +558,8 @@ void EcalTestPulseAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& // Remove pedestal //==================== - for (dsum = 0., dsum1 = 0., k = 0; k < _presample; k++) { + for (dsum = 0., k = 0; k < _presample; k++) { dsum += adc[k]; - if (k < _presample - 1) - dsum1 += adc[k]; } bl = dsum / ((double)_presample); diff --git a/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc b/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc index 36889272ba16f..ba9a44f8024e3 100644 --- a/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc +++ b/CalibTracker/SiStripChannelGain/plugins/DeDxDiscriminatorLearner.cc @@ -124,10 +124,9 @@ void DeDxDiscriminatorLearner::algoAnalyze(const edm::Event& iEvent, const edm:: edm::Handle trackCollectionHandle; iEvent.getByToken(m_tracksTag, trackCollectionHandle); - unsigned track_index = 0; for (TrajTrackAssociationCollection::const_iterator it = trajTrackAssociationHandle->begin(); it != trajTrackAssociationHandle->end(); - ++it, track_index++) { + ++it) { const Track& track = *it->val; const Trajectory& traj = *it->key; diff --git a/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc b/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc index f5782968c9f24..4ff813fa56eb8 100644 --- a/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc +++ b/Calibration/HcalCalibAlgos/plugins/AnalyzerMinbias.cc @@ -306,10 +306,16 @@ void AnalyzerMinbias::analyze(const edm::Event& iEvent, const edm::EventSetup& i const edm::Handle gtObjectMapRecord = iEvent.getHandle(tok_hltL1GtMap_); if (gtObjectMapRecord.isValid()) { const std::vector& objMapVec = gtObjectMapRecord->gtObjectMap(); +#ifdef EDM_ML_DEBUG int ii(0); +#endif bool ok(false), fill(true); for (std::vector::const_iterator itMap = objMapVec.begin(); itMap != objMapVec.end(); +#ifdef EDM_ML_DEBUG ++itMap, ++ii) { +#else + ++itMap) { +#endif bool resultGt = (*itMap).algoGtlResult(); if (resultGt == 1) { ok = true; diff --git a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc index 742a9cec9ae52..6ffd1aac1ddbf 100644 --- a/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc +++ b/Calibration/IsolatedParticles/plugins/IsolatedGenParticles.cc @@ -653,9 +653,8 @@ void IsolatedGenParticles::analyze(const edm::Event &iEvent, const edm::EventSet } } - unsigned int indx; HepMC::GenEvent::particle_const_iterator p; - for (p = myGenEvent->particles_begin(), indx = 0; p != myGenEvent->particles_end(); ++p, ++indx) { + for (p = myGenEvent->particles_begin(); p != myGenEvent->particles_end(); ++p) { int pdgId = ((*p)->pdg_id()); int ix = particleCode(pdgId); if (ix >= 0) { @@ -770,9 +769,8 @@ void IsolatedGenParticles::analyze(const edm::Event &iEvent, const edm::EventSet } } // loop over gen particles - unsigned int indx; reco::GenParticleCollection::const_iterator p; - for (p = genParticles->begin(), indx = 0; p != genParticles->end(); ++p, ++indx) { + for (p = genParticles->begin(); p != genParticles->end(); ++p) { int pdgId = (p->pdgId()); int ix = particleCode(pdgId); if (ix >= 0) { diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc index 5ae0ae1fb3e00..25bbf0bbb6dab 100644 --- a/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc +++ b/Calibration/IsolatedParticles/plugins/StudyCaloGen.cc @@ -407,9 +407,8 @@ void StudyCaloGen::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } - unsigned int indx; HepMC::GenEvent::particle_const_iterator p; - for (p = myGenEvent->particles_begin(), indx = 0; p != myGenEvent->particles_end(); ++p, ++indx) { + for (p = myGenEvent->particles_begin(); p != myGenEvent->particles_end(); ++p) { int pdgId = ((*p)->pdg_id()); int ix = particleCode(pdgId); if (ix >= 0) { @@ -524,9 +523,8 @@ void StudyCaloGen::analyze(const edm::Event &iEvent, const edm::EventSetup &iSet } } // loop over gen particles - unsigned int indx; reco::GenParticleCollection::const_iterator p; - for (p = genParticles->begin(), indx = 0; p != genParticles->end(); ++p, ++indx) { + for (p = genParticles->begin(); p != genParticles->end(); ++p) { int pdgId = (p->pdgId()); int ix = particleCode(pdgId); if (ix >= 0) { diff --git a/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc b/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc index cd6d6eadbe412..51eff046fcfd7 100644 --- a/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc +++ b/Calibration/IsolatedParticles/plugins/StudyCaloResponse.cc @@ -1083,10 +1083,9 @@ int StudyCaloResponse::trackPID(const reco::Track* pTrack, const edm::Handle& genParticles) { int id(0); if (genParticles.isValid()) { - unsigned int indx; reco::GenParticleCollection::const_iterator p; double mindR(999.9); - for (p = genParticles->begin(), indx = 0; p != genParticles->end(); ++p, ++indx) { + for (p = genParticles->begin(); p != genParticles->end(); ++p) { int pdgId = std::abs(p->pdgId()); int idx = (pdgId == 11) ? 1 : ((pdgId == 211) ? 2 : ((pdgId == 321) ? 3 : ((pdgId == 2212) ? 4 : 0))); if (idx > 0) { diff --git a/DPGAnalysis/Skims/src/TagProbeMassProducer.cc b/DPGAnalysis/Skims/src/TagProbeMassProducer.cc index 69f86ea8a2387..bc0edf4f629ea 100644 --- a/DPGAnalysis/Skims/src/TagProbeMassProducer.cc +++ b/DPGAnalysis/Skims/src/TagProbeMassProducer.cc @@ -82,9 +82,8 @@ void TagProbeMassProducer::produce(edm::Event& iEvent, const edm::EventSetup& iS vprobes.push_back(probes->refAt(i)); } - int itag = 0; edm::RefToBaseVector::const_iterator tag = vtags.begin(); - for (; tag != vtags.end(); ++tag, ++itag) { + for (; tag != vtags.end(); ++tag) { int iprobe = 0; edm::RefToBaseVector::const_iterator probe = vprobes.begin(); for (; probe != vprobes.end(); ++probe, ++iprobe) { diff --git a/DQM/SiStripCommissioningAnalysis/src/CalibrationAlgorithm.cc b/DQM/SiStripCommissioningAnalysis/src/CalibrationAlgorithm.cc index 92ca88a113066..80cceba8c9424 100644 --- a/DQM/SiStripCommissioningAnalysis/src/CalibrationAlgorithm.cc +++ b/DQM/SiStripCommissioningAnalysis/src/CalibrationAlgorithm.cc @@ -49,8 +49,7 @@ void CalibrationAlgorithm::extract(const std::vector& histos) { // Extract histograms std::vector::const_iterator ihis = histos.begin(); - unsigned int cnt = 0; - for (; ihis != histos.end(); ihis++, cnt++) { + for (; ihis != histos.end(); ihis++) { // Check for NULL pointer if (!(*ihis)) { continue; diff --git a/DQM/SiStripCommissioningAnalysis/src/CalibrationScanAlgorithm.cc b/DQM/SiStripCommissioningAnalysis/src/CalibrationScanAlgorithm.cc index ea4d4939cb510..180c42fbe428f 100644 --- a/DQM/SiStripCommissioningAnalysis/src/CalibrationScanAlgorithm.cc +++ b/DQM/SiStripCommissioningAnalysis/src/CalibrationScanAlgorithm.cc @@ -51,8 +51,7 @@ void CalibrationScanAlgorithm::extract(const std::vector& histos) { // Extract histograms std::vector::const_iterator ihis = histos.begin(); - unsigned int cnt = 0; - for (; ihis != histos.end(); ihis++, cnt++) { + for (; ihis != histos.end(); ihis++) { // Check for NULL pointer if (!(*ihis)) { continue; diff --git a/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc b/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc index 7f417c3c0c3a7..8ab0b68fb1f63 100644 --- a/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc +++ b/DQM/SiStripMonitorHardware/src/SiStripFEDMonitor.cc @@ -424,10 +424,8 @@ void SiStripFEDMonitorPlugin::getMajority(const std::vectorbegin(); L1GctInternJetDataCollection::const_iterator jetEnd = hwIntJetCands->end(); - int i; - for (i = 0; jetItr != jetEnd; ++jetItr, ++i) { + for (; jetItr != jetEnd; ++jetItr) { //std::cout << " JetS a plenty" <empty() && (!centralBxOnly_ || jetItr->bx() == 0)) { double et = (jetItr->oflow() ? (double)0xfff : (double)jetItr->et()) * etSumLSB + 1.e-6; diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/RCTEmRegionPacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/RCTEmRegionPacker.cc index cd7563334b0ac..409fab5366169 100644 --- a/EventFilter/L1TRawToDigi/plugins/implementations_stage1/RCTEmRegionPacker.cc +++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage1/RCTEmRegionPacker.cc @@ -28,9 +28,8 @@ namespace l1t { std::vector load[36]; for (int i = 0; i <= 0; ++i) { - int n = 0; PhysicsToBitConverter converter[18]; - for (auto j = caloregion->begin(); j != caloregion->end(); ++j, ++n) { + for (auto j = caloregion->begin(); j != caloregion->end(); ++j) { int et = (int)j->et(); int overFlow = (int)j->overFlow(); int fineGrain = (int)j->fineGrain(); @@ -58,8 +57,7 @@ namespace l1t { } } //end calo region - int m = 0; - for (auto j = caloemcand->begin(); j != caloemcand->end(); ++j, ++m) { + for (auto j = caloemcand->begin(); j != caloemcand->end(); ++j) { int rank = (int)j->rank(); int index = (int)j->index(); int rctCrate = (int)j->rctCrate(); diff --git a/Fireworks/Core/src/CmsShowCommon.cc b/Fireworks/Core/src/CmsShowCommon.cc index 2f7e079bc40d8..c2bf2e7a09b76 100644 --- a/Fireworks/Core/src/CmsShowCommon.cc +++ b/Fireworks/Core/src/CmsShowCommon.cc @@ -137,10 +137,9 @@ void CmsShowCommon::permuteColors() { void CmsShowCommon::randomizeColors() { // printf("Doing random_shuffle on existing colors ...\n"); - int vi = 0; for (FWEventItemsManager::const_iterator i = m_context->eventItemsManager()->begin(); i != m_context->eventItemsManager()->end(); - ++i, ++vi) { + ++i) { FWDisplayProperties prop = (*i)->defaultDisplayProperties(); int col = rand() % 17; // randomize in first row of palette diff --git a/Fireworks/Core/src/FWModelChangeManager.cc b/Fireworks/Core/src/FWModelChangeManager.cc index 0b19a447468d8..e9d2928cb202b 100644 --- a/Fireworks/Core/src/FWModelChangeManager.cc +++ b/Fireworks/Core/src/FWModelChangeManager.cc @@ -85,9 +85,8 @@ void FWModelChangeManager::endChanges() { //makes sure that 'changeSignalsAreDone is called if changeSignalsAreComing_ is sent bool guard(false); if (0 == --m_depth) { - unsigned int index = 0; for (std::set::iterator itChanges = m_itemChanges.begin(); itChanges != m_itemChanges.end(); - ++itChanges, ++index) { + ++itChanges) { if (!guard) { // std::shared_ptr done(this, &sendChangeSignalsAreDone); guard = true; @@ -109,7 +108,7 @@ void FWModelChangeManager::endChanges() { } m_itemChanges.clear(); - for (size_t ci = 0, ce = m_changes.size(), si = 0; ci != ce; ++ci, ++si) { + for (size_t ci = 0, ce = m_changes.size(); ci != ce; ++ci) { FWModelIds& changes = m_changes[ci]; if (not changes.empty()) { if (!guard) { diff --git a/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc b/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc index 6f85bf1b82c77..da8dcc2e1cfce 100644 --- a/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc +++ b/Fireworks/ParticleFlow/plugins/FWPFCandidateWithHitsProxyBuilder.cc @@ -75,10 +75,9 @@ void FWPFCandidateWithHitsProxyBuilder::build(const FWEventItem* iItem, if (candidates == nullptr) return; - Int_t idx = 0; initPFRecHitsCollections(); for (reco::PFCandidateCollection::const_iterator it = candidates->begin(), itEnd = candidates->end(); it != itEnd; - ++it, ++idx) { + ++it) { TEveCompound* comp = createCompound(); setupAddElement(comp, product); // printf("products size %d/%d \n", (int)iItem->size(), product->NumChildren()); diff --git a/Geometry/HGCalCommonData/test/HGCalCellUVTester.cc b/Geometry/HGCalCommonData/test/HGCalCellUVTester.cc index 86b24497d87d8..95ff1de4309ca 100644 --- a/Geometry/HGCalCommonData/test/HGCalCellUVTester.cc +++ b/Geometry/HGCalCommonData/test/HGCalCellUVTester.cc @@ -126,9 +126,8 @@ void HGCalCellUVTester::beginRun(edm::Run const &iRun, edm::EventSetup const &iS edm::LogVerbatim("HGCalGeom") << "\nHGCalCellUVTester:: nCells " << nCells << " and placement index between " << indexMin << " and " << indexMax << "\n\n"; auto start_t = std::chrono::high_resolution_clock::now(); - unsigned int kk(0); std::unordered_map::const_iterator itr = hgpar_->waferInfoMap_.begin(); - for (; itr != hgpar_->waferInfoMap_.end(); ++itr, ++kk) { + for (; itr != hgpar_->waferInfoMap_.end(); ++itr) { //for (auto itr = hgpar_->waferInfoMap_.begin(); itr != hgpar_->waferInfoMap_.end(); ++itr){ if ((itr->second).part != HGCalTypes::WaferFull) { int indx = itr->first; diff --git a/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc b/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc index 46fb49aca828b..45c50c25b6655 100644 --- a/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc +++ b/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc @@ -103,8 +103,7 @@ void HGCalGeometryCheck::beginRun(const edm::Run&, const edm::EventSetup& iSetup sprintf(name, "RZ_%s", nameDetectors_[ih].c_str()); sprintf(title, "R vs Z for %s", nameDetectors_[ih].c_str()); h_RZ_.emplace_back(fs->make(name, title, nbinZ_, zmin_, zmax_, nbinR_, rmin_, rmax_)); - unsigned int k(0); - for (int lay = layerF; lay <= layerL; ++lay, ++k) { + for (int lay = layerF; lay <= layerL; ++lay) { sprintf(name, "Mod_%s_L%d", nameDetectors_[ih].c_str(), lay); sprintf(title, "Modules in layer %d in %s", lay, nameDetectors_[ih].c_str()); h_Mod_.emplace_back(fs->make(name, title, 200, -50, 50)); diff --git a/Geometry/HcalTowerAlgo/test/HcalGeometryDump.cc b/Geometry/HcalTowerAlgo/test/HcalGeometryDump.cc index f08db74cd18f8..6e062c934a1bf 100644 --- a/Geometry/HcalTowerAlgo/test/HcalGeometryDump.cc +++ b/Geometry/HcalTowerAlgo/test/HcalGeometryDump.cc @@ -60,8 +60,7 @@ void HcalGeometryDump::analyze(const edm::Event& /*iEvent*/, const edm::EventSet } edm::LogVerbatim("HCalGeom") << detIds.size() << " valid Ids for subdetector " << subdet; std::sort(detIds.begin(), detIds.end()); - int counter = 0; - for (std::vector::const_iterator i = detIds.begin(); i != detIds.end(); ++i, ++counter) { + for (std::vector::const_iterator i = detIds.begin(); i != detIds.end(); ++i) { HcalDetId hid = HcalDetId(*i); auto cell = caloGeom->getGeometry(*i); edm::LogVerbatim("HCalGeom") << hid << "\tCaloCellGeometry " << cell->getPosition() << "\tHcalGeometry " diff --git a/HLTrigger/Muon/plugins/HLTL1MuonSelector.cc b/HLTrigger/Muon/plugins/HLTL1MuonSelector.cc index 6fb14c10ec386..47ebdc44b49db 100644 --- a/HLTrigger/Muon/plugins/HLTL1MuonSelector.cc +++ b/HLTrigger/Muon/plugins/HLTL1MuonSelector.cc @@ -61,9 +61,8 @@ void HLTL1MuonSelector::produce(edm::StreamID, edm::Event& iEvent, const edm::Ev LogTrace(metname) << "Number of muons " << muColl->size() << endl; L1MuonParticleCollection::const_iterator it; - L1MuonParticleRef::key_type l1ParticleIndex = 0; - for (it = muColl->begin(); it != muColl->end(); ++it, ++l1ParticleIndex) { + for (it = muColl->begin(); it != muColl->end(); ++it) { const L1MuGMTExtendedCand muonCand = (*it).gmtMuonCand(); unsigned int quality = 0; bool valid_charge = false; diff --git a/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.cc b/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.cc index ee4021ea8361b..18a65b17991da 100644 --- a/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.cc +++ b/L1Trigger/CSCTrackFinder/plugins/CSCTFanalyzer.cc @@ -84,10 +84,8 @@ void CSCTFanalyzer::analyze(edm::Event const& e, edm::EventSetup const& es) { for (CSCCorrelatedLCTDigiCollection::DigiRangeIterator csc = LCTs.product()->begin(); csc != LCTs.product()->end(); csc++) { - int lctId = 0; - CSCCorrelatedLCTDigiCollection::Range range1 = LCTs.product()->get((*csc).first); - for (CSCCorrelatedLCTDigiCollection::const_iterator lct = range1.first; lct != range1.second; lct++, lctId++) { + for (CSCCorrelatedLCTDigiCollection::const_iterator lct = range1.first; lct != range1.second; lct++) { int station = (*csc).first.station() - 1; int cscId = (*csc).first.triggerCscId() - 1; int sector = (*csc).first.triggerSector() - 1 + ((*csc).first.endcap() == 1 ? 0 : 6); diff --git a/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc b/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc index 215bc366fade3..42b80d8c9dfaf 100644 --- a/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc +++ b/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc @@ -165,8 +165,8 @@ void L1ExtraParticlesProd::produce(edm::Event &iEvent, const edm::EventSetup &iS // cout << "HW muons" << endl ; vector::const_iterator muItr = hwMuCands.begin(); vector::const_iterator muEnd = hwMuCands.end(); - for (int i = 0; muItr != muEnd; ++muItr, ++i) { - // cout << "#" << i + for (; muItr != muEnd; ++muItr) { + // cout << "#" // << " name " << muItr->name() // << " empty " << muItr->empty() // << " pt " << muItr->ptIndex() diff --git a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc index ed1b636fe3cfc..e07feb09865a7 100644 --- a/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc +++ b/L1Trigger/L1TCalorimeter/plugins/L1TStage2Layer1Producer.cc @@ -171,8 +171,7 @@ void L1TStage2Layer1Producer::produce(edm::Event& iEvent, const edm::EventSetup& // loop over ECAL TPs EcalTrigPrimDigiCollection::const_iterator ecalItr; - int nEcal = 0; - for (ecalItr = ecalTPs->begin(); ecalItr != ecalTPs->end(); ++ecalItr, ++nEcal) { + for (ecalItr = ecalTPs->begin(); ecalItr != ecalTPs->end(); ++ecalItr) { int ieta = ecalItr->id().ieta(); int iphi = ecalItr->id().iphi(); @@ -197,8 +196,7 @@ void L1TStage2Layer1Producer::produce(edm::Event& iEvent, const edm::EventSetup& // loop over HCAL TPs HcalTrigPrimDigiCollection::const_iterator hcalItr; - int nHcal = 0; - for (hcalItr = hcalTPs->begin(); hcalItr != hcalTPs->end(); ++hcalItr, ++nHcal) { + for (hcalItr = hcalTPs->begin(); hcalItr != hcalTPs->end(); ++hcalItr) { int ieta = hcalItr->id().ieta(); int iphi = hcalItr->id().iphi(); int ver = hcalItr->id().version(); diff --git a/L1Trigger/L1TCommon/plugins/L1TMuonLegacyConverter.cc b/L1Trigger/L1TCommon/plugins/L1TMuonLegacyConverter.cc index 325ae1be3f9d9..4370883f51139 100644 --- a/L1Trigger/L1TCommon/plugins/L1TMuonLegacyConverter.cc +++ b/L1Trigger/L1TCommon/plugins/L1TMuonLegacyConverter.cc @@ -135,7 +135,7 @@ void L1TMuonLegacyConverter::produce(edm::Event& iEvent, const edm::EventSetup& vector::const_iterator muItr = simMuCands.begin(); vector::const_iterator muEnd = simMuCands.end(); - for (int i = 0; muItr != muEnd; ++muItr, ++i) { + for (; muItr != muEnd; ++muItr) { if (!muItr->empty()) { // keep x and y components non-zero and protect against roundoff. double pt = muPtScale->getPtScale()->getLowEdge(muItr->ptIndex()) + 1.e-6; diff --git a/L1Trigger/L1THGCal/src/backend/HGCalMulticlusteringImpl.cc b/L1Trigger/L1THGCal/src/backend/HGCalMulticlusteringImpl.cc index f5649fb810038..983539079ff2c 100644 --- a/L1Trigger/L1THGCal/src/backend/HGCalMulticlusteringImpl.cc +++ b/L1Trigger/L1THGCal/src/backend/HGCalMulticlusteringImpl.cc @@ -74,9 +74,8 @@ void HGCalMulticlusteringImpl::clusterizeDR(const std::vector multiclustersTmp; - int iclu = 0; for (std::vector>::const_iterator clu = clustersPtrs.begin(); clu != clustersPtrs.end(); - ++clu, ++iclu) { + ++clu) { double minDist = dr_; int targetMulticlu = -1; diff --git a/PhysicsTools/PatExamples/bin/PatBasicFWLiteJetUnitTest.cc b/PhysicsTools/PatExamples/bin/PatBasicFWLiteJetUnitTest.cc index 14cf3d5dcef97..84282bc194247 100644 --- a/PhysicsTools/PatExamples/bin/PatBasicFWLiteJetUnitTest.cc +++ b/PhysicsTools/PatExamples/bin/PatBasicFWLiteJetUnitTest.cc @@ -55,13 +55,12 @@ int main(int argc, char* argv[]) { // ---------------------------------------------------------------------- // loop the events - unsigned int iEvent = 0; fwlite::Event ev(inFile); TStopwatch timer; timer.Start(); unsigned int nEventsAnalyzed = 0; - for (ev.toBegin(); !ev.atEnd(); ++ev, ++iEvent) { + for (ev.toBegin(); !ev.atEnd(); ++ev) { edm::EventBase const& event = ev; // Handle to the jet collection diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc index d80c44a7889a8..41fa6304ffd72 100644 --- a/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc +++ b/RecoMuon/TrackerSeedGenerator/plugins/TSGFromPropagation.cc @@ -118,8 +118,7 @@ void TSGFromPropagation::trackerSeeds(const TrackCand& staMuon, if (alltm.size() > 5) alltm.erase(alltm.begin() + 5, alltm.end()); - int i = 0; - for (std::vector::const_iterator itm = alltm.begin(); itm != alltm.end(); itm++, i++) { + for (std::vector::const_iterator itm = alltm.begin(); itm != alltm.end(); itm++) { TrajectoryStateOnSurface updatedTSOS = updator()->update(itm->predictedState(), *(itm->recHit())); if (updatedTSOS.isValid() && passSelection(updatedTSOS)) { edm::OwnVector container; diff --git a/RecoMuon/TrackingTools/src/MuonTrajectoryCleaner.cc b/RecoMuon/TrackingTools/src/MuonTrajectoryCleaner.cc index 84081c33e0d38..23afc70d87157 100644 --- a/RecoMuon/TrackingTools/src/MuonTrajectoryCleaner.cc +++ b/RecoMuon/TrackingTools/src/MuonTrajectoryCleaner.cc @@ -195,9 +195,7 @@ void MuonTrajectoryCleaner::clean(TrajectoryContainer& trajC, seedToSeedsMap = std::make_unique(seedsHandle, seedsHandle); } - int seedcnt(0); - - for (map >::iterator itmap = seedmap.begin(); itmap != seedmap.end(); ++itmap, ++seedcnt) { + for (map >::iterator itmap = seedmap.begin(); itmap != seedmap.end(); ++itmap) { edm::RefToBase tmpSeedRef1 = trajC[(*itmap).first]->seedRef(); edm::Ref tmpL2SeedRef1 = tmpSeedRef1.castTo >(); diff --git a/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc b/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc index 7ca1c90ddd13f..8b9d92c5deebf 100644 --- a/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc +++ b/RecoTracker/ConversionSeedGenerators/plugins/PhotonConversionTrajectorySeedProducerFromSingleLegAlgo.cc @@ -106,16 +106,20 @@ void PhotonConversionTrajectorySeedProducerFromSingleLegAlgo::loopOnTracks() { return; } - size_t idx = 0; _countSeedTracks = 0; #ifdef debugTSPFSLA + size_t idx = 0; size_t sel = 0; ss.str(""); #endif for (reco::TrackCollection::const_iterator tr = trackCollectionH->begin(); tr != trackCollectionH->end(); +#ifdef debugTSPFSLA tr++, idx++) { +#else + tr++) { +#endif if (rejectTrack(*tr)) continue; std::vector selectedPriVtxCompatibleWithTrack; diff --git a/RecoVertex/AdaptiveVertexFinder/plugins/InclusiveVertexFinder.h b/RecoVertex/AdaptiveVertexFinder/plugins/InclusiveVertexFinder.h index 0914757823fde..9f2329380f806 100644 --- a/RecoVertex/AdaptiveVertexFinder/plugins/InclusiveVertexFinder.h +++ b/RecoVertex/AdaptiveVertexFinder/plugins/InclusiveVertexFinder.h @@ -229,15 +229,13 @@ void TemplatedInclusiveVertexFinder::produce(edm::Event &ev } BeamSpot bs(pv.position(), 0.0, 0.0, 0.0, 0.0, cov, BeamSpot::Unknown); - int i = 0; #ifdef VTXDEBUG - std::cout << "CLUSTERS " << clusters.size() << std::endl; #endif for (std::vector::iterator cluster = clusters.begin(); cluster != clusters.end(); - ++cluster, ++i) { + ++cluster) { if (cluster->tracks.size() < 2 || cluster->tracks.size() > maxNTracks) continue; std::vector vertices; diff --git a/RecoVertex/AdaptiveVertexFinder/src/TracksClusteringFromDisplacedSeed.cc b/RecoVertex/AdaptiveVertexFinder/src/TracksClusteringFromDisplacedSeed.cc index 9f22c3605ef37..1845c5bb4239b 100644 --- a/RecoVertex/AdaptiveVertexFinder/src/TracksClusteringFromDisplacedSeed.cc +++ b/RecoVertex/AdaptiveVertexFinder/src/TracksClusteringFromDisplacedSeed.cc @@ -116,9 +116,12 @@ std::vector TracksClusteringFromDisp } std::vector clusters; +#ifdef VTXDEBUG int i = 0; - for (std::vector::const_iterator s = seeds.begin(); s != seeds.end(); ++s, ++i) { +#endif + for (std::vector::const_iterator s = seeds.begin(); s != seeds.end(); ++s) { #ifdef VTXDEBUG + i++; std::cout << "Seed N. " << i << std::endl; #endif // VTXDEBUG std::pair, GlobalPoint> ntracks = nearTracks(*s, selectedTracks, pv); diff --git a/SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc b/SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc index 7aac9811b0db2..9b6020d167244 100644 --- a/SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc +++ b/SimG4CMS/CherenkovAnalysis/plugins/XtalDedxAnalysis.cc @@ -200,7 +200,10 @@ void XtalDedxAnalysis::analyzeHits(std::vector &hits, } // Type of the secondary (coming directly from a generator level track) - int nvtx = 0, k1 = 0; + int nvtx = 0; +#ifdef EDM_ML_DEBUG + int k1 = 0; +#endif edm::SimVertexContainer::const_iterator simVtxItr; for (simVtxItr = SimVtx->begin(); simVtxItr != SimVtx->end(); simVtxItr++) nvtx++; @@ -210,8 +213,9 @@ void XtalDedxAnalysis::analyzeHits(std::vector &hits, ntrk++; edm::LogVerbatim("CherenkovAnalysis") << "XtalDedxAnalysis: " << ntrk << " tracks and " << nvtx << " vertices"; #endif - for (simTrkItr = SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++, ++k1) { + for (simTrkItr = SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++) { #ifdef EDM_ML_DEBUG + k1++; edm::LogVerbatim("CherenkovAnalysis") << "Track " << k1 << " PDGId " << simTrkItr->type() << " Vertex ID " << simTrkItr->vertIndex() << " Generator " << simTrkItr->noGenpart(); #endif @@ -221,9 +225,13 @@ void XtalDedxAnalysis::analyzeHits(std::vector &hits, simVtxItr = SimVtx->begin(); for (int iv = 0; iv < vertIndex; iv++) simVtxItr++; - int parent = simVtxItr->parentIndex(), k2 = 0; - for (edm::SimTrackContainer::const_iterator trkItr = SimTk->begin(); trkItr != SimTk->end(); trkItr++, ++k2) { + int parent = simVtxItr->parentIndex(); +#ifdef EDM_ML_DEBUG + int k2 = 0; +#endif + for (edm::SimTrackContainer::const_iterator trkItr = SimTk->begin(); trkItr != SimTk->end(); trkItr++) { #ifdef EDM_ML_DEBUG + k2++; edm::LogVerbatim("CherenkovAnalysis") << "XtalDedxAnalysis::Track " << k2 << " ID " << trkItr->trackId() << " (" << parent << ") Generator " << trkItr->noGenpart(); #endif diff --git a/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc b/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc index 965e52568443b..ead099f998571 100644 --- a/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc +++ b/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc @@ -159,12 +159,15 @@ void DreamSD::initMap(const std::string &sd) { edm::LogVerbatim("EcalSim") << "DreamSD: Length Table for ReadOutName = " << sd << ":"; #endif DimensionMap::const_iterator ite = xtalLMap_.begin(); +#ifdef EDM_ML_DEBUG int i = 0; - for (; ite != xtalLMap_.end(); ite++, i++) { +#endif + for (; ite != xtalLMap_.end(); ite++) { G4String name = "Unknown"; if (ite->first != nullptr) name = (ite->first)->GetName(); #ifdef EDM_ML_DEBUG + i++; edm::LogVerbatim("EcalSim") << " " << i << " " << ite->first << " " << name << " L = " << ite->second.first << " W = " << ite->second.second; #endif diff --git a/SimMuon/MCTruth/src/DTHitAssociator.cc b/SimMuon/MCTruth/src/DTHitAssociator.cc index f58062c08f70a..5de2848b891c6 100644 --- a/SimMuon/MCTruth/src/DTHitAssociator.cc +++ b/SimMuon/MCTruth/src/DTHitAssociator.cc @@ -157,10 +157,9 @@ void DTHitAssociator::initEvent(const edm::Event &iEvent, const edm::EventSetup if (mapOfSimHit.end() != mapOfSimHit.begin()) { LogTrace("DTHitAssociator") << "\n *** Dump DT PSimHit's ***"; - int jwire = 0; int ihit = 0; - for (SimHitMap::const_iterator mapIT = mapOfSimHit.begin(); mapIT != mapOfSimHit.end(); ++mapIT, jwire++) { + for (SimHitMap::const_iterator mapIT = mapOfSimHit.begin(); mapIT != mapOfSimHit.end(); ++mapIT) { DTWireId wireid = (*mapIT).first; for (vector::const_iterator hitIT = mapOfSimHit[wireid].begin(); hitIT != mapOfSimHit[wireid].end(); @@ -177,10 +176,9 @@ void DTHitAssociator::initEvent(const edm::Event &iEvent, const edm::EventSetup } if (mapOfDigi.end() != mapOfDigi.begin()) { - int jwire = 0; int ihit = 0; - for (DigiMap::const_iterator mapIT = mapOfDigi.begin(); mapIT != mapOfDigi.end(); ++mapIT, jwire++) { + for (DigiMap::const_iterator mapIT = mapOfDigi.begin(); mapIT != mapOfDigi.end(); ++mapIT) { LogTrace("DTHitAssociator") << "\n *** Dump DT digis ***"; DTWireId wireid = (*mapIT).first; diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc index 62aec7038909f..810c2613ceb08 100644 --- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc +++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc @@ -1630,9 +1630,7 @@ void SiPixelDigitizerAlgorithm::induce_signal(std::vector::const_iterat void SiPixelDigitizerAlgorithm::fillSimHitMaps(std::vector simHits, const unsigned int tofBin) { // store here the SimHit map for later - int printnum = 0; - for (std::vector::const_iterator it = simHits.begin(), itEnd = simHits.end(); it != itEnd; - ++it, ++printnum) { + for (std::vector::const_iterator it = simHits.begin(), itEnd = simHits.end(); it != itEnd; ++it) { unsigned int detID = (*it).detUnitId(); unsigned int subdetID = DetId(detID).subdetId(); subDetTofBin theSubDetTofBin = std::make_pair(subdetID, tofBin); diff --git a/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc b/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc index c1169c2455018..187906ceabde2 100644 --- a/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc +++ b/TauAnalysis/MCEmbeddingTools/plugins/TrackMergeremb.cc @@ -96,9 +96,7 @@ void TrackMergeremb::merg_and_put(edm::Event &iEvent, edm::Handle track_col_in; iEvent.getByToken(akt_collection, track_col_in); - size_t sedref_it = 0; - for (typename TrackCollectionemb::const_iterator it = track_col_in->begin(); it != track_col_in->end(); - ++it, ++sedref_it) { + for (typename TrackCollectionemb::const_iterator it = track_col_in->begin(); it != track_col_in->end(); ++it) { outTracks->push_back(typename T1::value_type(*it)); } diff --git a/Validation/MuonIsolation/src/MuIsoValidation.cc b/Validation/MuonIsolation/src/MuIsoValidation.cc index 3efa8454e23fd..67f10ee1cbcae 100644 --- a/Validation/MuonIsolation/src/MuIsoValidation.cc +++ b/Validation/MuonIsolation/src/MuIsoValidation.cc @@ -326,8 +326,7 @@ void MuIsoValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& i h_nMuons->Fill(theMuonData); //Fill historgams concerning muon isolation - uint iMuon = 0; - for (MuonIterator muon = muonsHandle->begin(); muon != muonsHandle->end(); ++muon, ++iMuon) { + for (MuonIterator muon = muonsHandle->begin(); muon != muonsHandle->end(); ++muon) { ++nIncMuons; if (requireCombinedMuon) { if (muon->combinedMuon().isNull()) diff --git a/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc b/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc index b865c5c444f5d..fbb37ff11546a 100644 --- a/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc +++ b/Validation/SiTrackerPhase2V/plugins/Phase2TrackerValidateDigi.cc @@ -907,9 +907,8 @@ unsigned int Phase2TrackerValidateDigi::getSimTrackId(const edm::DetSetVector link_detset = (*simLinks)[detId]; // Loop over DigiSimLink in this det unit - int iSimLink = 0; for (edm::DetSet::const_iterator it = link_detset.data.begin(); it != link_detset.data.end(); - it++, iSimLink++) { + it++) { if (channel == it->channel()) { simTrkId = it->SimTrackId(); break;