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

@@ -26,7 +26,7 @@ from Configurables import Jug__Base__InputCopier_dd4pod__CalorimeterHitCollectio
 from Configurables import Jug__Base__InputCopier_dd4pod__TrackerHitCollection_dd4pod__TrackerHitCollection_ as TrkCopier
 
 from Configurables import Jug__Digi__ExampleCaloDigi as ExampleCaloDigi
-from Configurables import Jug__Digi__UFSDTrackerDigi as UFSDTrackerDigi
+from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi
 from Configurables import Jug__Digi__EMCalorimeterDigi as EMCalorimeterDigi
 
 from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitReconstruction
@@ -47,7 +47,7 @@ from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
 
 
 podioinput = PodioInput("PodioReader", 
-                        collections=["mcparticles","TrackerEndcapHits","TrackerBarrelHits","EcalBarrelHits"])#, OutputLevel=DEBUG)"SiVertexBarrelHits",
+                        collections=["mcparticles","TrackerEndcapHits","TrackerBarrelHits","VertexBarrelHits","VertexEndcapHits","EcalBarrelHits"])#, OutputLevel=DEBUG)
 
 ## copiers to get around input --> output copy bug. Note the "2" appended to the output collection.
 copier = MCCopier("MCCopier", 
@@ -61,20 +61,23 @@ ecal_digi = EMCalorimeterDigi("ecal_digi",
         inputHitCollection="EcalBarrelHits", 
         outputHitCollection="RawEcalBarrelHits")
 
-ufsd_digi = UFSDTrackerDigi("ufsd_digi", 
+trk_b_digi = TrackerDigi("trk_b_digi", 
         inputHitCollection="TrackerBarrelHits",
         outputHitCollection="TrackerBarrelRawHits",
         timeResolution=8)
-ufsd_digi2 = UFSDTrackerDigi("ufsd_digi2", 
+trk_ec_digi = TrackerDigi("trk_ec_digi", 
         inputHitCollection="TrackerEndcapHits",
         outputHitCollection="TrackerEndcapRawHits",
         timeResolution=8)
 
-#vtx_digi = UFSDTrackerDigi("vtx_digi", 
-#        inputHitCollection="SiVertexBarrelHits",
-#        outputHitCollection="SiVertexBarrelRawHits",
-#        timeResolution=8)
-
+vtx_b_digi = UFSDTrackerDigi("vtx_b_digi", 
+        inputHitCollection="VertexBarrelHits",
+        outputHitCollection="VertexBarrelRawHits",
+        timeResolution=8)
+vtx_ec_digi = UFSDTrackerDigi("vtx_ec_digi", 
+        inputHitCollection="VertexEndcapHits",
+        outputHitCollection="VertexEndcapRawHits",
+        timeResolution=8)
 
 ecal_reco = EMCalReconstruction("ecal_reco", 
         inputHitCollection="RawEcalBarrelHits", 
@@ -90,32 +93,36 @@ simple_cluster = SimpleClustering("simple_cluster",
         OutputLevel=WARNING)
 
 # Tracker and vertex reconstruction
-trk_barrel_reco = TrackerHitReconstruction("trk_barrel_reco",
-        inputHitCollection = ufsd_digi.outputHitCollection,
+trk_b_reco = TrackerHitReconstruction("trk_b_reco",
+        inputHitCollection = trk_b_digi.outputHitCollection,
         outputHitCollection="TrackerBarrelRecHits")
 
-trk_endcap_reco = TrackerHitReconstruction("trk_endcap_reco",
-        inputHitCollection = ufsd_digi2.outputHitCollection,
+trk_ec_reco = TrackerHitReconstruction("trk_ec_reco",
+        inputHitCollection = trk_ec_digi.outputHitCollection,
         outputHitCollection="TrackerEndcapRecHits")
 
-#vtx_barrel_reco = TrackerHitReconstruction("vtx_barrel_reco",
-#        inputHitCollection = vtx_digi.outputHitCollection,
-#        outputHitCollection="VertexBarrelRecHits")
+vtx_b_reco = TrackerHitReconstruction("vtx_b_digi",
+        inputHitCollection = vtx_b_digi.outputHitCollection,
+        outputHitCollection="VertexBarrelRecHits")
+
+vtx_ec_reco = TrackerHitReconstruction("vtx_ec_digi",
+        inputHitCollection = vtx_ec_digi.outputHitCollection,
+        outputHitCollection="VertexEndcapRecHits")
 
 # Hit Source linker 
 sourcelinker = TrackerSourceLinker("sourcelinker",
-        inputHitCollection="TrackerBarrelRecHits",
+        inputHitCollection=trk_b_reco.outputHitCollection,
         outputSourceLinks="BarrelTrackSourceLinks",
         outputMeasurements="BarrelTrackMeasurements",
         OutputLevel=DEBUG)
 
-#trk_hits_srclnkr = TrackerSourcesLinker("trk_srcslnkr",
-#        ITrackerBarrelHits = "TrackerBarrelRecHits",
-#        ITrackerEndcapHits = "TrackerEndcapRecHits",
-#        OTrackerBarrelHits = "TrackerBarrelRecHits",
-#        OTrackerEndcapHits = "TrackerEndcapRecHits",
-#        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",