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

@@ -70,11 +70,11 @@ trk_ec_digi = TrackerDigi("trk_ec_digi",
         outputHitCollection="TrackerEndcapRawHits",
         timeResolution=8)
 
-vtx_b_digi = UFSDTrackerDigi("vtx_b_digi", 
+vtx_b_digi = TrackerDigi("vtx_b_digi", 
         inputHitCollection="VertexBarrelHits",
         outputHitCollection="VertexBarrelRawHits",
         timeResolution=8)
-vtx_ec_digi = UFSDTrackerDigi("vtx_ec_digi", 
+vtx_ec_digi = TrackerDigi("vtx_ec_digi", 
         inputHitCollection="VertexEndcapHits",
         outputHitCollection="VertexEndcapRawHits",
         timeResolution=8)
@@ -213,10 +213,11 @@ out.outputCommands = ["keep *",
 ApplicationMgr(
     TopAlg = [podioinput, 
               copier, trkcopier,
-              ecal_digi, ufsd_digi, ufsd_digi2, #vtx_digi, 
+              ecal_digi, 
+              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,
-              trk_barrel_reco, trk_endcap_reco, #vtx_barrel_reco, 
-              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,