Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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()
3 changes: 3 additions & 0 deletions Configuration/PyReleaseValidation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ 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.7561 HLT phase-2 timing menu Alpaka, trimmed tracking
* 0.7562 HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant
* 0.777 New Phase 2 Standalone Muon seeding, streamlined L3 Tracker Muons reconstruction (Inside-Out first), HLT Muon NanoAOD
* 0.778 New Phase 2 Standalone Muon seeding, streamlined L3 Tracker Muons reconstruction (Outside-In first), HLT Muon NanoAOD
* 0.78: Complete L1 workflow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,36 @@ def condition(self, fragment, stepList, key, hasHarvest):
'-s':'HARVESTING:@hltValidation'
}

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,VALIDATION:@hltValidation',
'--procModifiers': 'phase2_hlt_vertexTrimming',
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
}

upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'] = deepcopy(upgradeWFs['HLTTiming75e33'])
upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].suffix = '_HLT75e33TimingAlpakaTrimmedTracking'
upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].offset = 0.7561
upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].step2 = {
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
'--procModifiers': 'alpaka,phase2_hlt_vertexTrimming',
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
}

upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'] = deepcopy(upgradeWFs['HLTTiming75e33'])
upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].suffix = '_HLT75e33TimingAlpakaTrimmedTrackingSingleIter'
upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].offset = 0.7562
upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].step2 = {
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
'--procModifiers': 'alpaka,phase2_hlt_vertexTrimming,singleIterPatatrack',
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
}

class UpgradeWorkflow_HLTwDIGI75e33(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'DigiTrigger' in step:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "hltTrackingRegionFromTrimmedVertices")
Original file line number Diff line number Diff line change
@@ -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),
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "hltPhase2TrimmedPixelVertices")
Original file line number Diff line number Diff line change
@@ -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"),
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand All @@ -20,3 +21,8 @@

from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
singleIterPatatrack.toReplaceWith(HLTTrackingSequence, HLTTrackingSequence.copyAndExclude([HLTHighPtTripletStepSequence]))

from Configuration.ProcessModifiers.phase2_hlt_vertexTrimming_cff import phase2_hlt_vertexTrimming
_HLTTrackingSequenceTrimming = HLTTrackingSequence.copy()
_HLTTrackingSequenceTrimming.insert(_HLTTrackingSequenceTrimming.index(hltPhase2PixelVertices)+1, hltPhase2TrimmedPixelVertices)
phase2_hlt_vertexTrimming.toReplaceWith(HLTTrackingSequence, _HLTTrackingSequenceTrimming)