diff --git a/Configuration/ProcessModifiers/python/phase2_hlt_vertexTrimming_cff.py b/Configuration/ProcessModifiers/python/phase2_hlt_vertexTrimming_cff.py deleted file mode 100644 index 53f5b30b54b34..0000000000000 --- a/Configuration/ProcessModifiers/python/phase2_hlt_vertexTrimming_cff.py +++ /dev/null @@ -1,5 +0,0 @@ -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() diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index ddfb587ac4614..d912b4c742249 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -64,7 +64,6 @@ The offsets currently in use are: * 0.753: HLT phase-2 timing menu legacy tracking * 0.754: HLT phase-2 timing menu legacy tracking with Patatrack quads * 0.755: HLT phase-2 timing menu LST building variant -* 0.756 HLT phase-2 timing menu trimmed tracking * 0.757: HLT phase-2 timing menu mkFitFit variant * 0.758 HLT phase-2 timing menu ticl_barrel variant * 0.759: HLT phase-2 menu, with NANO:@Phase2HLT diff --git a/Configuration/PyReleaseValidation/python/relval_Run4.py b/Configuration/PyReleaseValidation/python/relval_Run4.py index f914534521f19..a117d3473faf0 100644 --- a/Configuration/PyReleaseValidation/python/relval_Run4.py +++ b/Configuration/PyReleaseValidation/python/relval_Run4.py @@ -70,7 +70,6 @@ numWFIB.extend([prefixDet+34.753]) # HLTTiming75e33, legacy tracking numWFIB.extend([prefixDet+34.754]) # HLTTiming75e33, legacy tracking with Patatrack quads numWFIB.extend([prefixDet+34.755]) # HLTTiming75e33, trackingLST -numWFIB.extend([prefixDet+34.756]) # HLTTiming75e33, phase2_hlt_vertexTrimming numWFIB.extend([prefixDet+34.757]) # HLTTiming75e33, MkFitFit numWFIB.extend([prefixDet+34.758]) # HLTTiming75e33, ticl_barrel numWFIB.extend([prefixDet+34.759]) # HLT75e33 + NANO diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 24c49dea8caa4..d8091bc74b028 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2033,11 +2033,6 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['HLTTiming75e33LST'].offset = 0.755 upgradeWFs['HLTTiming75e33LST'].step2['--procModifiers'] = 'trackingLST' -upgradeWFs['HLTTiming75e33TrimmedTracking'] = deepcopy(upgradeWFs['HLTTiming75e33']) -upgradeWFs['HLTTiming75e33TrimmedTracking'].suffix = '_HLT75e33TimingTrimmedTracking' -upgradeWFs['HLTTiming75e33TrimmedTracking'].offset = 0.756 -upgradeWFs['HLTTiming75e33TrimmedTracking'].step2['--procModifiers'] = 'phase2_hlt_vertexTrimming' - upgradeWFs['HLTTiming75e33MkFitFit'] = deepcopy(upgradeWFs['HLTTiming75e33']) upgradeWFs['HLTTiming75e33MkFitFit'].suffix = '_HLT75e33TimingMkFitFit' upgradeWFs['HLTTiming75e33MkFitFit'].offset = 0.757 diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index f0000072a184f..2fe2fe3d1b056 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -162,7 +162,6 @@ def runSelected(opt): prefixDet+34.753, # HLT phase-2 timing menu legacy tracking prefixDet+34.754, # HLT phase-2 timing menu legacy tracking with Patatrack quads prefixDet+34.755, # HLT phase-2 timing menu LST building variant - prefixDet+34.756, # HLT phase-2 timing menu trimmed tracking prefixDet+34.757, # HLT phase-2 timing menu mkFit fitting variant prefixDet+34.758, # HLT phase-2 timing menu ticl_barrel variant prefixDet+34.759, # HLT phase-2 menu, with NANO:@Phase2HLT diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitDoublets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitDoublets_cfi.py index 1b27a77ac52c9..cf6e837235a67 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitDoublets_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepHitDoublets_cfi.py @@ -12,6 +12,3 @@ trackingRegions = cms.InputTag("hltPhase2PixelTracksAndHighPtStepTrackingRegions"), trackingRegionsSeedingLayers = cms.InputTag("") ) - -from Configuration.ProcessModifiers.phase2_hlt_vertexTrimming_cff import phase2_hlt_vertexTrimming -phase2_hlt_vertexTrimming.toModify(hltHighPtTripletStepHitDoublets, trackingRegions = "hltTrackingRegionFromTrimmedVertices") diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackingRegionFromTrimmedVertices_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackingRegionFromTrimmedVertices_cfi.py deleted file mode 100644 index d6ec71d88c327..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackingRegionFromTrimmedVertices_cfi.py +++ /dev/null @@ -1,29 +0,0 @@ -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), - ) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py index f720d04af0fc4..ae96a8c2efa3b 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py @@ -22,6 +22,3 @@ hltPhase2LegacyTracking.toModify(hltInitialStepSeeds, includeFourthHit = False ) - -from Configuration.ProcessModifiers.phase2_hlt_vertexTrimming_cff import phase2_hlt_vertexTrimming -phase2_hlt_vertexTrimming.toModify(hltInitialStepSeeds, InputVertexCollection = "hltPhase2TrimmedPixelVertices") diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2TrimmedPixelVertices_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2TrimmedPixelVertices_cfi.py deleted file mode 100644 index 85550b447d43a..0000000000000 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2TrimmedPixelVertices_cfi.py +++ /dev/null @@ -1,11 +0,0 @@ -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"), - ) -) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi.py index 6e358096d25a1..d0094388d04d1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSeedingSequence_cfi.py @@ -5,11 +5,5 @@ 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) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2PixelTracksAndVerticesSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2PixelTracksAndVerticesSequence_cfi.py index b26971a6313bd..52d8a07c85a2a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2PixelTracksAndVerticesSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTPhase2PixelTracksAndVerticesSequence_cfi.py @@ -58,27 +58,6 @@ ) ) - -from ..modules.hltPhase2TrimmedPixelVertices_cfi import hltPhase2TrimmedPixelVertices -_HLTPhase2PixelTracksAndVerticesSequenceTrimming = cms.Sequence( - HLTBeamSpotSequence - +hltPhase2PixelFitterByHelixProjections - +hltPhase2PixelTrackFilterByKinematics - +hltPhase2OtRecHitsSoA - +hltPhase2PixelRecHitsExtendedSoA - +hltPhase2PixelTracksSoA - +hltPhase2PixelTrackTorchHighPuritySelector - +hltPhase2PixelTracks - +HLTPhase2PixelVertexingSequence - +hltPhase2TrimmedPixelVertices -) - -from Configuration.ProcessModifiers.phase2_hlt_vertexTrimming_cff import phase2_hlt_vertexTrimming -phase2_hlt_vertexTrimming.toReplaceWith( - HLTPhase2PixelTracksAndVerticesSequence, - _HLTPhase2PixelTracksAndVerticesSequenceTrimming -) - from Configuration.ProcessModifiers.hltPhase2LegacyTracking_cff import hltPhase2LegacyTracking _HLTPhase2PixelTracksAndVerticesSequenceLegacy = cms.Sequence( hltPhase2PixelTracksSeedLayers