Modified tracking

modified: options/tracker_reconstruction.py

benchmarks/tracking/options/tracker_reconstruction.py

@@ -29,6 +29,7 @@ from Configurables import Jug__Digi__UFSDTrackerDigi as TrackerDigi
 from Configurables import Jug__Digi__EMCalorimeterDigi as EMCalorimeterDigi
 
 from Configurables import Jug__Reco__TrackerHitReconstruction as TrackerHitReconstruction
+from Configurables import Jug__Reco__TrackingHitsCollector as TrackingHitsCollector
 
 from Configurables import Jug__Reco__TrackerSourceLinker as TrackerSourceLinker
 from Configurables import Jug__Reco__TrackerSourcesLinker as TrackerSourcesLinker
@@ -44,143 +45,105 @@ from Configurables import Jug__Reco__EMCalReconstruction as EMCalReconstruction
 from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
 
 
+algorithms = [ ]
 
 podioinput = PodioInput("PodioReader", 
-                        collections=["mcparticles","TrackerEndcapHits","TrackerBarrelHits","VertexBarrelHits","VertexEndcapHits","EcalBarrelHits"])#, OutputLevel=DEBUG)
+                        collections=["mcparticles","TrackerEndcapHits","TrackerBarrelHits","VertexBarrelHits","VertexEndcapHits"])#, OutputLevel=DEBUG)
+algorithms.append( podioinput )
 
 ## copiers to get around input --> output copy bug. Note the "2" appended to the output collection.
 copier = MCCopier("MCCopier", 
         inputCollection="mcparticles", 
         outputCollection="mcparticles2") 
+algorithms.append( copier )
+
 trkcopier = TrkCopier("TrkCopier", 
         inputCollection="TrackerBarrelHits", 
         outputCollection="TrackerBarrelHits2") 
-
-ecal_digi = EMCalorimeterDigi("ecal_digi", 
-        inputHitCollection="EcalBarrelHits", 
-        outputHitCollection="RawEcalBarrelHits")
+algorithms.append( trkcopier )
 
 trk_b_digi = TrackerDigi("trk_b_digi", 
         inputHitCollection="TrackerBarrelHits",
         outputHitCollection="TrackerBarrelRawHits",
         timeResolution=8)
+algorithms.append( trk_b_digi )
 trk_ec_digi = TrackerDigi("trk_ec_digi", 
         inputHitCollection="TrackerEndcapHits",
         outputHitCollection="TrackerEndcapRawHits",
         timeResolution=8)
+algorithms.append( trk_ec_digi )
 
 vtx_b_digi = TrackerDigi("vtx_b_digi", 
         inputHitCollection="VertexBarrelHits",
         outputHitCollection="VertexBarrelRawHits",
         timeResolution=8)
+algorithms.append( vtx_b_digi )
 
 vtx_ec_digi = TrackerDigi("vtx_ec_digi", 
         inputHitCollection="VertexEndcapHits",
         outputHitCollection="VertexEndcapRawHits",
         timeResolution=8)
-
-ecal_reco = EMCalReconstruction("ecal_reco", 
-        inputHitCollection="RawEcalBarrelHits", 
-        outputHitCollection="RecEcalBarrelHits",
-        minModuleEdep=0.0*units.MeV,
-        OutputLevel=WARNING)
-
-#simple_cluster = SimpleClustering("simple_cluster", 
-#        inputHitCollection="RecEcalBarrelHits", 
-#        outputClusters="SimpleClusters",
-#        minModuleEdep=1.0*units.MeV,
-#        maxDistance=50.0*units.cm,
-#        OutputLevel=WARNING)
+algorithms.append( vtx_ec_digi )
 
 # Tracker and vertex reconstruction
 trk_b_reco = TrackerHitReconstruction("trk_b_reco",
         inputHitCollection = trk_b_digi.outputHitCollection,
         outputHitCollection="TrackerBarrelRecHits")
+algorithms.append( trk_b_reco )
 
 trk_ec_reco = TrackerHitReconstruction("trk_ec_reco",
         inputHitCollection = trk_ec_digi.outputHitCollection,
         outputHitCollection="TrackerEndcapRecHits")
+algorithms.append( trk_ec_reco )
 
 vtx_b_reco = TrackerHitReconstruction("vtx_b_reco",
         inputHitCollection = vtx_b_digi.outputHitCollection,
         outputHitCollection="VertexBarrelRecHits")
+algorithms.append( vtx_b_reco )
 
 vtx_ec_reco = TrackerHitReconstruction("vtx_ec_reco",
         inputHitCollection = vtx_ec_digi.outputHitCollection,
         outputHitCollection="VertexEndcapRecHits")
