add trimming modules for the phase2 hlt menus

Configuration/ProcessModifiers/python/phase2_hlt_vertexTrimming_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier is used to enable vertex trimming in the tracking sequences
+# and in all related reconstruction modules
+phase2_hlt_vertexTrimming = cms.Modifier()

Configuration/PyReleaseValidation/README.md

@@ -59,6 +59,12 @@ The offsets currently in use are:
 * 0.753: HLT phase-2 timing menu Alpaka, single tracking iteration variant
 * 0.754: HLT phase-2 timing menu Alpaka, single tracking iteration, LST building variant
 * 0.755: HLT phase-2 timing menu Alpaka, LST building variant
+* 0.756 HLT phase-2 timing menu trimmed tracking
+* 0.757 HLT phase-2 timing menu Alpaka, trimmed tracking
+* 0.758 HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant
+* 0.759 HLT phase-2 timing menu trimmed tracking, LST building variant
+* 0.760 HLT phase-2 timing menu Alpaka, trimmed tracking, LST building variant
+* 0.761 HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant, LST building variant
 * 0.78: Complete L1 workflow
 * 0.8: BPH Parking (Run-2)
 * 0.81: Running also HeavyFlavor DQM

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1684,6 +1684,54 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '--procModifiers': 'alpaka,trackingLST'
 }
 
+upgradeWFs['HLTTiming75e33TrimmedTracking'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33TrimmedTracking'].suffix = '_HLT75e33TimingTrimmedTracking'
+upgradeWFs['HLTTiming75e33TrimmedTracking'].offset = 0.756
+upgradeWFs['HLTTiming75e33TrimmedTracking'].step2 = {
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing',
+    '--procModifiers': 'phase2_hlt_vertexTrimming'
+}
+
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].suffix = '_HLT75e33TimingAlpakaTrimmedTracking'
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].offset = 0.757
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].step2 = {
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing',
+    '--procModifiers': 'alpaka,phase2_hlt_vertexTrimming'
+}
+
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].suffix = '_HLT75e33TimingAlpakaTrimmedTrackingSingleIter'
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].offset = 0.758
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].step2 = {
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing',
+    '--procModifiers': 'alpaka,phase2_hlt_vertexTrimming,singleIterPatatrack'
+}
+
+upgradeWFs['HLTTiming75e33TrimmedTrackingLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33TrimmedTrackingLST'].suffix = '_HLT75e33TimingTrimmedTrackingLST'
+upgradeWFs['HLTTiming75e33TrimmedTrackingLST'].offset = 0.759
+upgradeWFs['HLTTiming75e33TrimmedTrackingLST'].step2 = {
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing',
+    '--procModifiers': 'phase2_hlt_vertexTrimming,trackingLST'
+}
+
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingLST'].suffix = '_HLT75e33TimingAlpakaTrimmedTrackingLST'
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingLST'].offset = 0.760
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingLST'].step2 = {
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing',
+    '--procModifiers': 'alpaka,phase2_hlt_vertexTrimming,trackingLST'
+}
+
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIterLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIterLST'].suffix = '_HLT75e33TimingAlpakaTrimmedTrackingSingleIterLST'
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIterLST'].offset = 0.761
+upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIterLST'].step2 = {
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing',
+    '--procModifiers': 'alpaka,phase2_hlt_vertexTrimming,singleIterPatatrack,trackingLST'
+}
+
 
 class UpgradeWorkflow_HLTwDIGI75e33(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):

HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitDoublets_cfi.py

@@ -12,3 +12,6 @@
     trackingRegions = cms.InputTag("hltPhase2PixelTracksAndHighPtStepTrackingRegions"),
     trackingRegionsSeedingLayers = cms.InputTag("")
 )
+
+from Configuration.ProcessModifiers.phase2_hlt_vertexTrimming_cff import phase2_hlt_vertexTrimming
+phase2_hlt_vertexTrimming.toModify(hltHighPtTripletStepHitDoublets, trackingRegions = cms.InputTag('hltTrackingRegionFromTrimmedVertices'))

HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackingRegionFromTrimmedVertices_cfi.py

