Merge CMSSW_10_5_X into CMSSW_10_5_DEVEL_X.

cms-sw · Feb 16, 2019 · dd05acd · dd05acd
2 parents 5ea2bc4 + a51bf74
commit dd05acd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py
@@ -260,6 +260,7 @@
      src = 'detachedTripletStepTracks',
      qualityCuts = [0.0, 0.4, 0.8],
 ))
+(trackingPhase1 & fastSim).toModify(detachedTripletStep,vertices = "firstStepPrimaryVerticesBeforeMixing")
 
 highBetaStar_2018.toReplaceWith(detachedTripletStep, detachedTripletStepClassifier1.clone(
      qualityCuts = [-0.5,0.0,0.5],

diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py
@@ -297,6 +297,7 @@
 	src = 'initialStepTracks',
 	qualityCuts = [0.0, 0.3, 0.6],
 ))
+(trackingPhase1 & fastSim).toModify(initialStep,vertices = "firstStepPrimaryVerticesBeforeMixing")
 
 pp_on_AA_2018.toReplaceWith(initialStep, initialStepClassifier1.clone( 
      qualityCuts = [-0.9, -0.5, 0.2],

diff --git a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py
@@ -196,6 +196,7 @@
      src = 'jetCoreRegionalStepTracks',
      qualityCuts = [0.6, 0.7, 0.8],
 ))
+(trackingPhase1 & fastSim).toModify(jetCoreRegionalStep,vertices = "firstStepPrimaryVerticesBeforeMixing")
 
 # Final sequence
 JetCoreRegionalStepTask = cms.Task(jetsForCoreTracking,                 

diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py
@@ -344,6 +344,7 @@
      src = 'mixedTripletStepTracks',
      qualityCuts = [-0.8, -0.35, 0.1],
 ))
+(trackingPhase1 & fastSim).toModify(mixedTripletStep,vertices = "firstStepPrimaryVerticesBeforeMixing")
 
 highBetaStar_2018.toReplaceWith(mixedTripletStep, mixedTripletStepClassifier1.clone(
      qualityCuts = [-0.7,0.0,0.5],

diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py
@@ -295,6 +295,7 @@
      src = 'pixelLessStepTracks',
      qualityCuts = [-0.6, -0.05, 0.5],
 ))
+(trackingPhase1 & fastSim).toModify(pixelLessStep,vertices = "firstStepPrimaryVerticesBeforeMixing")
 
 pp_on_AA_2018.toReplaceWith(pixelLessStep, pixelLessStepClassifier1.clone(
      qualityCuts = [-0.4,0.0,0.8],

diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py
@@ -369,6 +369,7 @@
      src = 'tobTecStepTracks',
      qualityCuts = [-0.4, -0.25, -0.1]
 ))
+(trackingPhase1 & fastSim).toModify(tobTecStep,vertices = "firstStepPrimaryVerticesBeforeMixing")
 
 pp_on_AA_2018.toReplaceWith(tobTecStep, TrackMVAClassifierDetached.clone(
      src = 'tobTecStepTracks',