Improve tracking setup

Get up to date with the latest changes in ACTS. Finalize the output data model(s).

benchmarks/tracking/options/tracker_reconstruction.py

@@ -106,7 +106,7 @@ vtx_b_reco = TrackerHitReconstruction("vtx_b_reco",
         inputHitCollection = vtx_b_digi.outputHitCollection,
         outputHitCollection="VertexBarrelRecHits")
 
-vtx_ec_reco = TrackerHitReconstruction("vtx_ec_digi",
+vtx_ec_reco = TrackerHitReconstruction("vtx_ec_reco",
         inputHitCollection = vtx_ec_digi.outputHitCollection,
         outputHitCollection="VertexEndcapRecHits")
 
@@ -117,13 +117,13 @@ sourcelinker = TrackerSourceLinker("sourcelinker",
         outputMeasurements="BarrelTrackMeasurements",
         OutputLevel=DEBUG)
 
-trk_hits_srclnkr = TrackerSourcesLinker("trk_srcslnkr",
-        ITrackerBarrelHits = vtx_b_reco.outputHitCollection,
-        ITrackerEndcapHits = vtx_ec_reco.outputHitCollection,
-        OTrackerBarrelHits = trk_b_reco.outputHitCollection,
-        OTrackerEndcapHits = trk_ec_reco.outputHitCollection,
-        outputSourceLinks="TrackerMeasurements",
-        OutputLevel=DEBUG)
+#trk_hits_srclnkr = TrackerSourcesLinker("trk_srcslnkr",
+#        ITrackerBarrelHits = vtx_b_reco.outputHitCollection,
+#        ITrackerEndcapHits = vtx_ec_reco.outputHitCollection,
+#        OTrackerBarrelHits = trk_b_reco.outputHitCollection,
+#        OTrackerEndcapHits = trk_ec_reco.outputHitCollection,
+#        outputSourceLinks="TrackerMeasurements",
+#        OutputLevel=DEBUG)
 
 ## Track param init
 truth_trk_init = TrackParamTruthInit("truth_trk_init",
@@ -218,7 +218,7 @@ ApplicationMgr(
               trk_b_digi, trk_ec_digi, vtx_b_digi, vtx_ec_digi, 
               trk_b_reco, trk_ec_reco, vtx_b_reco, vtx_ec_reco, 
               ecal_reco, simple_cluster,
-              sourcelinker, trk_hits_srclnkr,
+              sourcelinker, #trk_hits_srclnkr,
               clust_trk_init, truth_trk_init, #vtxcluster_trk_init, 
               trk_find_alg, parts_from_fit,
               trk_find_alg1, parts_from_fit1,