Enable mkFit for initialStepPreSplitting with trackingMkFit modifier

Configuration/ProcessModifiers/python/trackingMkFitInitialStepPreSplitting_cff.py

@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier sets replaces the default pattern recognition with mkFit for initialStep
+trackingMkFitInitialStepPreSplitting = cms.Modifier()

Configuration/ProcessModifiers/python/trackingMkFit_cff.py

@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.ProcessModifiers.trackingMkFitCommon_cff import *
+from Configuration.ProcessModifiers.trackingMkFitInitialStepPreSplitting_cff import *
 from Configuration.ProcessModifiers.trackingMkFitInitialStep_cff import *
 from Configuration.ProcessModifiers.trackingMkFitLowPtQuadStep_cff import *
 from Configuration.ProcessModifiers.trackingMkFitHighPtTripletStep_cff import *
@@ -14,6 +15,7 @@
 # Use mkFit in selected iterations
 trackingMkFit = cms.ModifierChain(
     trackingMkFitCommon,
+    trackingMkFitInitialStepPreSplitting,
     trackingMkFitInitialStep,
     trackingMkFitLowPtQuadStep,
     trackingMkFitHighPtTripletStep,

RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py

@@ -125,6 +125,44 @@
 )
 initialStepTrackCandidatesPreSplitting.MeasurementTrackerEvent = 'MeasurementTrackerEventPreSplitting'
 
+from Configuration.ProcessModifiers.trackingMkFitInitialStepPreSplitting_cff import trackingMkFitInitialStepPreSplitting
+from RecoTracker.MkFit.mkFitGeometryESProducer_cfi import mkFitGeometryESProducer
+import RecoTracker.MkFit.mkFitSiPixelHitConverter_cfi as _mkFitSiPixelHitConverter_cfi
+import RecoTracker.MkFit.mkFitSiStripHitConverter_cfi as _mkFitSiStripHitConverter_cfi
+import RecoTracker.MkFit.mkFitEventOfHitsProducer_cfi as _mkFitEventOfHitsProducer_cfi
+import RecoTracker.MkFit.mkFitSeedConverter_cfi as _mkFitSeedConverter_cfi
+import RecoTracker.MkFit.mkFitIterationConfigESProducer_cfi as _mkFitIterationConfigESProducer_cfi
+import RecoTracker.MkFit.mkFitProducer_cfi as _mkFitProducer_cfi
+import RecoTracker.MkFit.mkFitOutputConverter_cfi as _mkFitOutputConverter_cfi
+mkFitSiPixelHitsPreSplitting = _mkFitSiPixelHitConverter_cfi.mkFitSiPixelHitConverter.clone(
+    hits = 'siPixelRecHitsPreSplitting'
+)
+mkFitSiStripHits = _mkFitSiStripHitConverter_cfi.mkFitSiStripHitConverter.clone() # TODO: figure out better place for this module?
+mkFitEventOfHitsPreSplitting = _mkFitEventOfHitsProducer_cfi.mkFitEventOfHitsProducer.clone(
+    pixelHits = 'mkFitSiPixelHitsPreSplitting'
+)
+initialStepTrackCandidatesMkFitSeedsPreSplitting = _mkFitSeedConverter_cfi.mkFitSeedConverter.clone(
+    seeds = 'initialStepSeedsPreSplitting',
+)
+# TODO: or try to re-use the ESProducer of initialStep?
+initialStepTrackCandidatesMkFitConfigPreSplitting = _mkFitIterationConfigESProducer_cfi.mkFitIterationConfigESProducer.clone(
+    ComponentName = 'initialStepTrackCandidatesMkFitConfigPreSplitting',
+    config = 'RecoTracker/MkFit/data/mkfit-phase1-initialStep.json',
+)
+initialStepTrackCandidatesMkFitPreSplitting = _mkFitProducer_cfi.mkFitProducer.clone(
+    pixelHits = 'mkFitSiPixelHitsPreSplitting',
+    eventOfHits = 'mkFitEventOfHitsPreSplitting',
+    seeds = 'initialStepTrackCandidatesMkFitSeedsPreSplitting',
+    config = ('', 'initialStepTrackCandidatesMkFitConfigPreSplitting'),
+)
+trackingMkFitInitialStepPreSplitting.toReplaceWith(initialStepTrackCandidatesPreSplitting, _mkFitOutputConverter_cfi.mkFitOutputConverter.clone(
+    mkFitPixelHits = 'mkFitSiPixelHitsPreSplitting',
+    mkFitEventOfHits = 'mkFitEventOfHitsPreSplitting',
+    seeds = 'initialStepSeedsPreSplitting',
+    mkFitSeeds = 'initialStepTrackCandidatesMkFitSeedsPreSplitting',
+    tracks = 'initialStepTrackCandidatesMkFitPreSplitting',
+))
+
 # fitting
 import RecoTracker.TrackProducer.TrackProducer_cfi
 initialStepTracksPreSplitting = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
