Addition of pixel Tracking in HI pp_on_AA_2018 era

Configuration/StandardSequences/python/Reconstruction_cff.py

@@ -158,6 +158,11 @@
 _highlevelreco_HI += hiClusterCompatibility
 pp_on_XeXe_2017.toReplaceWith(highlevelreco, _highlevelreco_HI)
 
+from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+from RecoHI.HiTracking.HILowPtConformalPixelTracks_cfi import *
+_highlevelreco_HI_wPixTracks = highlevelreco.copy()
+pp_on_AA_2018.toReplaceWith(highlevelreco, cms.Sequence(_highlevelreco_HI_wPixTracks* hiConformalPixelTracksSequencePhase1))
+
 # not commisoned and not relevant in FastSim (?):
 _fastSim_highlevelreco = highlevelreco.copyAndExclude([cosmicDCTracksSeq,muoncosmichighlevelreco])
 fastSim.toReplaceWith(highlevelreco,_fastSim_highlevelreco)

RecoHI/HiTracking/python/HILowPtConformalPixelTracks_cfi.py

@@ -41,6 +41,92 @@
                                         Cleaner = cms.string("trackCleaner")
                                         )
 
+
+
+
+
+###Pixel Tracking -  PhaseI geometry
+
+#Tracking regions - use PV from pp tracking
+from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cfi import globalTrackingRegionWithVertices
+hiConformalPixelTracksPhase1TrackingRegions = globalTrackingRegionWithVertices.clone(RegionPSet=dict(
+    precise = True,
+    useMultipleScattering = False,
+    useFakeVertices       = False,
+    beamSpot = "offlineBeamSpot",
+    useFixedError = True,
+    nSigmaZ = 3.0,
+    sigmaZVertex = 3.0,
+    fixedError = 0.2,
+    VertexCollection = "offlinePrimaryVertices",
+    ptMin = 0.3,
+    useFoundVertices = True,
+    originRadius = 0.2 
+))
+
+# SEEDING LAYERS
+# Using 4 layers layerlist
+from RecoTracker.IterativeTracking.LowPtQuadStep_cff import lowPtQuadStepSeedLayers
+hiConformalPixelTracksPhase1SeedLayers = lowPtQuadStepSeedLayers.clone()
+hiConformalPixelTracksPhase1SeedLayers.BPix = cms.PSet( 
+         HitProducer = cms.string('siPixelRecHits'),
+         TTRHBuilder = cms.string('WithTrackAngle'),
+)
+hiConformalPixelTracksPhase1SeedLayers.FPix = cms.PSet( 
+         HitProducer = cms.string('siPixelRecHits'),
+         TTRHBuilder = cms.string('WithTrackAngle'),
+)
+
+
+# Hit ntuplets
+from RecoTracker.IterativeTracking.LowPtQuadStep_cff import lowPtQuadStepHitDoublets
+hiConformalPixelTracksPhase1HitDoubletsCA = lowPtQuadStepHitDoublets.clone(
+        seedingLayers = "hiConformalPixelTracksPhase1SeedLayers",
+        trackingRegions = "hiConformalPixelTracksPhase1TrackingRegions"
+)
+
+
+from RecoTracker.IterativeTracking.LowPtQuadStep_cff import lowPtQuadStepHitQuadruplets
+hiConformalPixelTracksPhase1HitQuadrupletsCA = lowPtQuadStepHitQuadruplets.clone(
+	doublets = "hiConformalPixelTracksPhase1HitDoubletsCA",
+        CAPhiCut = 0.2,
+        CAThetaCut = 0.0012,
+	SeedComparitorPSet = cms.PSet( 
+           ComponentName = cms.string('none')
+        ),
+        extraHitRPhitolerance = 0.032,
+        maxChi2 = cms.PSet(
+           enabled = cms.bool(True),
+           pt1 = cms.double(0.7),
+           pt2 = cms.double(2),
+           value1 = cms.double(200),
+           value2 = cms.double(50)
+        )
+)
+
+#Filter
+hiConformalPixelTracksPhase1Filter = hiConformalPixelFilter.clone(
+	VertexCollection = "offlinePrimaryVertices",
+        chi2 = 999.9,
+        lipMax = 999.0,
+        nSigmaLipMaxTolerance = 999.9,
+        nSigmaTipMaxTolerance = 999.0,
+        ptMax = 999999,
+        ptMin = 0.30,
+        tipMax = 999.0
+)
+
+from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
+phase1Pixel.toModify(hiConformalPixelTracks,
+    Cleaner = 'pixelTrackCleanerBySharedHits',
+    Filter = "hiConformalPixelTracksPhase1Filter",
+    Fitter = "pixelFitterByConformalMappingAndLine",
+    SeedingHitSets = "hiConformalPixelTracksPhase1HitQuadrupletsCA",
+)
+
+
+
+
 hiConformalPixelTracksSequence = cms.Sequence(
     hiTrackingRegionWithVertex +
     hiConformalPixelTracksHitDoublets +
@@ -49,3 +135,14 @@
     hiConformalPixelFilter +
     hiConformalPixelTracks
 )
