Merge pull request #20114 from weishi10141993/CMSSW_9_2_X

Update TrackAndVertexUnpacker.cc
cms-sw · Aug 22, 2017 · 801ad34 · 801ad34
2 parents 00000ba + 862c48e
commit 801ad34
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/PhysicsTools/PatAlgos/plugins/TrackAndVertexUnpacker.cc b/PhysicsTools/PatAlgos/plugins/TrackAndVertexUnpacker.cc
@@ -83,7 +83,7 @@ void PATTrackAndVertexUnpacker::produce(edm::StreamID, edm::Event & iEvent, cons
 	unsigned int j=0;
 	for(unsigned int i=0;i<cands->size();i++)	{
 		const pat::PackedCandidate & c = (*cands)[i];
-		if(c.charge() != 0 && c.numberOfHits()> 0){
+		if(c.hasTrackDetails() && c.charge() != 0 && c.numberOfHits()> 0){
 			outTks->push_back(c.pseudoTrack());
 			for(size_t ipv=0;ipv< pvs->size(); ++ipv) {
 				if(c.fromPV(ipv)==pat::PackedCandidate::PVUsedInFit)
@@ -96,12 +96,14 @@ void PATTrackAndVertexUnpacker::produce(edm::StreamID, edm::Event & iEvent, cons
 
 	int offsetAdd=j;
 	for(unsigned int i = 0; i < addTracks->size(); i++) {
-		outTks->push_back((*addTracks)[i].pseudoTrack());
-		for(size_t ipv=0;ipv< pvs->size(); ++ipv) {
-			if((*addTracks)[i].fromPV(ipv)==pat::PackedCandidate::PVUsedInFit)
-				asso[ipv].push_back(j);
+		if( (*addTracks)[i].hasTrackDetails() ){
+			outTks->push_back((*addTracks)[i].pseudoTrack());
+			for(size_t ipv=0;ipv< pvs->size(); ++ipv) {
+				if((*addTracks)[i].fromPV(ipv)==pat::PackedCandidate::PVUsedInFit)
+					asso[ipv].push_back(j);
+			}
+			j++;
 		}
-		j++;
 	}
 
 	edm::OrphanHandle< std::vector<reco::Track>  > oh = iEvent.put(std::move(outTks));