use range whereever possible

Author: vlimant

PhysicsTools/PatAlgos/plugins/PATElectronCandidatesRekeyer.cc

@@ -55,21 +55,17 @@ void PATElectronCandidatesRekeyer::produce(edm::Event &iEvent, edm::EventSetup c
   auto outPtrP = std::make_unique<std::vector<pat::Electron>>();
   outPtrP->reserve(src->size());
 
-  for (size_t i = 0; i < src->size(); ++i) {
+  for (const auto &obj : *src){
     // copy original pat object and append to vector
-    outPtrP->emplace_back((*src)[i]);
+    outPtrP->emplace_back(obj);
 
     std::vector<unsigned int> keys;
     for (const edm::Ref<pat::PackedCandidateCollection> &ref : outPtrP->back().associatedPackedPFCandidates()) {
       keys.push_back(ref.key());
     };
     outPtrP->back().setAssociatedPackedPFCandidates(
         edm::RefProd<pat::PackedCandidateCollection>(pcNewHandle), keys.begin(), keys.end());
-    if (keys.size() == 1) {
-      outPtrP->back().refToOrig_ = outPtrP->back().sourceCandidatePtr(0);
-    } else {
-      outPtrP->back().refToOrig_ = reco::CandidatePtr(pcNewHandle.id());
-    }
+    outPtrP->back().refToOrig_ = (keys.size() == 1) ? outPtrP->back().sourceCandidatePtr(0) : reco::CandidatePtr(pcNewHandle.id());
   }
   iEvent.put(std::move(outPtrP));
 }

PhysicsTools/PatAlgos/plugins/PATJetCandidatesRekeyer.cc

@@ -61,14 +61,9 @@ void PATJetCandidatesRekeyer::produce(edm::Event &iEvent, edm::EventSetup const
   //
   //
   //
-  for (std::vector<pat::Jet>::const_iterator ibegin = (*src).begin(), iend = (*src).end(), ijet = ibegin; ijet != iend;
-       ++ijet) {
-    for (TagInfoFwdPtrCollection::const_iterator iinfoBegin = ijet->tagInfosFwdPtr().begin(),
-                                                 iinfoEnd = ijet->tagInfosFwdPtr().end(),
-                                                 iinfo = iinfoBegin;
-         iinfo != iinfoEnd;
-         ++iinfo) {
-      tagInfosOut->push_back(**iinfo);
+  for (const auto & jet : *src){
+    for (const auto & info : jet.tagInfosFwdPtr()){
+      tagInfosOut->push_back(*info);
     }
   }
 
@@ -79,9 +74,9 @@ void PATJetCandidatesRekeyer::produce(edm::Event &iEvent, edm::EventSetup const
   //
   unsigned int tagInfoIndex = 0;
 
-  for (size_t i = 0; i < src->size(); ++i) {
+  for (const auto & obj : *src){
     // copy original pat object and append to vector
-    outPtrP->emplace_back((*src)[i]);
+    outPtrP->emplace_back(obj);
 
     reco::CompositePtrCandidate::daughters old = outPtrP->back().daughterPtrVector();
     outPtrP->back().clearDaughters();
@@ -91,7 +86,7 @@ void PATJetCandidatesRekeyer::produce(edm::Event &iEvent, edm::EventSetup const
 
     // Copy the tag infos
     for (TagInfoFwdPtrCollection::const_iterator iinfoBegin = outPtrP->back().tagInfosFwdPtr().begin(),
-                                                 iinfoEnd = outPtrP->back().tagInfosFwdPtr().end(),
+	                                         iinfoEnd = outPtrP->back().tagInfosFwdPtr().end(),
                                                  iinfo = iinfoBegin;
          iinfo != iinfoEnd;
          ++iinfo) {

PhysicsTools/PatAlgos/plugins/PATMuonCandidatesRekeyer.cc

@@ -53,9 +53,9 @@ void PATMuonCandidatesRekeyer::produce(edm::Event &iEvent, edm::EventSetup const
   auto outPtrP = std::make_unique<std::vector<pat::Muon>>();
   outPtrP->reserve(src->size());
 
-  for (size_t i = 0; i < src->size(); ++i) {
+  for (const auto & obj : *src){
     // copy original pat object and append to vector
-    outPtrP->emplace_back((*src)[i]);
+    outPtrP->emplace_back(obj);
 
     //
     std::vector<unsigned int> keys;

PhysicsTools/PatAlgos/plugins/PATPhotonCandidatesRekeyer.cc

@@ -53,9 +53,9 @@ void PATPhotonCandidatesRekeyer::produce(edm::Event &iEvent, edm::EventSetup con
   auto outPtrP = std::make_unique<std::vector<pat::Photon>>();
   outPtrP->reserve(src->size());
 
-  for (size_t i = 0; i < src->size(); ++i) {
+  for (const auto & obj : *src){
     // copy original pat object and append to vector
-    outPtrP->emplace_back((*src)[i]);
+    outPtrP->emplace_back(obj);
 
     std::vector<unsigned int> keys;
     for (const edm::Ref<pat::PackedCandidateCollection> &ref : outPtrP->back().associatedPackedPFCandidates()) {

PhysicsTools/PatAlgos/plugins/PATTauCandidatesRekeyer.cc

@@ -53,9 +53,9 @@ void PATTauCandidatesRekeyer::produce(edm::Event &iEvent, edm::EventSetup const
   auto outPtrP = std::make_unique<std::vector<pat::Tau>>();
   outPtrP->reserve(src->size());
 
-  for (size_t i = 0; i < src->size(); ++i) {
+  for (const auto & obj : *src){
     // copy original pat object and append to vector
-    outPtrP->emplace_back((*src)[i]);
+    outPtrP->emplace_back(obj);
 
     reco::CandidatePtrVector signalChHPtrs;
     for (const reco::CandidatePtr &p : outPtrP->back().signalChargedHadrCands()) {

PhysicsTools/PatAlgos/plugins/VertexCompositeCandidateDaughtersRekeyer.cc

@@ -56,9 +56,9 @@ void VertexCompositeCandidateDaughtersRekeyer::produce(edm::Event &iEvent, edm::
   auto outPtrP = std::make_unique<reco::VertexCompositePtrCandidateCollection>();
   outPtrP->reserve(src->size());
 
-  for (size_t i = 0; i < src->size(); ++i) {
+  for (const auto & obj : *src){
     // copy original object and append to vector
-    outPtrP->emplace_back((*src)[i]);
+    outPtrP->emplace_back(obj);
 
     std::vector<reco::CandidatePtr> daughters = outPtrP->back().daughterPtrVector();
     outPtrP->back().clearDaughters();
@@ -68,15 +68,11 @@ void VertexCompositeCandidateDaughtersRekeyer::produce(edm::Event &iEvent, edm::
       // We check if this CandidatePtr points to a candidate in the original packedPFCandidates collection
       // This is needed because the CandidatePtr can point to a candidate in lostTracks collection
       //
-      if (dau.id() == pcOriHandle.id()) {
-        outPtrP->back().addDaughter(edm::Ptr<reco::Candidate>(pcNewHandle, dau.key()));
-      } else {
-        outPtrP->back().addDaughter(dau);
-      }
+      outPtrP->back().addDaughter( (dau.id() == pcOriHandle.id()) ? edm::Ptr<reco::Candidate>(pcNewHandle, dau.key()) : dau);
     }
   }
   iEvent.put(std::move(outPtrP));
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE(VertexCompositeCandidateDaughtersRekeyer);
+DEFINE_FWK_MODULE(VertexCompositeCandidateDaughtersRekeyer);