First Round of Phase 1 Tracking changes for Heavy Ions

RecoHI/Configuration/python/Reconstruction_HI_cff.py

@@ -49,6 +49,11 @@
                               * hcalnoise
                               * muonRecoHighLevelPbPb
                               )
+globalRecoPbPb_wPhase1 = globalRecoPbPb.copy()
+globalRecoPbPb_wPhase1.replace(hiTracking_wSplitting, hiTracking_wSplitting_Phase1)
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toReplaceWith(globalRecoPbPb, globalRecoPbPb_wPhase1)
+
 
 globalRecoPbPb_wConformalPixel = cms.Sequence(hiTracking_wConformalPixel
                                               * hiParticleFlowLocalReco

RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py

@@ -29,13 +29,19 @@
 from RecoTracker.IterativeTracking.DetachedTripletStep_cff import *
 
 # NEW CLUSTERS (remove previously used clusters)
-hiRegitMuDetachedTripletStepClusters = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepClusters.clone(
-    trajectories          = cms.InputTag("hiRegitMuPixelLessStepTracks"),
-    overrideTrkQuals      = cms.InputTag('hiRegitMuPixelLessStepSelector','hiRegitMuPixelLessStep'),
-    trackClassifier       = cms.InputTag(''),
-    TrackQuality          = cms.string('tight')
+from RecoLocalTracker.SubCollectionProducers.trackClusterRemover_cfi import trackClusterRemover as _trackClusterRemover
+hiRegitMuDetachedTripletStepClusters = _trackClusterRemover.clone(
+    maxChi2                                  = 9.0,
+    pixelClusters                            = "siPixelClusters",
+    stripClusters                            = "siStripClusters",
+    trajectories          		     = cms.InputTag("hiRegitMuPixelLessStepTracks"),
+    overrideTrkQuals      		     = cms.InputTag('hiRegitMuPixelLessStepSelector','hiRegitMuPixelLessStep'),
+    TrackQuality                             = 'tight',
+    trackClassifier       		     = cms.InputTag(''),
+    minNumberOfLayersWithMeasBeforeFiltering = 0
 )
 
+
 # SEEDING LAYERS
 hiRegitMuDetachedTripletStepSeedLayers =  RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepSeedLayers.clone()
 hiRegitMuDetachedTripletStepSeedLayers.BPix.skipClusters = cms.InputTag('hiRegitMuDetachedTripletStepClusters')
@@ -111,7 +117,29 @@
             )
         ) #end of vpset
     )
-
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiRegitMuDetachedTripletStepSelector, useAnyMVA = cms.bool(False))
+trackingPhase1.toModify(hiRegitMuDetachedTripletStepSelector, trackSelectors= cms.VPSet(
+        RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
+           name = 'hiRegitMuDetachedTripletStepLoose',
+           min_nhits = cms.uint32(8)
+            ),
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+            name = 'hiRegitMuDetachedTripletStepTight',
+            preFilterName = 'hiRegitMuDetachedTripletStepLoose',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.2)
+            ),
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+            name = 'hiRegitMuDetachedTripletStep',
+            preFilterName = 'hiRegitMuDetachedTripletStepTight',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.09)
+            )
+        )
+)
 
 hiRegitMuonDetachedTripletStep = cms.Sequence(hiRegitMuDetachedTripletStepClusters*
                                               hiRegitMuDetachedTripletStepSeedLayers*

RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py

@@ -33,8 +33,11 @@
 hiRegitMuInitialStepHitDoublets = RecoTracker.IterativeTracking.InitialStep_cff.initialStepHitDoublets.clone(
     seedingLayers = "hiRegitMuInitialStepSeedLayers",
     trackingRegions = "hiRegitMuInitialStepTrackingRegions",
-    clusterCheck = "hiRegitMuClusterCheck",
+    clusterCheck = "hiRegitMuClusterCheck"
 )
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiRegitMuInitialStepHitDoublets, layerPairs = [0])
+
 hiRegitMuInitialStepHitTriplets = RecoTracker.IterativeTracking.InitialStep_cff.initialStepHitTriplets.clone(
     doublets = "hiRegitMuInitialStepHitDoublets"
 )
