Merge pull request cms-sw#2528 from thspeer/consumesFinalTrackSelectors

Consumes migration -- Consumes migration of TrackSelectors

Author: nclopezo

RecoTracker/FinalTrackSelectors/interface/SimpleTrackListMerger.h

@@ -4,7 +4,7 @@
 //
 // Package:         RecoTracker/FinalTrackSelectors
 // Class:           SimpleTrackListMerger
-// 
+//
 // Description:     Hit Dumper
 //
 // Original Author: Steve Wagner, [email protected]
@@ -57,9 +57,16 @@ namespace cms
     edm::RefProd< std::vector<Trajectory> > refTrajs;
     std::vector<reco::TrackRef> trackRefs;
     edm::RefProd< TrajectorySeedCollection > refTrajSeeds;
-    
+
     bool copyExtras_;
     bool makeReKeyedSeeds_;
+    std::string trackProducer1, trackProducer2;
+    edm::EDGetTokenT<reco::TrackCollection> trackProducer1Token;
+    edm::EDGetTokenT<reco::TrackCollection> trackProducer2Token;
+    edm::EDGetTokenT< std::vector<Trajectory> > trackProducer1TrajToken;
+    edm::EDGetTokenT< TrajTrackAssociationCollection > trackProducer1AssToken;
+    edm::EDGetTokenT< std::vector<Trajectory> > trackProducer2TrajToken;
+    edm::EDGetTokenT< TrajTrackAssociationCollection > trackProducer2AssToken;
   };
 }
 

RecoTracker/FinalTrackSelectors/interface/TrackMultiSelector.h

@@ -3,8 +3,8 @@
 /** \class TrackMultiSelector
  *
  * selects a subset of a track collection, copying extra information on demand
- * 
- * \author Giovanni Petrucciani 
+ *
+ * \author Giovanni Petrucciani
  *
  *
  *
@@ -45,7 +45,7 @@ namespace reco { namespace modules {
                 template<typename T> std::pair<T,T> p2p(const edm::ParameterSet & cfg, const std::string name);
             };
         public:
-            /// constructor 
+            /// constructor
             explicit TrackMultiSelector( const edm::ParameterSet & cfg ) ;
             /// destructor
             virtual ~TrackMultiSelector() ;
@@ -61,8 +61,12 @@ namespace reco { namespace modules {
 				  const std::vector<Point> &points, const Block &cut);
             /// source collection label
             edm::InputTag src_;
-            edm::InputTag vertices_;
-            edm::InputTag beamspot_;
+            edm::EDGetTokenT<reco::VertexCollection> vertices_;
+            edm::EDGetTokenT<reco::BeamSpot> beamspot_;
+	    edm::EDGetTokenT<reco::TrackCollection> tokenTracks;
+	    edm::EDGetTokenT<std::vector<Trajectory> > tokenTraj;
+	    edm::EDGetTokenT<TrajTrackAssociationCollection> tokenTrajTrack;
+
             double        beamspotDZsigmas_, beamspotD0_;
             /// copy only the tracks, not extras and rechits (for AOD)
             bool copyExtras_;
@@ -71,7 +75,7 @@ namespace reco { namespace modules {
             /// split selections in more sets
             bool splitOutputs_;
             /// filter psets
-            std::vector<Block> blocks_; 
+            std::vector<Block> blocks_;
             /// vertex cuts
             int32_t vtxNumber_;
             size_t  vtxTracks_;