diff --git a/[refs] b/[refs] index 4a32ba6dfca52..233df19299480 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": 0fe471bd94cb1310bf1296bafff618cff7ec3532 +"refs/heads/CMSSW_7_1_X": 845cee8e93ae68ce0119971274b359909b4a5a8f diff --git a/trunk/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc b/trunk/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc index aa6fbe106dca4..b83b5c514647e 100644 --- a/trunk/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc +++ b/trunk/RecoBTag/ImpactParameter/plugins/TrackIPProducer.cc @@ -13,7 +13,7 @@ // // Original Author: Andrea Rizzi // Created: Thu Apr 6 09:56:23 CEST 2006 -// $Id: TrackIPProducer.cc,v 1.8 2007/10/08 18:45:22 arizzi Exp $ +// $Id: TrackIPProducer.cc,v 1.9 2007/10/12 09:31:37 arizzi Exp $ // // @@ -162,7 +162,7 @@ TrackIPProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) int ind =0; for (TrackRefVector::const_iterator itTrack = tracks.begin(); itTrack != tracks.end(); ++itTrack) { const Track & track = **itTrack; - const TransientTrack & transientTrack = builder->build(&(**itTrack)); + const TransientTrack & transientTrack = builder->build(&(**itTrack)); /* cout << " pt " << track.pt() << " d0 " << fabs(track.d0()) << " #hit " << track.hitPattern().numberOfValidHits()<< @@ -188,7 +188,7 @@ TrackIPProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) trackIp.ip3d=IPTools::signedImpactParameter3D(transientTrack,direction,*pv).second; trackIp.ip2d=IPTools::signedTransverseImpactParameter(transientTrack,direction,*pv).second; TrajectoryStateOnSurface closest = IPTools::closestApproachToJet(transientTrack.impactPointState(), *pv, direction,transientTrack.field()); - if(closes.isValid()) trackIp.closestToJetAxis=closest.globalPosition(); + if (closest.isValid()) trackIp.closestToJetAxis = closest.globalPosition(); //TODO:cross check if it is the same using other methods trackIp.distanceToJetAxis=IPTools::jetTrackDistance(transientTrack,direction,*pv).second.value(); @@ -221,17 +221,17 @@ TrackIPProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) int second=last->second; for(int n=0;n< ipData.size();n++) - { + { int use; if(n==first) use = second; else use = first; TrajectoryStateOnSurface trackState1 = builder->build(selectedTracks[n]).impactPointState(); TrajectoryStateOnSurface trackState2 = builder->build(selectedTracks[use]).impactPointState(); std::pair points = minDist.points(trackState1,trackState2); float distance = ( points.first - points.second ).mag(); - ipData[n].closestToFirstTrack=points.first; + ipData[n].closestToFirstTrack=points.first; ipData[n].distanceToFirstTrack=distance; - } + } } TrackIPTagInfo tagInfo(ipData,prob2D,prob3D,selectedTracks, edm::Ref(jetTracksAssociation,i),