@@ -104,6 +107,29 @@
             ),
         ) #end of vpset
     )
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiRegitMuInitialStepSelector, useAnyMVA = cms.bool(False))
+trackingPhase1.toModify(hiRegitMuInitialStepSelector, trackSelectors= cms.VPSet(
+        RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
+           name = 'hiRegitMuInitialStepLoose',
+           min_nhits = cms.uint32(8)
+            ), #end of pset
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+            name = 'hiRegitMuInitialStepTight',
+            preFilterName = 'hiRegitMuInitialStepLoose',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.38)
+            ),
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+            name = 'hiRegitMuInitialStep',
+            preFilterName = 'hiRegitMuInitialStepTight',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.77)
+            ),
+        )
+)
 
 hiRegitMuonInitialStep = cms.Sequence(hiRegitMuInitialStepSeedLayers*
                                       hiRegitMuInitialStepTrackingRegions*

RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py

@@ -149,6 +149,29 @@
             )
         ) #end of vpset
     ) #end of clone
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiRegitMuMixedTripletStepSelector, useAnyMVA = cms.bool(False))
+trackingPhase1.toModify(hiRegitMuMixedTripletStepSelector, trackSelectors= cms.VPSet(
+        RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
+           name = 'hiRegitMuMixedTripletStepLoose',
+           min_nhits = cms.uint32(8)
+            ),
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+            name = 'hiRegitMuMixedTripletStepTight',
+            preFilterName = 'hiRegitMuMixedTripletStepLoose',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.2)
+            ),
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+            name = 'hiRegitMuMixedTripletStep',
+            preFilterName = 'hiRegitMuMixedTripletStepTight',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.09)
+            )
+        ) #end of vpset
+)
 
 hiRegitMuonMixedTripletStep = cms.Sequence(hiRegitMuMixedTripletStepClusters*
                                          hiRegitMuMixedTripletStepSeedLayersA*

RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py

@@ -117,6 +117,29 @@
             ),
         ) #end of vpset
 )
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiRegitMuPixelLessStepSelector, useAnyMVA = cms.bool(False))
+trackingPhase1.toModify(hiRegitMuPixelLessStepSelector, trackSelectors= cms.VPSet(
+        RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
+           name = 'hiRegitMuPixelLessStepLoose',
+           min_nhits = cms.uint32(8)
+            ),
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+            name = 'hiRegitMuPixelLessStepTight',
+            preFilterName = 'hiRegitMuPixelLessStepLoose',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.2)
+            ),
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+            name = 'hiRegitMuPixelLessStep',
+            preFilterName = 'hiRegitMuPixelLessStepTight',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.09)
+            ),
+        ) #end of vpset
+)
 
 hiRegitMuonPixelLessStep = cms.Sequence(hiRegitMuPixelLessStepClusters*
                                         hiRegitMuPixelLessStepSeedLayers*

RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py

@@ -120,6 +120,29 @@
             ),
         ) #end of vpset
 )
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiRegitMuPixelPairStepSelector, useAnyMVA = cms.bool(False))
+trackingPhase1.toModify(hiRegitMuPixelPairStepSelector, trackSelectors= cms.VPSet(
+        RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
+           name = 'hiRegitMuPixelPairStepLoose',
+           min_nhits = cms.uint32(8)
+            ), #end of pset
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+            name = 'hiRegitMuPixelPairStepTight',
+            preFilterName = 'hiRegitMuPixelPairStepLoose',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.58)
+            ),
+        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+            name = 'hiRegitMuPixelPairStep',
+            preFilterName = 'hiRegitMuPixelPairStepTight',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(0.77)
+            ),
+        ) #end of vpset
+)
 
 hiRegitMuonPixelPairStep = cms.Sequence(hiRegitMuPixelPairStepClusters*
                                         hiRegitMuPixelPairStepSeedLayers*

RecoHI/HiMuonAlgos/python/HiRegitMuonSeededStep_cff.py

@@ -94,6 +94,29 @@
             ),
          ) #end of vpset
       ) #end of clone
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiRegitMuonSeededTracksInOutSelector, useAnyMVA = cms.bool(False))
+trackingPhase1.toModify(hiRegitMuonSeededTracksInOutSelector, trackSelectors= cms.VPSet(
+         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
+            name = 'hiRegitMuonSeededTracksInOutLoose',
+            min_nhits = cms.uint32(8)
+            ),
+         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+            name = 'hiRegitMuonSeededTracksInOutTight',
+            preFilterName = 'hiRegitMuonSeededTracksInOutLoose',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.2)
+            ),
+         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+            name = 'hiRegitMuonSeededTracksInOutHighPurity',
+            preFilterName = 'hiRegitMuonSeededTracksInOutTight',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.09)
+            ),
+         ) #end of vpset
+)
 
 hiRegitMuonSeededTracksOutInSelector = RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiMultiTrackSelector.clone(
       src='hiRegitMuonSeededTracksOutIn',
@@ -122,6 +145,29 @@
             ),
          ) #end of vpset
       ) #end of clone
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiRegitMuonSeededTracksOutInSelector, useAnyMVA = cms.bool(False))
+trackingPhase1.toModify(hiRegitMuonSeededTracksOutInSelector, trackSelectors= cms.VPSet(
+         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
+            name = 'hiRegitMuonSeededTracksOutInLoose',
+            min_nhits = cms.uint32(8)
+            ),
+         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+            name = 'hiRegitMuonSeededTracksOutInTight',
+            preFilterName = 'hiRegitMuonSeededTracksOutInLoose',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.2)
+            ),
+         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+            name = 'hiRegitMuonSeededTracksOutInHighPurity',
+            preFilterName = 'hiRegitMuonSeededTracksOutInTight',
+            min_nhits = cms.uint32(8),
+            useMVA = cms.bool(False),
+            minMVA = cms.double(-0.09)
+            ),
+         ) #end of vpset
+)
 
 hiRegitMuonSeededStepCore = cms.Sequence(
       hiRegitMuonSeededSeedsInOut + hiRegitMuonSeededTrackCandidatesInOut + hiRegitMuonSeededTracksInOut +

RecoHI/HiTracking/python/HIPixel3PrimTracks_cfi.py

@@ -2,13 +2,20 @@
 
 from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer
 from RecoPixelVertexing.PixelTriplets.pixelTripletHLTEDProducer_cfi import pixelTripletHLTEDProducer as _pixelTripletHLTEDProducer
+from RecoPixelVertexing.PixelTriplets.pixelQuadrupletEDProducer_cfi import pixelQuadrupletEDProducer as _pixelQuadrupletEDProducer
+from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import *
 from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeHitFilterESProducer_cfi import *
 from RecoPixelVertexing.PixelLowPtUtilities.trackCleaner_cfi import *
 from RecoPixelVertexing.PixelTrackFitting.pixelFitterByHelixProjections_cfi import *
 from RecoHI.HiTracking.HIPixelTrackFilter_cff import *
 from RecoHI.HiTracking.HITrackingRegionProducer_cfi import *
 from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
 
+#from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import *
+
+hiPixelLayerQuadruplets = PixelLayerTriplets.clone()
+hiPixelLayerQuadruplets.layerList = PixelSeedMergerQuadruplets.layerList
+
 # Hit ntuplets
 hiPixel3PrimTracksHitDoublets = _hitPairEDProducer.clone(
     clusterCheck = "",
@@ -17,13 +24,38 @@
     maxElement = 0,
     produceIntermediateHitDoublets = True,
 )
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiPixel3PrimTracksHitDoublets,
+    seedingLayers = "hiPixelLayerQuadruplets"
+)
+
 
 hiPixel3PrimTracksHitTriplets = _pixelTripletHLTEDProducer.clone(
     doublets = "hiPixel3PrimTracksHitDoublets",
     maxElement = 1000000, # increase threshold for triplets in generation step (default: 100000)
     produceSeedingHitSets = True,
+    produceIntermediateHitTriplets = True,
 )
 