@@ -0,0 +1,29 @@
+import FWCore.ParameterSet.Config as cms
+
+hltTrackingRegionFromTrimmedVertices = cms.EDProducer('GlobalTrackingRegionWithVerticesEDProducer',
+  RegionPSet = cms.PSet(
+    ptMin                   = cms.double(0.9),
+    beamSpot                = cms.InputTag('hltOnlineBeamSpot'),
+    VertexCollection        = cms.InputTag('hltPhase2TrimmedPixelVertices'),
+    originRadius            = cms.double(0.02),
+    precise                 = cms.bool(True),
+    useMultipleScattering   = cms.bool(False),
+    useFixedError           = cms.bool(True),
+    sigmaZVertex            = cms.double(3.0),
+    fixedError              = cms.double(0.2),
+    useFoundVertices        = cms.bool(True),
+    useFakeVertices         = cms.bool(False),
+    maxNVertices            = cms.int32(-1),
+    nSigmaZ                 = cms.double(4.0),
+    pixelClustersForScaling = cms.InputTag('hltSiPixelClusters'),
+    originRScaling4BigEvts  = cms.bool(False),
+    ptMinScaling4BigEvts    = cms.bool(False),
+    halfLengthScaling4BigEvts = cms.bool(False),
+    allowEmpty              = cms.bool(False),
+    minOriginR              = cms.double(0),
+    maxPtMin                = cms.double(1000),
+    minHalfLength           = cms.double(0),
+    scalingStartNPix        = cms.double(0.0),
+    scalingEndNPix          = cms.double(1.0),
+  )
+)

HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py

@@ -17,3 +17,6 @@
 
 from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
 trackingLST.toModify(hltInitialStepSeeds, includeFourthHit = True)
+
+from Configuration.ProcessModifiers.phase2_hlt_vertexTrimming_cff import phase2_hlt_vertexTrimming
+phase2_hlt_vertexTrimming.toModify(hltInitialStepSeeds, InputVertexCollection = cms.InputTag("hltPhase2TrimmedPixelVertices"))

HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2TrimmedPixelVertices_cfi.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+hltPhase2TrimmedPixelVertices = cms.EDProducer("PixelVertexCollectionTrimmer",
+    src             = cms.InputTag("hltPhase2PixelVertices"),
+    maxVtx          = cms.uint32(300),
+    fractionSumPt2  = cms.double(0.3),
+    minSumPt2       = cms.double(0.0),
+    PVcomparer      = cms.PSet(
+        refToPSet_ = cms.string("pSetPvClusterComparerForIT"),
+    )
+)

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi.py

@@ -5,5 +5,11 @@
 from ..modules.hltHighPtTripletStepHitTriplets_cfi import *
 from ..modules.hltHighPtTripletStepSeedLayers_cfi import *
 from ..modules.hltHighPtTripletStepSeeds_cfi import *
+from ..modules.hltHighPtTripletStepTrackingRegionFromTrimmedVertices_cfi import *
 
 HLTHighPtTripletStepSeedingSequence = cms.Sequence(hltHighPtTripletStepClusters+hltHighPtTripletStepSeedLayers+hltHighPtTripletStepHitDoublets+hltHighPtTripletStepHitTriplets+hltHighPtTripletStepSeeds)
+
+from Configuration.ProcessModifiers.phase2_hlt_vertexTrimming_cff import phase2_hlt_vertexTrimming
+_HLTHighPtTripletStepSeedingSequenceTrimming = HLTHighPtTripletStepSeedingSequence.copy()
+_HLTHighPtTripletStepSeedingSequenceTrimming.insert(0, hltTrackingRegionFromTrimmedVertices)
+phase2_hlt_vertexTrimming.toReplaceWith(HLTHighPtTripletStepSeedingSequence, _HLTHighPtTripletStepSeedingSequenceTrimming)

HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py

@@ -2,6 +2,7 @@
 
 from ..modules.hltGeneralTracks_cfi import *
 from ..modules.hltPhase2PixelVertices_cfi import *
+from ..modules.hltPhase2TrimmedPixelVertices_cfi import *
 from ..modules.hltTrackerClusterCheck_cfi import *
 from ..sequences.HLTHighPtTripletStepSequence_cfi import *
 from ..sequences.HLTPhase2PixelTracksSequence_cfi import *
@@ -13,3 +14,8 @@
 
 from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
 singleIterPatatrack.toReplaceWith(HLTTrackingV61Sequence, HLTTrackingV61Sequence.copyAndExclude([HLTHighPtTripletStepSequence]))
+
+from Configuration.ProcessModifiers.phase2_hlt_vertexTrimming_cff import phase2_hlt_vertexTrimming
+_HLTTrackingV61SequenceTrimming = HLTTrackingV61Sequence.copy()
+_HLTTrackingV61SequenceTrimming.insert(_HLTTrackingV61SequenceTrimming.index(hltPhase2PixelVertices)+1, hltPhase2TrimmedPixelVertices)
+phase2_hlt_vertexTrimming.toReplaceWith(HLTTrackingV61Sequence, _HLTTrackingV61SequenceTrimming)