Adding genfit tracking benchmarks

benchmarks/track_finding/options/track_reconstruction.py

@@ -35,7 +35,9 @@ from Configurables import Jug__Reco__TrackParamClusterInit as TrackParamClusterI
 from Configurables import Jug__Reco__TrackParamVertexClusterInit as TrackParamVertexClusterInit
 
 from Configurables import Jug__Reco__ConformalXYPeakProtoTracks as ConformalXYPeakProtoTracks
-from Configurables import Jug__Reco__TrackFindingAlgorithm as TrackFindingAlgorithm
+from Configurables import Jug__Reco__ProtoTrackMatching as ProtoTrackMatching
+from Configurables import Jug__Reco__GenFitTrackFitter as GenFitTrackFitter
+#from Configurables import Jug__Reco__TrackFindingAlgorithm as TrackFindingAlgorithm
 from Configurables import Jug__Reco__ParticlesFromTrackFit as ParticlesFromTrackFit
 
 from Configurables import Jug__Reco__SimpleClustering as SimpleClustering
@@ -115,11 +117,12 @@ algorithms.append(gem_ec_reco)
 
 trk_hit_col = TrackingHitsCollector("trk_hit_col",
         inputTrackingHits=[
-            str(trk_b_reco.outputHitCollection),
-            str(trk_ec_reco.outputHitCollection),
             str(vtx_b_reco.outputHitCollection),
             str(vtx_ec_reco.outputHitCollection),
-            str(gem_ec_reco.outputHitCollection) ],
+            str(trk_b_reco.outputHitCollection),
+            str(trk_ec_reco.outputHitCollection),
+            str(gem_ec_reco.outputHitCollection) 
+            ],
         trackingHits="trackingHits",
         OutputLevel=DEBUG)
 algorithms.append( trk_hit_col )
@@ -129,7 +132,7 @@ conformal_find = ConformalXYPeakProtoTracks("conformal_find",
         inputTrackerHits=trk_hit_col.trackingHits,
         outputProtoTracks="outputProtoTracks",
         nProtoTracks="nProtoTracks",
-        nPhiBins=90,
+        nPhiBins=60,
         OutputLevel=DEBUG)
 algorithms.append( conformal_find )
 
@@ -147,21 +150,31 @@ truth_trk_init = TrackParamTruthInit("truth_trk_init",
         #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)
-algorithms.append( trk_find_alg )
+proto_matching = ProtoTrackMatching("proto_matching",
+        inputTrackerHits       = trk_hit_col.trackingHits,
+        inputProtoTracks       = conformal_find.outputProtoTracks,
+        initialTrackParameters = truth_trk_init.outputInitialTrackParameters,
+        matchedProtoTracks      = "matchedProtoTracks",
+        OutputLevel=DEBUG)
+algorithms.append( proto_matching )
 
-parts_from_fit = ParticlesFromTrackFit("parts_from_fit",
-        inputTrajectories="trajectories",
-        outputParticles="ReconstructedParticles",
-        outputTrackParameters="outputTrackParameters")
-        #OutputLevel=DEBUG)
-algorithms.append( parts_from_fit )
+
+# Tracking algorithms
+genfit_alg = GenFitTrackFitter("genfit_alg",
+        inputHitCollection = trk_hit_col.trackingHits,
+        initialTrackParameters= "InitTrackParams",
+        inputProtoTracks  = proto_matching.matchedProtoTracks,
+        trackParameters="trackParameters",
+        outputTrajectories="trajectories",
+        OutputLevel=DEBUG)
+algorithms.append( genfit_alg )
+
+#parts_from_fit = ParticlesFromTrackFit("parts_from_fit",
+#        inputTrajectories="trajectories",
+#        outputParticles="ReconstructedParticles",
+#        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