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);