direct const access to ambiguousGsfTracks in GsfElectron

Author: guitargeek

CommonTools/Egamma/src/ConversionTools.cc

@@ -69,10 +69,8 @@ bool ConversionTools::matchesConversion(const reco::GsfElectron &ele,
              ele.reco::GsfElectron::closestCtfTrackRef().key() == it->key())
       return true;
     if (allowAmbiguousGsfMatch) {
-      for (reco::GsfTrackRefVector::const_iterator tk = ele.ambiguousGsfTracksBegin();
-           tk != ele.ambiguousGsfTracksEnd();
-           ++tk) {
-        if (tk->isNonnull() && tk->id() == it->id() && tk->key() == it->key())
+      for (auto const &tk : ele.ambiguousGsfTracks()) {
+        if (tk.isNonnull() && tk.id() == it->id() && tk.key() == it->key())
           return true;
       }
     }

CommonTools/ParticleFlow/interface/ElectronIDPFCandidateSelectorDefinition.h

@@ -81,18 +81,16 @@ namespace pf2pat {
 
         int match = -1;
         // try first the non-ambiguous tracks
-        for (reco::GsfElectronCollection::const_iterator it = electrons->begin(), ed = electrons->end(); it != ed;
-             ++it) {
+        for (auto it = electrons->begin(), ed = electrons->end(); it != ed; ++it) {
           if (it->gsfTrack() == PfTk) {
             match = it - electrons->begin();
             break;
           }
         }
         // then the ambiguous ones
         if (match == -1) {
-          for (reco::GsfElectronCollection::const_iterator it = electrons->begin(), ed = electrons->end(); it != ed;
-               ++it) {
-            if (std::count(it->ambiguousGsfTracksBegin(), it->ambiguousGsfTracksEnd(), PfTk) > 0) {
+          for (auto it = electrons->begin(), ed = electrons->end(); it != ed; ++it) {
+            if (std::count(it->ambiguousGsfTracks().begin(), it->ambiguousGsfTracks().end(), PfTk) > 0) {
               match = it - electrons->begin();
               break;
             }

DataFormats/EgammaCandidates/interface/GsfElectron.h

@@ -680,8 +680,7 @@ namespace reco {
     bool passingPflowPreselection() const { return passPflowPreselection_; }
     bool ambiguous() const { return ambiguous_; }
     GsfTrackRefVector::size_type ambiguousGsfTracksSize() const { return ambiguousGsfTracks_.size(); }
-    GsfTrackRefVector::const_iterator ambiguousGsfTracksBegin() const { return ambiguousGsfTracks_.begin(); }
-    GsfTrackRefVector::const_iterator ambiguousGsfTracksEnd() const { return ambiguousGsfTracks_.end(); }
+    auto const &ambiguousGsfTracks() const { return ambiguousGsfTracks_; }
 
     // setters
     void setPassCutBasedPreselection(bool flag) { passCutBasedPreselection_ = flag; }

PhysicsTools/PatAlgos/plugins/PATElectronProducer.cc

@@ -383,10 +383,8 @@ void PATElectronProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
         if (itElectron->gsfTrack() == i->gsfTrackRef()) {
           Matched = true;
         } else {
-          for (reco::GsfTrackRefVector::const_iterator it = itElectron->ambiguousGsfTracksBegin();
-               it != itElectron->ambiguousGsfTracksEnd();
-               it++) {
-            MatchedToAmbiguousGsfTrack |= (bool)(i->gsfTrackRef() == (*it));
+          for (auto const& it : itElectron->ambiguousGsfTracks()) {
+            MatchedToAmbiguousGsfTrack |= (bool)(i->gsfTrackRef() == it);
           }
         }
 

RecoEgamma/EgammaPhotonProducers/src/ReducedEGProducer.cc

@@ -644,8 +644,7 @@ void ReducedEGProducer::produce(edm::Event& event, const edm::EventSetup& eventS
     }
 
     // Save additional ambiguous gsf tracks in a map:
-    for (auto igsf = gsfElectron.ambiguousGsfTracksBegin(); igsf != gsfElectron.ambiguousGsfTracksEnd(); ++igsf) {
-      const reco::GsfTrackRef& ambigGsfTrack = *igsf;
+    for (auto const& ambigGsfTrack : gsfElectron.ambiguousGsfTracks()) {
       if (!gsfTrackMap.count(ambigGsfTrack)) {
         gsfTracks.push_back(*ambigGsfTrack);
         gsfTrackMap[ambigGsfTrack] = gsfTracks.size() - 1;
@@ -863,8 +862,8 @@ void ReducedEGProducer::produce(edm::Event& event, const edm::EventSetup& eventS
     // Also in this loop let's relink ambiguous tracks
     std::vector<reco::GsfTrackRef> ambigTracksInThisElectron;
     // Here we loop over the ambiguous tracks and save them in a vector
-    for (auto igsf = gsfElectron.ambiguousGsfTracksBegin(); igsf != gsfElectron.ambiguousGsfTracksEnd(); ++igsf) {
-      ambigTracksInThisElectron.push_back(*igsf);
+    for (auto const& igsf : gsfElectron.ambiguousGsfTracks()) {
+      ambigTracksInThisElectron.push_back(igsf);
     }
 
     // Now we need to clear them (they are the refs to original collection):