TrackBase & HitPattern redesign discussed on the RECO meeting of 08/05/2014

Alignment/OfflineValidation/plugins/PrimaryVertexValidation.cc

@@ -669,20 +669,19 @@ bool PrimaryVertexValidation::isHit2D(const TrackingRecHit &hit) const
 // ------------ method to check the presence of pixel hits  ------------
 bool PrimaryVertexValidation::hasFirstLayerPixelHits(const reco::TransientTrack track)
 {
-  bool accepted = false;
-  // hit pattern of the track
-  const reco::HitPattern& p = track.hitPattern();      
-  for (int i=0; i<p.numberOfHits(); i++) {
-    uint32_t pattern = p.getHitPattern(i);   
-    if (p.pixelBarrelHitFilter(pattern) || p.pixelEndcapHitFilter(pattern) ) {
-      if (p.getLayer(pattern) == 1) {
-	if (p.validHitFilter(pattern)) {
-	  accepted = true;
-	}
-      }
-     }
-  }
-  return accepted;
+    using namespace reco;
+    const HitPattern &p = track.hitPattern();
+    for (int i = 0; i < p.numberOfHits(HitPattern::TRACK_HITS); i++) {
+        uint32_t pattern = p.getHitPattern(HitPattern::TRACK_HITS, i);
+        if (p.pixelBarrelHitFilter(pattern) || p.pixelEndcapHitFilter(pattern) ) {
+            if (p.getLayer(pattern) == 1) {
+                if (p.validHitFilter(pattern)) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
 } 
 
 // ------------ method called once each job before begining the event loop  ------------

Calibration/IsolatedParticles/plugins/IsolatedTracksCone.cc

@@ -393,9 +393,9 @@ void IsolatedTracksCone::analyze(const edm::Event& iEvent,
     ////////////////////////////
 
     const reco::HitPattern& hitp = pTrack->hitPattern();
-    int nLayersCrossed = hitp.trackerLayersWithMeasurement();        
-    int nOuterHits     = hitp.stripTOBLayersWithMeasurement()
-      +hitp.stripTECLayersWithMeasurement() ;
+    int nLayersCrossed = hitp.trackerLayersWithMeasurement();
+    int nOuterHits     = hitp.stripTOBLayersWithMeasurement() + 
+        hitp.stripTECLayersWithMeasurement();
 
 
     double simP = 0;
@@ -1430,14 +1430,12 @@ void IsolatedTracksCone::printTrack(const reco::Track* pTrack) {
 	    << " TrackQuality " << pTrack->qualityName(trackQuality_) << " " << pTrack->quality(trackQuality_) 
 	    << std::endl;
 
-  if( printTrkHitPattern_ ) {
-    const reco::HitPattern& p = pTrack->hitPattern();
-
-    for (int i=0; i<p.numberOfHits(); i++) {
-      p.printHitPattern(i, std::cout);
+  if(printTrkHitPattern_) {
+    const reco::HitPattern &p = pTrack->hitPattern();
+    for (int i = 0; i < p.numberOfHits(reco::HitPattern::TRACK_HITS); i++) {
+        p.printHitPattern(reco::HitPattern::TRACK_HITS, i, std::cout);
     }
   }
-
 }
 
 double IsolatedTracksCone::DeltaPhi(double v1, double v2) {
@@ -1463,18 +1461,4 @@ double IsolatedTracksCone::DeltaR(double eta1, double phi1,
 
 //define this as a plug-in
 DEFINE_FWK_MODULE(IsolatedTracksCone);
-
-
-
-
-
-
-
-
-
-
 
-
-
-
-

Calibration/IsolatedParticles/plugins/IsolatedTracksNxN.cc

@@ -527,12 +527,11 @@ void IsolatedTracksNxN::analyze(const edm::Event& iEvent, const edm::EventSetup&
       }
     }
 
-    const reco::HitPattern& hitp    = pTrack->hitPattern();
-    const reco::HitPattern& hitpIn  = pTrack->trackerExpectedHitsInner();
-    const reco::HitPattern& hitpOut = pTrack->trackerExpectedHitsOuter();
+    const reco::HitPattern &hitp = pTrack->hitPattern();
 
-    int nLayersCrossed = hitp.trackerLayersWithMeasurement() ;        
-    int nOuterHits     = hitp.stripTOBLayersWithMeasurement()+hitp.stripTECLayersWithMeasurement() ;
+    int nLayersCrossed = hitp.trackerLayersWithMeasurement();
+    int nOuterHits     = hitp.stripTOBLayersWithMeasurement()
+        + hitp.stripTECLayersWithMeasurement();
 
     bool   ifGood      = pTrack->quality(trackQuality_);
     double pt1         = pTrack->pt();
@@ -820,31 +819,42 @@ void IsolatedTracksNxN::analyze(const edm::Event& iEvent, const edm::EventSetup&
 	t_trackChiSq            ->push_back( chisq1 );	
 	t_trackNOuterHits       ->push_back( nOuterHits );
 	t_NLayersCrossed        ->push_back( nLayersCrossed );
-
-	t_trackHitsTOB          ->push_back( hitp.stripTOBLayersWithMeasurement()       ); 
-	t_trackHitsTEC          ->push_back( hitp.stripTECLayersWithMeasurement()       );
-	t_trackHitInMissTOB     ->push_back( hitpIn.stripTOBLayersWithoutMeasurement()  ); 
-	t_trackHitInMissTEC     ->push_back( hitpIn.stripTECLayersWithoutMeasurement()  );  
-	t_trackHitInMissTIB     ->push_back( hitpIn.stripTIBLayersWithoutMeasurement()  );  
-	t_trackHitInMissTID     ->push_back( hitpIn.stripTIDLayersWithoutMeasurement()  );
-	t_trackHitInMissTIBTID  ->push_back( hitpIn.stripTIBLayersWithoutMeasurement() + hitpIn.stripTIDLayersWithoutMeasurement() );  
-
-	t_trackHitOutMissTOB    ->push_back( hitpOut.stripTOBLayersWithoutMeasurement() );
-	t_trackHitOutMissTEC    ->push_back( hitpOut.stripTECLayersWithoutMeasurement() ); 
-	t_trackHitOutMissTIB    ->push_back( hitpOut.stripTIBLayersWithoutMeasurement() );
-	t_trackHitOutMissTID    ->push_back( hitpOut.stripTIDLayersWithoutMeasurement() );
-	t_trackHitOutMissTOBTEC ->push_back( hitpOut.stripTOBLayersWithoutMeasurement() + hitpOut.stripTECLayersWithoutMeasurement() );
-
-	t_trackHitInMeasTOB     ->push_back( hitpIn.stripTOBLayersWithMeasurement()  ); 
-	t_trackHitInMeasTEC     ->push_back( hitpIn.stripTECLayersWithMeasurement()  );  
-	t_trackHitInMeasTIB     ->push_back( hitpIn.stripTIBLayersWithMeasurement()  );  
-	t_trackHitInMeasTID     ->push_back( hitpIn.stripTIDLayersWithMeasurement()  );
-	t_trackHitOutMeasTOB    ->push_back( hitpOut.stripTOBLayersWithMeasurement() );
-	t_trackHitOutMeasTEC    ->push_back( hitpOut.stripTECLayersWithMeasurement() ); 
-	t_trackHitOutMeasTIB    ->push_back( hitpOut.stripTIBLayersWithMeasurement() );
-	t_trackHitOutMeasTID    ->push_back( hitpOut.stripTIDLayersWithMeasurement() );
-	t_trackOutPosOutHitDr   ->push_back( trackOutPosOutHitDr                     );
-	t_trackL                ->push_back( trackL                                  );
+    using namespace reco;	
+	t_trackHitsTOB          ->push_back(hitp.stripTOBLayersWithMeasurement()); 
+	t_trackHitsTEC          ->push_back(hitp.stripTECLayersWithMeasurement());
+
+	t_trackHitInMissTOB     ->push_back(hitp.stripTOBLayersWithoutMeasurement(HitPattern::MISSING_INNER_HITS));
+	t_trackHitInMissTEC     ->push_back(hitp.stripTECLayersWithoutMeasurement(HitPattern::MISSING_INNER_HITS));
+	t_trackHitInMissTIB     ->push_back(hitp.stripTIBLayersWithoutMeasurement(HitPattern::MISSING_INNER_HITS));
+	t_trackHitInMissTID     ->push_back(hitp.stripTIDLayersWithoutMeasurement(HitPattern::MISSING_INNER_HITS));
+	t_trackHitInMissTIBTID  ->push_back(hitp.stripTIBLayersWithoutMeasurement(HitPattern::MISSING_INNER_HITS)
+            + hitp.stripTIDLayersWithoutMeasurement(HitPattern::MISSING_INNER_HITS)); 
+
+	t_trackHitOutMissTOB    ->push_back(hitp.stripTOBLayersWithoutMeasurement(HitPattern::MISSING_OUTER_HITS));
+	t_trackHitOutMissTEC    ->push_back(hitp.stripTECLayersWithoutMeasurement(HitPattern::MISSING_OUTER_HITS)); 
+	t_trackHitOutMissTIB    ->push_back(hitp.stripTIBLayersWithoutMeasurement(HitPattern::MISSING_OUTER_HITS));
+	t_trackHitOutMissTID    ->push_back(hitp.stripTIDLayersWithoutMeasurement(HitPattern::MISSING_OUTER_HITS));
+	t_trackHitOutMissTOBTEC ->push_back(hitp.stripTOBLayersWithoutMeasurement(HitPattern::MISSING_OUTER_HITS)
+            + hitp.stripTECLayersWithoutMeasurement(HitPattern::MISSING_OUTER_HITS));
+
+    // The following push_back(0) where calls to methods XYZLayersWithMeasurement() on
+    // HiPatterns ExpectedMissingInner and ExpectedMissingOuter. Since those HitPatterns
+    // only contain MISSING_HITS, any call to XYZLayersWithMeasuremnt() whould return 0.
+    // As example:
+    //      t_trackHitInMeasTOB     ->push_back( hitpIn.stripTOBLayersWithMeasurement()  );
+    // where hitpIn was expectedInnerHits.
+	t_trackHitInMeasTOB     ->push_back(0);
+	t_trackHitInMeasTEC     ->push_back(0);
+	t_trackHitInMeasTIB     ->push_back(0);
+	t_trackHitInMeasTID     ->push_back(0);
+
+	t_trackHitOutMeasTOB    ->push_back(0);
+	t_trackHitOutMeasTEC    ->push_back(0);
+	t_trackHitOutMeasTIB    ->push_back(0);
+	t_trackHitOutMeasTID    ->push_back(0);
+
+	t_trackOutPosOutHitDr   ->push_back(trackOutPosOutHitDr                     );
+	t_trackL                ->push_back(trackL                                  );
 
 	t_maxNearP31x31         ->push_back( maxNearP31x31 );
 	t_maxNearP21x21         ->push_back( maxNearP21x21 );
@@ -1732,53 +1742,61 @@ double IsolatedTracksNxN::DeltaR(double eta1, double phi1, double eta2, double p
   return std::sqrt(deta*deta + dphi*dphi);
 }
 
-void IsolatedTracksNxN::printTrack(const reco::Track* pTrack) {
-
-  std::string theTrackQuality = "highPurity";
-  reco::TrackBase::TrackQuality trackQuality_ = reco::TrackBase::qualityByName(theTrackQuality);
-
-  std::cout << " Reference Point " << pTrack->referencePoint() <<"\n"
-	    << " TrackMmentum " << pTrack->momentum()
-	    << " (pt,eta,phi)(" << pTrack->pt()<<","<<pTrack->eta()<<","<<pTrack->phi()<<")"
-	    << " p " << pTrack->p() << "\n"
-	    << " Normalized chi2 " << pTrack->normalizedChi2() <<"  charge " << pTrack->charge()
-	    << " qoverp() " << pTrack->qoverp() <<"+-" << pTrack->qoverpError()
-	    << " d0 " << pTrack->d0() << "\n"
-	    << " NValidHits " << pTrack->numberOfValidHits() << "  NLostHits " << pTrack->numberOfLostHits()
-	    << " TrackQuality " << pTrack->qualityName(trackQuality_) << " " << pTrack->quality(trackQuality_) 
-	    << std::endl;
-
-  if( printTrkHitPattern_ ) {
-    const reco::HitPattern& p = pTrack->hitPattern();
-    const reco::HitPattern& p1 = pTrack->trackerExpectedHitsInner();
-    const reco::HitPattern& p2 = pTrack->trackerExpectedHitsOuter();
-
-    std::cout<<"default " << std::endl;
-    for (int i=0; i<p.numberOfHits(); i++) {
-      p.printHitPattern(i, std::cout);
-    }
-    std::cout<<"trackerExpectedHitsInner() " << std::endl;
-    for (int i=0; i<p1.numberOfHits(); i++) {
-      p1.printHitPattern(i, std::cout);
+void IsolatedTracksNxN::printTrack(const reco::Track* pTrack) 
+{
+    using namespace reco; 
+    std::string theTrackQuality = "highPurity";
+    reco::TrackBase::TrackQuality trackQuality_ = reco::TrackBase::qualityByName(theTrackQuality);
+
+    std::cout << " Reference Point " << pTrack->referencePoint() <<"\n"
+        << " TrackMmentum " << pTrack->momentum()
+        << " (pt,eta,phi)(" << pTrack->pt()<<","<<pTrack->eta()<<","<<pTrack->phi()<<")"
+        << " p " << pTrack->p() << "\n"
+        << " Normalized chi2 " << pTrack->normalizedChi2() <<"  charge " << pTrack->charge()
+        << " qoverp() " << pTrack->qoverp() <<"+-" << pTrack->qoverpError()
+        << " d0 " << pTrack->d0() << "\n"
+        << " NValidHits " << pTrack->numberOfValidHits() << "  NLostHits " << pTrack->numberOfLostHits()
+        << " TrackQuality " << pTrack->qualityName(trackQuality_) << " " << pTrack->quality(trackQuality_) 
+        << std::endl;
+
+    if( printTrkHitPattern_ ) {
+        const reco::HitPattern &p = pTrack->hitPattern();
+
+        std::cout<<"default " << std::endl;
+        for(int i = 0; i < p.numberOfHits(HitPattern::TRACK_HITS); i++){
+            p.printHitPattern(HitPattern::TRACK_HITS, i, std::cout);
+        }
+
+        std::cout<<"trackerExpectedHitsInner() " << std::endl;
+        for(int i = 0; i < p.numberOfHits(HitPattern::MISSING_INNER_HITS); i++){
+            p.printHitPattern(HitPattern::MISSING_INNER_HITS, i, std::cout);
+        } 
+
+        std::cout<<"trackerExpectedHitsOuter() " << std::endl;
+        for(int i = 0; i < p.numberOfHits(HitPattern::MISSING_OUTER_HITS); i++){
+            p.printHitPattern(HitPattern::MISSING_OUTER_HITS, i, std::cout);
+        }
+
+        std::cout << "\n \t trackerLayersWithMeasurement() "
+            << p.trackerLayersWithMeasurement() 
+            << "\n \t pixelLayersWithMeasurement() "
+            << p.pixelLayersWithMeasurement() 
+            << "\n \t stripLayersWithMeasurement() "
+            << p.stripLayersWithMeasurement()  
+            << "\n \t pixelBarrelLayersWithMeasurement() "
+            << p.pixelBarrelLayersWithMeasurement()
+            << "\n \t pixelEndcapLayersWithMeasurement() "
+            << p.pixelEndcapLayersWithMeasurement()
+            << "\n \t stripTIBLayersWithMeasurement() "
+            << p.stripTIBLayersWithMeasurement()
+            << "\n \t stripTIDLayersWithMeasurement() "
+            << p.stripTIDLayersWithMeasurement()
+            << "\n \t stripTOBLayersWithMeasurement() "
+            << p.stripTOBLayersWithMeasurement()
+            << "\n \t stripTECLayersWithMeasurement() "
+            << p.stripTECLayersWithMeasurement()
+            << std::endl;
     }
-    std::cout<<"trackerExpectedHitsOuter() " << std::endl;
-    for (int i=0; i<p2.numberOfHits(); i++) {
-      p2.printHitPattern(i, std::cout);
-    }
-
-
-    std::cout << "\n \t trackerLayersWithMeasurement() "     << p.trackerLayersWithMeasurement() 
-	      << "\n \t pixelLayersWithMeasurement() "       << p.pixelLayersWithMeasurement() 
-	      << "\n \t stripLayersWithMeasurement() "       << p.stripLayersWithMeasurement()  
-	      << "\n \t pixelBarrelLayersWithMeasurement() " << p.pixelBarrelLayersWithMeasurement()
-	      << "\n \t pixelEndcapLayersWithMeasurement() " << p.pixelEndcapLayersWithMeasurement()
-	      << "\n \t stripTIBLayersWithMeasurement() "    << p.stripTIBLayersWithMeasurement()
-	      << "\n \t stripTIDLayersWithMeasurement() "    << p.stripTIDLayersWithMeasurement()
-	      << "\n \t stripTOBLayersWithMeasurement() "    << p.stripTOBLayersWithMeasurement()
-	      << "\n \t stripTECLayersWithMeasurement() "    << p.stripTECLayersWithMeasurement()
-	      << std::endl;
-
-  }
 }
 
 //define this as a plug-in

Calibration/IsolatedParticles/src/TrackSelection.cc

@@ -21,33 +21,28 @@ namespace spr{
     if (pTrack->normalizedChi2() > parameters.maxChi2)        select = false;
     if (dpbyp > parameters.maxDpOverP)                        select = false;
 
+    const reco::HitPattern &hitp = pTrack->hitPattern();
     if (parameters.minLayerCrossed>0 || parameters.minOuterHit>0) {
-      const reco::HitPattern& hitp = pTrack->hitPattern();
-      if (parameters.minLayerCrossed>0 && hitp.trackerLayersWithMeasurement() < parameters.minLayerCrossed) select = false;
-      if (parameters.minOuterHit>0 && (hitp.stripTOBLayersWithMeasurement()+hitp.stripTECLayersWithMeasurement() ) < parameters.minOuterHit) select = false;
-      if (debug) {
-	std::cout << "Default Hit Pattern with " << hitp.numberOfHits() << " hits" << std::endl;
-	for (int i=0; i<hitp.numberOfHits(); i++) 
-	  hitp.printHitPattern(i, std::cout);
-      }
+        if (parameters.minLayerCrossed > 0 && hitp.trackerLayersWithMeasurement() < parameters.minLayerCrossed) select = false;
+        if (parameters.minOuterHit > 0 && (hitp.stripTOBLayersWithMeasurement() + hitp.stripTECLayersWithMeasurement()) < parameters.minOuterHit) select = false;
+        if (debug) {
+            std::cout << "Default Hit Pattern with " << hitp.numberOfHits(reco::HitPattern::TRACK_HITS) << " hits" << std::endl;
+            hitp.print(reco::HitPattern::TRACK_HITS, std::cout);
+        }
     }
     if (parameters.maxInMiss >= 0) {
-      const reco::HitPattern& hitp  = pTrack->trackerExpectedHitsInner();
-      if (hitp.trackerLayersWithoutMeasurement() > parameters.maxInMiss) select = false;
-      if (debug) {
-	std::cout << "Inner Hit Pattern with " << hitp.numberOfHits() << " hits" << std::endl;
-	for (int i=0; i<hitp.numberOfHits(); i++) 
-	  hitp.printHitPattern(i, std::cout);
-      }
+        if (hitp.trackerLayersWithoutMeasurement(reco::HitPattern::MISSING_INNER_HITS) > parameters.maxInMiss) select = false;
+        if (debug) {
+            std::cout << "Inner Hit Pattern with " << hitp.numberOfHits(reco::HitPattern::MISSING_INNER_HITS) << " hits" << std::endl;
+            hitp.print(reco::HitPattern::MISSING_INNER_HITS, std::cout);
+        }
     }
     if (parameters.maxOutMiss >= 0) {
-      const reco::HitPattern& hitp  = pTrack->trackerExpectedHitsOuter();
-      if (hitp.trackerLayersWithoutMeasurement() > parameters.maxOutMiss) select = false;
-      if (debug) {
-	std::cout << "Outer Hit Pattern with " << hitp.numberOfHits() << " hits" << std::endl;
-	for (int i=0; i<hitp.numberOfHits(); i++) 
-	  hitp.printHitPattern(i, std::cout);
-      }
+        if (hitp.trackerLayersWithoutMeasurement(reco::HitPattern::MISSING_OUTER_HITS) > parameters.maxOutMiss) select = false;
+        if (debug) {
+            std::cout << "Outer Hit Pattern with " << hitp.numberOfHits(reco::HitPattern::MISSING_OUTER_HITS) << " hits" << std::endl;
+            hitp.print(reco::HitPattern::MISSING_OUTER_HITS, std::cout);
+        }
     }
     if (debug) std::cout << "Final Selection Result " << select << std::endl;
 

CommonTools/ParticleFlow/plugins/PFCandWithSuperClusterExtractor.cc

@@ -82,19 +82,21 @@ IsoDeposit PFCandWithSuperClusterExtractor::depositFromObject(const Event & even
     double eta = cand.eta(), phi = cand.phi();
     reco::Particle::Point vtx = cand.vertex();
     for (PFCandidateCollection::const_iterator it = PFCandH->begin(), ed = PFCandH->end(); it != ed; ++it) {
-      double dR = deltaR(it->eta(), it->phi(), eta, phi);
-      // If MissHits>0 (possibly reconstructed as a photon in the PF in this case, kill the the photon if sharing the same SC)
-      if (cand.gsfTrack()->trackerExpectedHitsInner().numberOfHits()>0 && theMissHitVetoSuperClusterMatch &&
-	  it->mva_nothing_gamma() > 0.99 && cand.superCluster().isNonnull()
-	  && it->superClusterRef().isNonnull()
-	  && cand.superCluster() == it->superClusterRef())   continue;
-      if ( (dR < theDR_Max) && (dR > theDR_Veto) &&
-	   (std::abs(it->vz() - cand.vz()) < theDiff_z) &&
-	   ((it->vertex() - vtx).Rho() < theDiff_r)) {
-	// ok
-	reco::isodeposit::Direction dirTrk(it->eta(), it->phi());
-	deposit.addDeposit(dirTrk, it->pt());
-      }
+        double dR = deltaR(it->eta(), it->phi(), eta, phi);
+        // If MissHits>0 (possibly reconstructed as a photon in the PF in this case, kill the the photon if sharing the same SC)
+        if (cand.gsfTrack()->hitPattern().numberOfHits(reco::HitPattern::MISSING_INNER_HITS) > 0 
+                && theMissHitVetoSuperClusterMatch && it->mva_nothing_gamma() > 0.99 
+                && cand.superCluster().isNonnull() && it->superClusterRef().isNonnull() 
+                && cand.superCluster() == it->superClusterRef()){
+            continue;
+        }
+        if ((dR < theDR_Max) && (dR > theDR_Veto) 
+                && (std::abs(it->vz() - cand.vz()) < theDiff_z) 
+                && ((it->vertex() - vtx).Rho() < theDiff_r)) {
+            // ok
+            reco::isodeposit::Direction dirTrk(it->eta(), it->phi());
+            deposit.addDeposit(dirTrk, it->pt());
+        }
     }
 
     return deposit;

CommonTools/ParticleFlow/python/EITopPAG_cff.py

@@ -89,7 +89,7 @@
     src = cms.InputTag("pfElectronsFromVertexEI"),
     cut = cms.string('''abs(eta)<2.5 && pt>20. &&
     gsfTrackRef.isAvailable() &&
-    gsfTrackRef.trackerExpectedHitsInner.numberOfLostHits<2 &&
+    gsfTrackRef.hitPattern().numberOfLostHits('MISSING_INNER_HITS')<2 &&
     (gsfElectronRef.pfIsolationVariables().sumChargedHadronPt+
     max(0.,gsfElectronRef.pfIsolationVariables().sumNeutralHadronEt+
     gsfElectronRef.pfIsolationVariables().sumPhotonEt-
@@ -99,7 +99,6 @@
 )
 
 
-
 pfNoElectron.topCollection    = 'pfIsolatedElectronsEI'
 pfNoElectron.bottomCollection = 'pfNoMuon'
 

CommonTools/ParticleFlow/python/Isolation/pfIsolatedElectrons_cfi.py

@@ -5,7 +5,7 @@
 pfIsolatedElectrons = cms.EDFilter(
     "PFCandidateFwdPtrCollectionStringFilter",
     src = cms.InputTag("pfElectronsFromVertex"),
-    cut = cms.string(" pt > 5 & gsfElectronRef.isAvailable() & gsfTrackRef.trackerExpectedHitsInner.numberOfLostHits<2 & "\
+    cut = cms.string("pt > 5 & gsfElectronRef.isAvailable() & gsfTrackRef.hitPattern().numberOfLostHits('MISSING_INNER_HITS')<2 & "\
                      "gsfElectronRef.pfIsolationVariables().sumChargedHadronPt + "\
                      "gsfElectronRef.pfIsolationVariables().sumNeutralHadronEt + "\
                      "gsfElectronRef.pfIsolationVariables().sumPhotonEt "\

CommonTools/ParticleFlow/python/ParticleSelectors/pfSelectedElectrons_cfi.py

@@ -3,7 +3,7 @@
 pfSelectedElectrons = cms.EDFilter(
     "GenericPFCandidateSelector",
     src = cms.InputTag("pfElectronsFromVertex"),
-    cut = cms.string("pt>5 && gsfTrackRef.isNonnull && gsfTrackRef.trackerExpectedHitsInner.numberOfLostHits<2")
+    cut = cms.string("pt>5 && gsfTrackRef.isNonnull && gsfTrackRef.hitPattern().numberOfLostHits('MISSING_INNER_HITS')<2")
 )