cms-sw · davidlange6 · Jan 31, 2017 · Dec 7, 2016 · Dec 16, 2016 · Dec 16, 2016
diff --git a/Alignment/OfflineValidation/src/TrackerValidationVariables.cc b/Alignment/OfflineValidation/src/TrackerValidationVariables.cc
@@ -1,4 +1,3 @@
-
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
@@ -328,6 +327,7 @@ TrackerValidationVariables::fillTrackQuantities(const edm::Event& event,
 
   edm::Handle<TrajTrackAssociationCollection> TrajTracksMap;
   event.getByToken(trajTracksToken_, TrajTracksMap);
+  if(!TrajTracksMap.isValid()) return;
   LogDebug("TrackerValidationVariables") << "TrajTrack collection size " << TrajTracksMap->size();
 
   const Trajectory* trajectory;

diff --git a/CommonTools/RecoAlgos/interface/GsfElectronSelector.h b/CommonTools/RecoAlgos/interface/GsfElectronSelector.h
@@ -68,6 +68,8 @@ namespace helper {
             ++nHitsToAdd;
 	  }
           tx.setHits( rHits, hidx, nHitsToAdd );
+          tx.setTrajParams(trk.extra()->trajParams(),trk.extra()->chi2s());
+          assert(tx.trajParams().size()==tx.recHitsSize());
           hidx += nHitsToAdd;
  	  trk.setGsfExtra( GsfTrackExtraRef( rGsfTrackExtras, tidx ) ); 
  	  trk.setExtra( TrackExtraRef( rTrackExtras, tidx ++ ) ); 

diff --git a/CommonTools/RecoAlgos/interface/TrackFullCloneSelectorBase.h b/CommonTools/RecoAlgos/interface/TrackFullCloneSelectorBase.h
@@ -106,7 +106,8 @@ class TrackFullCloneSelectorBase : public edm::stream::EDProducer<> {
               selHits_->push_back( (*hit)->clone() );
           }
           tx.setHits( rHits, firstHitIndex, selHits_->size() - firstHitIndex );
-
+          tx.setTrajParams(trk.extra()->trajParams(),trk.extra()->chi2s());
+          assert(tx.trajParams().size()==tx.recHitsSize());
           if (copyTrajectories_) {
               goodTracks[current] = reco::TrackRef(rTracks, selTracks_->size() - 1);
           }

diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc
@@ -293,6 +293,7 @@ void SiPixelHitEfficiencySource::analyze(const edm::Event& iEvent, const edm::Ev
   //get the map
   edm::Handle<TrajTrackAssociationCollection> match;
   iEvent.getByToken( tracksrc_, match );
+  if (!match.isValid()) return;  
   const TrajTrackAssociationCollection ttac = *(match.product());
 
   if(debug_){

diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc
@@ -946,24 +946,12 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
 
  }//-----Tracks
   ////////////////////////////
-  //get trajectories
-  edm::Handle<std::vector<Trajectory> > trajCollectionHandle;
-  //iEvent.getByLabel(tracksrc_,trajCollectionHandle);
-  iEvent.getByToken ( tracksrcToken_, trajCollectionHandle );
-  auto const & trajColl = *(trajCollectionHandle.product());
-
   //get tracks
   edm::Handle<std::vector<reco::Track> > trackCollectionHandle;
   //iEvent.getByLabel(tracksrc_,trackCollectionHandle);
   iEvent.getByToken( trackToken_, trackCollectionHandle );
   auto const & trackColl = *(trackCollectionHandle.product());
 
-  //get the map
-  edm::Handle<TrajTrackAssociationCollection> match;
-  //iEvent.getByLabel(tracksrc_,match);
-  iEvent.getByToken( trackAssociationToken_, match);
-  auto const &  ttac = *(match.product());
-
   // get clusters
   edm::Handle< edmNew::DetSetVector<SiPixelCluster> >  clusterColl;
   //iEvent.getByLabel( clustersrc_, clusterColl );
@@ -976,18 +964,30 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
   const edm::DetSetVector<PixelDigi> diginp = *(digiinput.product());
 
 
-  if(debug_){
-    std::cout << "Trajectories\t : " << trajColl.size() << std::endl;
-    std::cout << "recoTracks  \t : " << trackColl.size() << std::endl;
-    std::cout << "Map entries \t : " << ttac.size() << std::endl;
-  }
-
   std::set<SiPixelCluster> clusterSet;
   TrajectoryStateCombiner tsoscomb;
   int tracks=0, pixeltracks=0, bpixtracks=0, fpixtracks=0; 
   int trackclusters=0, barreltrackclusters=0, endcaptrackclusters=0;
   int otherclusters=0, barrelotherclusters=0, endcapotherclusters=0;
 
+  //get trajectories
+  edm::Handle<std::vector<Trajectory> > trajCollectionHandle;
+  iEvent.getByToken ( tracksrcToken_, trajCollectionHandle );
+  if (trajCollectionHandle.isValid()) {
+
+  auto const & trajColl = *(trajCollectionHandle.product());
+  //get the map
+  edm::Handle<TrajTrackAssociationCollection> match;
+  iEvent.getByToken( trackAssociationToken_, match);
+  auto const &  ttac = *(match.product());
+
+ if(debug_){
+    std::cout << "Trajectories\t : " << trajColl.size() << std::endl;
+    std::cout << "recoTracks  \t : " << trackColl.size() << std::endl;
+    std::cout << "Map entries \t : " << ttac.size() << std::endl;
+  }
+
+
   //Loop over map entries
   for(TrajTrackAssociationCollection::const_iterator it =  ttac.begin();it !=  ttac.end(); ++it){
     const edm::Ref<std::vector<Trajectory> > traj_iterator = it->key;  
@@ -1226,6 +1226,8 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
 
   }//end loop on map entries
 
+  } // end valid trajectory:
+
   //find clusters that are NOT on track
   //edmNew::DetSet<SiPixelCluster>::const_iterator  di;
   if(debug_) std::cout << "clusters not on track: (size " << clustColl.size() << ") ";

diff --git a/DQM/SiPixelPhase1TrackClusters/interface/SiPixelPhase1TrackClusters.h b/DQM/SiPixelPhase1TrackClusters/interface/SiPixelPhase1TrackClusters.h
@@ -10,7 +10,7 @@
 
 #include "DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h"
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
-#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 
 class SiPixelPhase1TrackClusters : public SiPixelPhase1Base {
   enum {
@@ -36,7 +36,7 @@ class SiPixelPhase1TrackClusters : public SiPixelPhase1Base {
 
   private:
   edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > clustersToken_;
-  edm::EDGetTokenT<TrajTrackAssociationCollection> trackAssociationToken_;
+  edm::EDGetTokenT<reco::TrackCollection> tracksToken_;
 };
 
 #endif
diff --git a/DQM/SiPixelPhase1TrackClusters/python/SiPixelPhase1TrackClusters_cfi.py b/DQM/SiPixelPhase1TrackClusters/python/SiPixelPhase1TrackClusters_cfi.py
@@ -132,7 +132,7 @@
 
 SiPixelPhase1TrackClustersAnalyzer = cms.EDAnalyzer("SiPixelPhase1TrackClusters",
         clusters = cms.InputTag("siPixelClusters"),
-        trajectories = cms.InputTag("generalTracks"),
+        tracks = cms.InputTag("generalTracks"),
         histograms = SiPixelPhase1TrackClustersConf,
         geometry = SiPixelPhase1Geometry
 )

diff --git a/DQM/SiPixelPhase1TrackClusters/src/SiPixelPhase1TrackClusters.cc b/DQM/SiPixelPhase1TrackClusters/src/SiPixelPhase1TrackClusters.cc
@@ -26,7 +26,7 @@ SiPixelPhase1TrackClusters::SiPixelPhase1TrackClusters(const edm::ParameterSet&
   SiPixelPhase1Base(iConfig) 
 {
   clustersToken_ = consumes<edmNew::DetSetVector<SiPixelCluster>>(iConfig.getParameter<edm::InputTag>("clusters"));
-  trackAssociationToken_ = consumes<TrajTrackAssociationCollection>(iConfig.getParameter<edm::InputTag>("trajectories"));
+  tracksToken_ = consumes<reco::TrackCollection>(iConfig.getParameter<edm::InputTag>("tracks"));
 }
 
 void SiPixelPhase1TrackClusters::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
@@ -37,36 +37,33 @@ void SiPixelPhase1TrackClusters::analyze(const edm::Event& iEvent, const edm::Ev
   assert(tracker.isValid());
 
   //get the map
-  edm::Handle<TrajTrackAssociationCollection> ttac;
-  iEvent.getByToken( trackAssociationToken_, ttac);
+  edm::Handle<reco::TrackCollection> tracks;
+  iEvent.getByToken( tracksToken_, tracks);
 
   // get clusters
   edm::Handle< edmNew::DetSetVector<SiPixelCluster> >  clusterColl;
   iEvent.getByToken( clustersToken_, clusterColl );
 
-  TrajectoryStateCombiner tsoscomb;
-
   // we need to store some per-cluster data. Instead of a map, we use a vector,
   // exploiting the fact that all custers live in the DetSetVector and we can 
   // use the same indices to refer to them.
   // corr_charge is not strictly needed but cleaner to have it.
   std::vector<bool>  ontrack    (clusterColl->data().size(), false);
   std::vector<float> corr_charge(clusterColl->data().size(), -1.0f);
 
-  for (auto& item : *ttac) {
-    auto trajectory_ref = item.key;
-    reco::TrackRef track_ref = item.val;
+  for (auto const & track : *tracks) {
 
     bool isBpixtrack = false, isFpixtrack = false, crossesPixVol=false;
 
     // find out whether track crosses pixel fiducial volume (for cosmic tracks)
-    double d0 = track_ref->d0(), dz = track_ref->dz(); 
+    double d0 = track.d0(), dz = track.dz(); 
     if(std::abs(d0)<15 && std::abs(dz)<50) crossesPixVol = true;
 
-    for (auto& measurement : trajectory_ref->measurements()) {
-      // check if things are all valid
-      if (!measurement.updatedState().isValid()) continue;
-      auto hit = measurement.recHit();
+    auto const & trajParams = track.extra()->trajParams();
+    assert(trajParams.size()==track.recHitsSize());
+    auto hb = track.recHitsBegin();
+    for(unsigned int h=0;h<track.recHitsSize();h++){
+      auto hit = *(hb+h);
       if (!hit->isValid()) continue;
       DetId id = hit->geographicalId();
 
@@ -83,13 +80,9 @@ void SiPixelPhase1TrackClusters::analyze(const edm::Event& iEvent, const edm::Ev
       if (clust.isNull()) continue; 
       ontrack[clust.key()] = true; // mark cluster as ontrack
 
-      // compute trajectory parameters at hit
-      TrajectoryStateOnSurface tsos = tsoscomb(measurement.forwardPredictedState(), 
-                                               measurement.backwardPredictedState());
-      if (!tsos.isValid()) continue;
 
       // correct charge for track impact angle
-      LocalTrajectoryParameters ltp = tsos.localParameters();
+      auto const & ltp = trajParams[h];
       LocalVector localDir = ltp.momentum()/ltp.momentum().mag();
 
       float clust_alpha = atan2(localDir.z(), localDir.x());

diff --git a/DQM/SiPixelPhase1TrackEfficiency/interface/SiPixelPhase1TrackEfficiency.h b/DQM/SiPixelPhase1TrackEfficiency/interface/SiPixelPhase1TrackEfficiency.h
@@ -10,7 +10,7 @@
 
 #include "DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h"
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
-#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 
 class SiPixelPhase1TrackEfficiency : public SiPixelPhase1Base {
@@ -26,7 +26,7 @@ class SiPixelPhase1TrackEfficiency : public SiPixelPhase1Base {
 
   private:
   edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > clustersToken_;
-  edm::EDGetTokenT<TrajTrackAssociationCollection> trackAssociationToken_;
+  edm::EDGetTokenT<reco::TrackCollection> tracksToken_;
   edm::EDGetTokenT<reco::VertexCollection> vtxToken_;
 };
 

diff --git a/DQM/SiPixelPhase1TrackEfficiency/python/SiPixelPhase1TrackEfficiency_cfi.py b/DQM/SiPixelPhase1TrackEfficiency/python/SiPixelPhase1TrackEfficiency_cfi.py
@@ -41,7 +41,7 @@
 
 SiPixelPhase1TrackEfficiencyAnalyzer = cms.EDAnalyzer("SiPixelPhase1TrackEfficiency",
         clusters = cms.InputTag("siPixelClusters"),
-        trajectories = cms.InputTag("generalTracks"),
+        tracks = cms.InputTag("generalTracks"),
         primaryvertices = cms.InputTag("offlinePrimaryVertices"),
         histograms = SiPixelPhase1TrackEfficiencyConf,
         geometry = SiPixelPhase1Geometry

diff --git a/DQM/SiPixelPhase1TrackEfficiency/src/SiPixelPhase1TrackEfficiency.cc b/DQM/SiPixelPhase1TrackEfficiency/src/SiPixelPhase1TrackEfficiency.cc
@@ -23,8 +23,8 @@
 
 SiPixelPhase1TrackEfficiency::SiPixelPhase1TrackEfficiency(const edm::ParameterSet& iConfig) :
   SiPixelPhase1Base(iConfig) 
-{
-  trackAssociationToken_ = consumes<TrajTrackAssociationCollection>(iConfig.getParameter<edm::InputTag>("trajectories"));
+{ 
+  tracksToken_ = consumes<reco::TrackCollection>(iConfig.getParameter<edm::InputTag>("tracks"));
   vtxToken_ = consumes<reco::VertexCollection>(iConfig.getParameter<edm::InputTag>("primaryvertices"));
 }
 
@@ -43,22 +43,19 @@ void SiPixelPhase1TrackEfficiency::analyze(const edm::Event& iEvent, const edm::
   //const auto primaryVertex = vertices->at(0); 
 
   // get the map
-  edm::Handle<TrajTrackAssociationCollection> ttac;
-  iEvent.getByToken( trackAssociationToken_, ttac);
+  edm::Handle<reco::TrackCollection> tracks;
+  iEvent.getByToken( tracksToken_, tracks);
 
-  for (auto& item : *ttac) {
-    auto trajectory_ref = item.key;
-    reco::TrackRef track_ref = item.val;
+  for (auto const & track : *tracks) {
 
     bool isBpixtrack = false, isFpixtrack = false;
     int nStripHits = 0;
 
     // first, look at the full track to see whether it is good
-    for (auto& measurement : trajectory_ref->measurements()) {
-      // check if things are all valid
-      if (!measurement.updatedState().isValid()) continue;
-      auto hit = measurement.recHit();
-      if (!hit->isValid()) continue;
+    auto hb = track.recHitsBegin();
+    for(unsigned int h=0;h<track.recHitsSize();h++){
+       auto hit = *(hb+h);
+      if(!hit->isValid()) continue;
 
       DetId id = hit->geographicalId();
       uint32_t subdetid = (id.subdetId());
@@ -77,9 +74,8 @@ void SiPixelPhase1TrackEfficiency::analyze(const edm::Event& iEvent, const edm::
     if (!isBpixtrack && !isFpixtrack) continue;
 
     // then, look at each hit
-    for (auto& measurement : trajectory_ref->measurements()) {
-      if (!measurement.updatedState().isValid()) continue;
-      auto hit = measurement.recHit();
+    for(unsigned int h=0;h<track.recHitsSize();h++){
+      auto hit = *(hb+h);
 
       DetId id = hit->geographicalId();
       uint32_t subdetid = (id.subdetId());

diff --git a/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h b/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h
@@ -92,8 +92,8 @@ class SiStripMonitorTrack : public DQMEDAnalyzer {
   // internal evaluation of monitorables
   void AllClusters(const edm::Event& ev, const edm::EventSetup& es); 
   void trackStudyFromTrack(edm::Handle<reco::TrackCollection > trackCollectionHandle, const edm::EventSetup& es);
-  void trackStudyFromTrajectory(edm::Handle<TrajTrackAssociationCollection> TItkAssociatorCollection, const edm::EventSetup& es);
-  void trajectoryStudy(const edm::Ref<std::vector<Trajectory> > traj, const edm::EventSetup& es, bool track_ok);
+  void trackStudyFromTrajectory(edm::Handle<reco::TrackCollection > trackCollectionHandle, const edm::EventSetup& es);
+  void trajectoryStudy(const reco::Track& track, const edm::EventSetup& es, bool track_ok);
   void trackStudy(const edm::Event& ev, const edm::EventSetup& es);
   bool trackFilter(const reco::Track& track);
   //  LocalPoint project(const GeomDet *det,const GeomDet* projdet,LocalPoint position,LocalVector trackdirection)const;
@@ -214,8 +214,6 @@ class SiStripMonitorTrack : public DQMEDAnalyzer {
 
   edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster> > clusterToken_;
   edm::EDGetTokenT<reco::TrackCollection> trackToken_;
-  //  edm::EDGetTokenT<std::vector<Trajectory> > trajectoryToken_;
-  edm::EDGetTokenT<TrajTrackAssociationCollection> trackTrajToken_;
 
   bool Mod_On_;
   bool Trend_On_;