+from RecoPixelVertexing.PixelTriplets.caHitQuadrupletEDProducer_cfi import caHitQuadrupletEDProducer as _caHitQuadrupletEDProducer
+hiPixel3PrimTracksHitDoubletsCA = hiPixel3PrimTracksHitDoublets.clone()
+hiPixel3PrimTracksHitDoubletsCA.layerPairs = [0,1,2]
+
+hiPixel3PrimTracksHitQuadrupletsCA = _caHitQuadrupletEDProducer.clone(
+    doublets = "hiPixel3PrimTracksHitDoubletsCA",
+    extraHitRPhitolerance = hiPixel3PrimTracksHitTriplets.extraHitRPhitolerance,
+    SeedComparitorPSet = hiPixel3PrimTracksHitTriplets.SeedComparitorPSet,
+    maxChi2 = dict(
+        pt1    = 0.7, pt2    = 2,
+        value1 = 200, value2 = 50,
+    ),
+    useBendingCorrection = True,
+    fitFastCircle = True,
+    fitFastCircleChi2Cut = True,
+    CAThetaCut = 0.0012,
+    CAPhiCut = 0.2,
+) 
+
 # Pixel tracks
 hiPixel3PrimTracks = cms.EDProducer("PixelTrackProducer",
 
@@ -41,6 +73,9 @@
     # Cleaner
     Cleaner = cms.string("trackCleaner")
 )
