Merge pull request #5085 from cms-btv-pog/FixSVIVFtracks_70X

fix for number of secondary vertex tracks in case IVF vertices are used
cms-sw · Sep 6, 2014 · bafc70a · bafc70a
2 parents 1c71a1e + 84bc6b8
commit bafc70a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/RecoBTag/SecondaryVertex/src/CombinedSVComputer.cc b/RecoBTag/SecondaryVertex/src/CombinedSVComputer.cc
@@ -172,10 +172,8 @@ CombinedSVComputer::operator () (const TrackIPTagInfo &ipInfo,
 
 		const Vertex &vertex = svInfo.secondaryVertex(i);
 		bool hasRefittedTracks = vertex.hasRefittedTracks();
-		TrackRefVector tracks = svInfo.vertexTracks(i);
-		for(TrackRefVector::const_iterator track = tracks.begin();
-		    track != tracks.end(); track++) {
-			double w = svInfo.trackWeight(i, *track);
+		for(reco::Vertex::trackRef_iterator track = vertex.tracks_begin(); track != vertex.tracks_end(); track++) {
+			double w = vertex.trackWeight(*track);			
 			if (w < minTrackWeight)
 				continue;
 			if (hasRefittedTracks) {

diff --git a/RecoBTag/SecondaryVertex/src/CombinedSVComputerV2.cc b/RecoBTag/SecondaryVertex/src/CombinedSVComputerV2.cc
@@ -184,9 +184,8 @@ CombinedSVComputerV2::operator () (const TrackIPTagInfo &ipInfo,
 
 		const Vertex &vertex = svInfo.secondaryVertex(i);
 		bool hasRefittedTracks = vertex.hasRefittedTracks();
-		TrackRefVector tracks = svInfo.vertexTracks(i);
-		for(TrackRefVector::const_iterator track = tracks.begin(); track != tracks.end(); track++) {
-			double w = svInfo.trackWeight(i, *track);
+		for(reco::Vertex::trackRef_iterator track = vertex.tracks_begin(); track != vertex.tracks_end(); track++) {
+			double w = vertex.trackWeight(*track);			
 			if (w < minTrackWeight)
 				continue;
 			if (hasRefittedTracks) {

diff --git a/RecoBTag/SecondaryVertex/src/CombinedSVSoftLeptonComputer.cc b/RecoBTag/SecondaryVertex/src/CombinedSVSoftLeptonComputer.cc
@@ -190,9 +190,8 @@ CombinedSVSoftLeptonComputer::operator () (const TrackIPTagInfo &ipInfo,
 
 		const Vertex &vertex = svInfo.secondaryVertex(i);
 		bool hasRefittedTracks = vertex.hasRefittedTracks();
-		TrackRefVector tracks = svInfo.vertexTracks(i);
-		for(TrackRefVector::const_iterator track = tracks.begin(); track != tracks.end(); track++) {
-			double w = svInfo.trackWeight(i, *track);
+		for(reco::Vertex::trackRef_iterator track = vertex.tracks_begin(); track != vertex.tracks_end(); track++) {
+			double w = vertex.trackWeight(*track);			
 			if (w < minTrackWeight)
 				continue;
 			if (hasRefittedTracks) {