Merge pull request #693 from jluetic/PixelConsumesRef

Consumes migration -- Adding consumes calls to CalibTracker/SiPixelLorentzAngle
cms-sw · Sep 17, 2013 · 9ff43a8 · 9ff43a8
2 parents 900564e + 772b6ea
commit 9ff43a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngle.h b/CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngle.h
@@ -26,6 +26,7 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include <Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h>
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
+#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include <TROOT.h>
 #include <TTree.h>
 #include <TFile.h>
@@ -194,6 +195,7 @@ class SiPixelLorentzAngle : public edm::EDAnalyzer
   const TrackerGeometry * tracker;
   const MagneticField * magfield;
   TrajectoryStateTransform tsTransform;
+  edm::EDGetTokenT<TrajTrackAssociationCollection> t_trajTrack;
 
 };
 

diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
@@ -4,7 +4,6 @@
 #include <iostream>
 #include <fstream>
 #include <TMath.h>
-#include "CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngle.h"
 
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -27,6 +26,7 @@
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
+#include "CalibTracker/SiPixelLorentzAngle/interface/SiPixelLorentzAngle.h"
 int lower_bin_;
 
 using namespace std;
@@ -49,6 +49,8 @@ SiPixelLorentzAngle::SiPixelLorentzAngle(edm::ParameterSet const& conf) :
   min_drift_ = -1000.; //-200.;(conf.getParameter<double>("residualMax"))
   max_drift_ = 1000.; //400.;
 
+  t_trajTrack = consumes<TrajTrackAssociationCollection> (conf.getParameter<edm::InputTag>("src"));
+
 }
 
 // Virtual destructor needed.
@@ -179,7 +181,7 @@ void SiPixelLorentzAngle::analyze(const edm::Event& e, const edm::EventSetup& es
 
   // get the association map between tracks and trajectories
   edm::Handle<TrajTrackAssociationCollection> trajTrackCollectionHandle;
-  e.getByLabel(conf_.getParameter<std::string>("src"),trajTrackCollectionHandle);
+  e.getByToken(t_trajTrack,trajTrackCollectionHandle);
   if(trajTrackCollectionHandle->size() >0){
     trackEventsCounter_++;
     for(TrajTrackAssociationCollection::const_iterator it = trajTrackCollectionHandle->begin(); it!=trajTrackCollectionHandle->end();++it){