+trackingPhase1.toModify(hiPixel3PrimTracks,
+    SeedingHitSets = cms.InputTag("hiPixel3PrimTracksHitQuadrupletsCA"),
+)
 
 hiPixel3PrimTracksSequence = cms.Sequence(
     hiTrackingRegionWithVertex +
@@ -50,3 +85,9 @@
     hiFilter +
     hiPixel3PrimTracks
 )
+
+#phase 1 changes
+hiPixel3PrimTracksSequence_Phase1 = hiPixel3PrimTracksSequence.copy()
+hiPixel3PrimTracksSequence_Phase1.replace(hiPixel3PrimTracksHitDoublets,hiPixelLayerQuadruplets+hiPixel3PrimTracksHitDoubletsCA)
+hiPixel3PrimTracksSequence_Phase1.replace(hiPixel3PrimTracksHitTriplets,hiPixel3PrimTracksHitQuadrupletsCA)
+trackingPhase1.toReplaceWith(hiPixel3PrimTracksSequence,hiPixel3PrimTracksSequence_Phase1)

RecoHI/HiTracking/python/HISelectedTracks_cfi.py

@@ -28,6 +28,27 @@
     ),
     ) #end of vpset
     ) #end of clone  
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+trackingPhase1.toModify(hiInitialStepSelector, useAnyMVA = cms.bool(False))
+trackingPhase1.toModify(hiInitialStepSelector, trackSelectors= cms.VPSet(
+    RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiLooseMTS.clone(
+    name = 'hiInitialStepLoose',
+    useMVA = cms.bool(False)
+    ), #end of pset
+    RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+    name = 'hiInitialStepTight',
+    preFilterName = 'hiInitialStepLoose',
+    useMVA = cms.bool(False),
+    minMVA = cms.double(-0.77)
+    ),
+    RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+    name = 'hiInitialStep',
+    preFilterName = 'hiInitialStepTight',
+    useMVA = cms.bool(False),
+    minMVA = cms.double(-0.77)
+    ),
+    ) #end of vpset
+)