+
+hiConformalPixelTracksSequencePhase1 = cms.Sequence(
+    hiConformalPixelTracksPhase1TrackingRegions +
+    hiConformalPixelTracksPhase1SeedLayers +
+    hiConformalPixelTracksPhase1HitDoubletsCA +
+    hiConformalPixelTracksPhase1HitQuadrupletsCA +
+    pixelFitterByConformalMappingAndLine +
+    hiConformalPixelTracksPhase1Filter +
+    hiConformalPixelTracks
+)
+

RecoTracker/Configuration/python/RecoTracker_EventContent_cff.py

@@ -71,3 +71,18 @@
     )
 )
 
+#HI-specific products: needed in AOD, propagate to more inclusive tiers as well
+from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
+for ec in [RecoTrackerAOD.outputCommands, RecoTrackerRECO.outputCommands, RecoTrackerFEVT.outputCommands]:
+      pp_on_AA_2018.toModify( ec, 
+                        func=lambda outputCommands: outputCommands.extend(['keep recoTracks_hiConformalPixelTracks_*_*',
+                                                                           ])
+                        )
+for ec in [RecoTrackerRECO.outputCommands, RecoTrackerFEVT.outputCommands]:
+      pp_on_AA_2018.toModify( ec, 
+                        func=lambda outputCommands: outputCommands.extend([
+			'keep recoTrackExtras_hiConformalPixelTracks_*_*',
+                        'keep TrackingRecHitsOwned_hiConformalPixelTracks_*_*'
+                                                                           ])
+                        )
+

RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py

@@ -31,7 +31,7 @@
 (pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(lowPtQuadStepTrackingRegions, 
                 _globalTrackingRegionWithVertices.clone(RegionPSet=dict(
                     fixedError = 0.5,
-                    ptMin = 0.3,
+                    ptMin = 0.49,
                     originRadius = 0.02
                 )
                                                             )
@@ -108,7 +108,7 @@
 trackingPhase2PU140.toReplaceWith(lowPtQuadStepTrajectoryFilterBase, _lowPtQuadStepTrajectoryFilterBase)
 
 for e in [pp_on_XeXe_2017, pp_on_AA_2018]:
-    e.toModify(lowPtQuadStepTrajectoryFilterBase, minPt=0.3)
+    e.toModify(lowPtQuadStepTrajectoryFilterBase, minPt=0.49)
 
 from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import *
 # Composite filter

RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py

@@ -63,7 +63,7 @@
 (pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(lowPtTripletStepTrackingRegions, 
                 _globalTrackingRegionWithVertices.clone(RegionPSet=dict(
                     useFixedError = False,
-                    ptMin = 0.3,
+                    ptMin = 0.49,
                     originRadius = 0.02
                 )
                                                                       )
@@ -171,7 +171,7 @@
 trackingPhase2PU140.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase)
 
 for e in [pp_on_XeXe_2017, pp_on_AA_2018]:
-    e.toModify(lowPtTripletStepStandardTrajectoryFilter, minPt=0.3)
+    e.toModify(lowPtTripletStepStandardTrajectoryFilter, minPt=0.49)
 
 from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import *
 # Composite filter