Multiple Tracking hit collection linker

The collections are explicitly named.

tracking/options/tracker_reconstruction.py

@@ -104,21 +104,15 @@ sourcelinker = TrackerSourceLinker("trk_srclinker",
         outputSourceLinks="BarrelTrackSourceLinks",
         OutputLevel=DEBUG)
 
-trk_hits_srclnkr = TrackingHitsSourceLinker("trk_hits_srclnkr",
-        inputTrackerCollections = [trk_endcap_reco.outputHitCollection, 
-                                   trk_barrel_reco.outputHitCollection, 
-                                   vtx_barrel_reco.outputHitCollection],
-        outputSourceLinks="TrackingSourceLinks",
+trk_hits_srclnkr = TrackerSourcesLinker("trk_srcslnkr",
+        ITrackerBarrelHits = "VertexBarrelRecHits",
+        ITrackerEndcapHits = "VertexBarrelRecHits",
+        OTrackerBarrelHits = "TrackerBarrelRecHits",
+        OTrackerEndcapHits = "TrackerEndcapRecHits",
+        outputSourceLinks="TrackerSourceLinks",
         OutputLevel=DEBUG)
 
-
-
-#trk_hits_srclnkr2 = TrtackerSourcesLinker("trk_srcslnkr2",
-#        trackerHitCollections=["TrackerEndcapRecHits","TrackerBarrelRecHits","VertexBarrelRecHits"],
-#        outputSourceLinks="AllTrackerSourceLinks",
-#        OutputLevel=DEBUG)
-
-# Track param init
+## Track param init
 truth_trk_init = TrackParamTruthInit("truth_trk_init",
         inputMCParticles="mcparticles",
         outputInitialTrackParameters="InitTrackParams",
@@ -204,15 +198,11 @@ out.outputCommands = ["keep *",
 ApplicationMgr(
     TopAlg = [podioinput, 
               copier, trkcopier,
-              ecal_digi, ufsd_digi, vtx_digi, 
-              ecal_reco, 
-              simple_cluster,
-              trk_barrel_reco, 
-              vtx_barrel_reco, 
+              ecal_digi, ufsd_digi, ufsd_digi2, vtx_digi, 
+              ecal_reco, simple_cluster,
+              trk_barrel_reco, trk_endcap_reco, vtx_barrel_reco, 
               sourcelinker, trk_hits_srclnkr,
-              clust_trk_init, 
-              truth_trk_init, 
-              vtxcluster_trk_init, 
+              clust_trk_init, truth_trk_init, vtxcluster_trk_init, 
               trk_find_alg, parts_from_fit,
               trk_find_alg1, parts_from_fit1,
               trk_find_alg2, parts_from_fit2,