+algorithms.append( vtx_ec_reco )
+
+trk_hit_col = TrackingHitsCollector("trk_hit_col",
+        trackerBarrelHits=trk_b_reco.outputHitCollection,
+        trackerEndcapHits=trk_ec_reco.outputHitCollection,
+        vertexBarrelHits=vtx_b_reco.outputHitCollection,
+        vertexEndcapHits=vtx_ec_reco.outputHitCollection,
+        outputHitCollection="trackingHits")
+algorithms.append( trk_hit_col )
 
 # Hit Source linker 
 sourcelinker = TrackerSourceLinker("sourcelinker",
-        inputHitCollection=trk_b_reco.outputHitCollection,
-        outputSourceLinks="BarrelTrackSourceLinks",
-        outputMeasurements="BarrelTrackMeasurements",
+        inputHitCollection=trk_hit_col.outputHitCollection,
+        outputSourceLinks="TrackSourceLinks",
+        outputMeasurements="TrackMeasurements",
         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)
+algorithms.append( sourcelinker )
 
 ## Track param init
 truth_trk_init = TrackParamTruthInit("truth_trk_init",
         inputMCParticles="mcparticles",
-        outputInitialTrackParameters="InitTrackParams",
-        OutputLevel=DEBUG)
-
-#clust_trk_init = TrackParamClusterInit("clust_trk_init",
-#        inputClusters="SimpleClusters",
-#        outputInitialTrackParameters="InitTrackParamsFromClusters",
-#        OutputLevel=DEBUG)
-
-#vtxcluster_trk_init = TrackParamVertexClusterInit("vtxcluster_trk_init",
-#        inputVertexHits="VertexBarrelRecHits",
-#        inputClusters="SimpleClusters",
-#        outputInitialTrackParameters="InitTrackParamsFromVtxClusters",
-#        maxHitRadius=40.0*units.mm,
-#        OutputLevel=WARNING)
+        outputInitialTrackParameters="InitTrackParams")
+        #OutputLevel=DEBUG)
+algorithms.append( truth_trk_init )
 
 # Tracking algorithms
 trk_find_alg = TrackFindingAlgorithm("trk_find_alg",
         inputSourceLinks = sourcelinker.outputSourceLinks,
         inputMeasurements = sourcelinker.outputMeasurements,
         inputInitialTrackParameters= "InitTrackParams",#"InitTrackParamsFromClusters", 
-        outputTrajectories="trajectories",
-        OutputLevel=DEBUG)
+        outputTrajectories="trajectories")
+        #OutputLevel=DEBUG)
+algorithms.append( trk_find_alg )
 
 parts_from_fit = ParticlesFromTrackFit("parts_from_fit",
         inputTrajectories="trajectories",
         outputParticles="ReconstructedParticles",
-        outputTrackParameters="outputTrackParameters",
-        OutputLevel=DEBUG)
-
-#trk_find_alg1 = TrackFindingAlgorithm("trk_find_alg1",
-#        inputSourceLinks = sourcelinker.outputSourceLinks,
-#        inputMeasurements = sourcelinker.outputMeasurements,
-#        inputInitialTrackParameters= "InitTrackParamsFromClusters", 
-#        outputTrajectories="trajectories1",
-#        OutputLevel=DEBUG)
-#
-#parts_from_fit1 = ParticlesFromTrackFit("parts_from_fit1",
-#        inputTrajectories="trajectories1",
-#        outputParticles="ReconstructedParticles1",
-#        outputTrackParameters="outputTrackParameters1",
-#        OutputLevel=DEBUG)
-
-#trk_find_alg2 = TrackFindingAlgorithm("trk_find_alg2",
-#        inputSourceLinks = trk_hits_srclnkr.outputSourceLinks,
-#        inputMeasurements = trk_hits_srclnkr.outputMeasurements,
-#        inputInitialTrackParameters= "InitTrackParamsFromVtxClusters", 
-#        outputTrajectories="trajectories2",
-#        OutputLevel=WARNING)
-#parts_from_fit2 = ParticlesFromTrackFit("parts_from_fit2",
-#        inputTrajectories="trajectories2",
-#        outputParticles="ReconstructedParticles2",
-#        outputTrackParameters="outputTrackParameters2",
-#        OutputLevel=WARNING)
-
+        outputTrackParameters="outputTrackParameters")
+        #OutputLevel=DEBUG)
+algorithms.append( parts_from_fit )
 
 #types = []
 ## this printout is useful to check that the type information is passed to python correctly
@@ -209,21 +172,10 @@ out.outputCommands = ["keep *",
         "drop outputInitialTrackParameters",
         "drop mcparticles"
         ]
+algorithms.append(out)
 
 ApplicationMgr(
-    TopAlg = [podioinput, 
-              copier, trkcopier,
-              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, 
-              sourcelinker, #trk_hits_srclnkr,
-              truth_trk_init, #clust_trk_init, vtxcluster_trk_init, 
-              trk_find_alg, parts_from_fit,
-              #trk_find_alg1, parts_from_fit1,
-              #trk_find_alg2, parts_from_fit2,
-              out
-              ],
+    TopAlg = algorithms,
     EvtSel = 'NONE',
     EvtMax   = n_events,
     ExtSvc = [podioevent,geo_service],