@@ -195,6 +233,10 @@
 _InitialStepPreSplittingTask_trackingPhase1.replace(initialStepHitTripletsPreSplitting, cms.Task(initialStepHitTripletsPreSplitting,initialStepHitQuadrupletsPreSplitting))
 trackingPhase1.toReplaceWith(InitialStepPreSplittingTask, _InitialStepPreSplittingTask_trackingPhase1.copyAndExclude([initialStepHitTripletsPreSplitting]))
 
+_InitialStepPreSplittingTask_trackingMkFit = InitialStepPreSplittingTask.copy()
+_InitialStepPreSplittingTask_trackingMkFit.add(mkFitSiPixelHitsPreSplitting, mkFitSiStripHits, mkFitEventOfHitsPreSplitting, initialStepTrackCandidatesMkFitSeedsPreSplitting, initialStepTrackCandidatesMkFitPreSplitting, initialStepTrackCandidatesMkFitConfigPreSplitting)
+trackingMkFitInitialStepPreSplitting.toReplaceWith(InitialStepPreSplittingTask, _InitialStepPreSplittingTask_trackingMkFit)
+
 
 # Although InitialStepPreSplitting is not really part of LowPU/Run1/Phase2PU140
 # tracking, we use it to get siPixelClusters and siPixelRecHits

RecoTracker/IterativeTracking/python/InitialStep_cff.py

@@ -233,7 +233,6 @@
 import RecoTracker.MkFit.mkFitProducer_cfi as mkFitProducer_cfi
 import RecoTracker.MkFit.mkFitOutputConverter_cfi as mkFitOutputConverter_cfi
 mkFitSiPixelHits = mkFitSiPixelHitConverter_cfi.mkFitSiPixelHitConverter.clone() # TODO: figure out better place for this module?
-mkFitSiStripHits = mkFitSiStripHitConverter_cfi.mkFitSiStripHitConverter.clone() # TODO: figure out better place for this module?
 mkFitEventOfHits = mkFitEventOfHitsProducer_cfi.mkFitEventOfHitsProducer.clone() # TODO: figure out better place for this module?
 initialStepTrackCandidatesMkFitSeeds = mkFitSeedConverter_cfi.mkFitSeedConverter.clone(
     seeds = 'initialStepSeeds',
@@ -428,7 +427,7 @@
 
 from Configuration.ProcessModifiers.trackingMkFitCommon_cff import trackingMkFitCommon
 _InitialStepTask_trackingMkFitCommon = InitialStepTask.copy()
-_InitialStepTask_trackingMkFitCommon.add(mkFitSiPixelHits, mkFitSiStripHits, mkFitEventOfHits, mkFitGeometryESProducer)
+_InitialStepTask_trackingMkFitCommon.add(mkFitSiPixelHits, mkFitEventOfHits, mkFitGeometryESProducer)
 trackingMkFitCommon.toReplaceWith(InitialStepTask, _InitialStepTask_trackingMkFitCommon)
 
 _InitialStepTask_trackingMkFit = InitialStepTask.copy()

RecoTracker/MkFit/plugins/MkFitOutputConverter.cc

@@ -27,7 +27,7 @@
 #include "TrackingTools/TrackFitters/interface/KFTrajectoryFitter.h"
 #include "RecoTracker/TransientTrackingRecHit/interface/TkClonerImpl.h"
 #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
-#include "TrackingTools/MaterialEffects/src/PropagatorWithMaterial.cc"
+#include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h"
 
 #include "RecoTracker/MkFit/interface/MkFitEventOfHits.h"
 #include "RecoTracker/MkFit/interface/MkFitClusterIndexToHit.h"

Validation/RecoTrack/python/plotting/trackingPlots.py

@@ -1456,7 +1456,9 @@ def modules(self):
                        "initialStepHitTripletsPreSplitting",
                        "initialStepHitQuadrupletsPreSplitting",
                        "initialStepSeedsPreSplitting"],
-              building=["initialStepTrackCandidatesPreSplitting"],
+              building=["initialStepTrackCandidatesPreSplitting"
+                        "initialStepTrackCandidatesMkFitSeedsPreSplitting",
+                        "initialStepTrackCandidatesMkFitPreSplitting"],
               fit=["initialStepTracksPreSplitting"],
               other=["firstStepPrimaryVerticesPreSplitting",
                      "initialStepTrackRefsForJetsPreSplitting",
@@ -1466,7 +1468,10 @@ def modules(self):
                      "siPixelClusters",
                      "siPixelRecHits",
                      "MeasurementTrackerEvent",
-                     "siPixelClusterShapeCache"]),
+                     "siPixelClusterShapeCache",
+                     "mkFitSiPixelHitsPreSplitting",
+                     "mkFitSiStripHits",
+                     "mkFitEventOfHitsPreSplitting"]),
     Iteration("initialStep", clusterMasking=[],
               selection=["initialStepClassifier1",
                          "initialStepClassifier2",
@@ -1479,7 +1484,6 @@ def modules(self):
                      "ak4CaloJetsForTrk",
                      "firstStepPrimaryVertices",
                      "mkFitSiPixelHits",
-                     "mkFitSiStripHits",
                      "mkFitEventOfHits"]),
     Iteration("highPtTripletStep",
               selection=["highPtTripletStepClassifier1",