diff --git a/Configuration/ProcessModifiers/python/seedingLST_cff.py b/Configuration/ProcessModifiers/python/seedingLST_cff.py new file mode 100644 index 0000000000000..9f17df5d81d78 --- /dev/null +++ b/Configuration/ProcessModifiers/python/seedingLST_cff.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +# This modifier sets the LST (Phase-2 line segment tracking) used for track seeding +# Needs to be used on top of the trackingLST modifier +seedingLST = cms.Modifier() diff --git a/Configuration/ProcessModifiers/python/singleIterPatatrack_cff.py b/Configuration/ProcessModifiers/python/singleIterPatatrack_cff.py new file mode 100644 index 0000000000000..7d1931e2a969c --- /dev/null +++ b/Configuration/ProcessModifiers/python/singleIterPatatrack_cff.py @@ -0,0 +1,5 @@ +import FWCore.ParameterSet.Config as cms + +# This modifier merges the initialStep and highPtTripletStep iterations +# to a single iteration using Patatrack pixel tracks with >3 hits as seeds +singleIterPatatrack = cms.Modifier() diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index a114e81d7146c..a8690b3454cb6 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -70,6 +70,9 @@ The offsets currently in use are: * 0.75: HLT phase-2 timing menu * 0.751: HLT phase-2 timing menu Alpaka variant * 0.752: HLT phase-2 timing menu ticl_v5 variant +* 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.78: Complete L1 workflow * 0.8: BPH Parking (Run-2) * 0.81: Running also HeavyFlavor DQM @@ -91,7 +94,6 @@ The offsets currently in use are: * 0.633: ECAL phase2 Trigger Primitive * 0.634: ECAL phase2 Trigger Primitive + component-method based digis * 0.635: ECAL phase2 Trigger Primitive + component-method based finely-sampled waveforms -* 0.75: Phase-2 HLT Timing menu * 0.91: Track DNN modifier * 0.97: Premixing stage1 * 0.98: Premixing stage2 diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 31543ebd3b380..fc9a9f7c924d3 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2128,6 +2128,30 @@ def condition(self, fragment, stepList, key, hasHarvest): '--procModifiers': 'ticl_v5' } +upgradeWFs['HLTTiming75e33AlpakaSingleIter'] = deepcopy(upgradeWFs['HLTTiming75e33']) +upgradeWFs['HLTTiming75e33AlpakaSingleIter'].suffix = '_HLT75e33TimingAlpakaSingleIter' +upgradeWFs['HLTTiming75e33AlpakaSingleIter'].offset = 0.753 +upgradeWFs['HLTTiming75e33AlpakaSingleIter'].step2 = { + '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing', + '--procModifiers': 'alpaka,singleIterPatatrack' +} + +upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'] = deepcopy(upgradeWFs['HLTTiming75e33']) +upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'].suffix = '_HLT75e33TimingAlpakaSingleIterLST' +upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'].offset = 0.754 +upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'].step2 = { + '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing', + '--procModifiers': 'alpaka,singleIterPatatrack,trackingLST' +} + +upgradeWFs['HLTTiming75e33AlpakaLST'] = deepcopy(upgradeWFs['HLTTiming75e33']) +upgradeWFs['HLTTiming75e33AlpakaLST'].suffix = '_HLT75e33TimingAlpakaLST' +upgradeWFs['HLTTiming75e33AlpakaLST'].offset = 0.755 +upgradeWFs['HLTTiming75e33AlpakaLST'].step2 = { + '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing', + '--procModifiers': 'alpaka,trackingLST' +} + class UpgradeWorkflow_HLTwDIGI75e33(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): diff --git a/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPModulesDevLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPModulesDevLST_cfi.py new file mode 100644 index 0000000000000..3bf5fc90e4079 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPModulesDevLST_cfi.py @@ -0,0 +1,12 @@ +import FWCore.ParameterSet.Config as cms + +def _addProcessModulesDevLST(process): + process.hltESPModulesDevLST = cms.ESProducer('LSTModulesDevESProducer@alpaka', + appendToDataLabel = cms.string(''), + alpaka = cms.untracked.PSet( + backend = cms.untracked.string('') + ) + ) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +modifyConfigurationForTrackingLSTModulesDevLST_ = trackingLST.makeProcessModifier(_addProcessModulesDevLST) diff --git a/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltTTRBWR_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPTTRHBuilderWithTrackAngle_cfi.py similarity index 63% rename from HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltTTRBWR_cfi.py rename to HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPTTRHBuilderWithTrackAngle_cfi.py index 1454557e313bd..0eb2f41427bcb 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltTTRBWR_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPTTRHBuilderWithTrackAngle_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -hltTTRBWR = cms.ESProducer("TkTransientTrackingRecHitBuilderESProducer", - ComponentName = cms.string('hltESPTTRHBWithTrackAngle'), +hltESPTTRHBuilderWithTrackAngle = cms.ESProducer("TkTransientTrackingRecHitBuilderESProducer", + ComponentName = cms.string('hltESPTTRHBuilderWithTrackAngle'), ComputeCoarseLocalPositionFromDisk = cms.bool(False), Matcher = cms.string('StandardMatcher'), Phase2StripCPE = cms.string('Phase2StripCPE'), diff --git a/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPTTRHBuilderWithoutRefit_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPTTRHBuilderWithoutRefit_cfi.py new file mode 100644 index 0000000000000..34c6fea4f653e --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/eventsetup/hltESPTTRHBuilderWithoutRefit_cfi.py @@ -0,0 +1,14 @@ +import FWCore.ParameterSet.Config as cms + +def _addProcessTTRHBuilderWithoutRefit(process): + process.hltESPTTRHBuilderWithoutRefit = cms.ESProducer("TkTransientTrackingRecHitBuilderESProducer", + ComponentName = cms.string('hltESPTTRHBuilderWithoutRefit'), + ComputeCoarseLocalPositionFromDisk = cms.bool(False), + Matcher = cms.string('Fake'), + Phase2StripCPE = cms.string(''), + PixelCPE = cms.string('Fake'), + StripCPE = cms.string('Fake') + ) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +modifyConfigurationForTrackingLSTTTRHBuilderWithoutRefit_ = trackingLST.makeProcessModifier(_addProcessTTRHBuilderWithoutRefit) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltGeneralTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltGeneralTracks_cfi.py index 2b746508d72e6..54e466f0614c8 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltGeneralTracks_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltGeneralTracks_cfi.py @@ -24,3 +24,58 @@ trackAlgoPriorityOrder = cms.string('trackAlgoPriorityOrder'), writeOnlyTrkQuals = cms.bool(False) ) + +_hltGeneralTracksSingleIterPatatrack = hltGeneralTracks.clone( + TrackProducers = ["hltInitialStepTrackSelectionHighPurity"], + hasSelector = [0], + indivShareFrac = [1.0], + selectedTrackQuals = ["hltInitialStepTrackSelectionHighPurity"], + setsToMerge = [cms.PSet( + pQual = cms.bool(True), + tLists = cms.vint32(0) + )] +) + +from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack +singleIterPatatrack.toReplaceWith(hltGeneralTracks, _hltGeneralTracksSingleIterPatatrack) + +_hltGeneralTracksLST = hltGeneralTracks.clone( + TrackProducers = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPurity"], + hasSelector = [0,0,0,0], + indivShareFrac = [0.1,0.1,0.1,0.1], + selectedTrackQuals = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPurity"], + setsToMerge = [cms.PSet( + pQual = cms.bool(True), + tLists = cms.vint32(0,1,2,3) + )] +) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +trackingLST.toReplaceWith(hltGeneralTracks, _hltGeneralTracksLST) + +_hltGeneralTracksLSTSingleIterPatatrack = hltGeneralTracks.clone( + TrackProducers = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST"], + hasSelector = [0,0,0], + indivShareFrac = [0.1,0.1,0.1], + selectedTrackQuals = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST"], + setsToMerge = [cms.PSet( + pQual = cms.bool(True), + tLists = cms.vint32(0,1,2) + )] +) + +(singleIterPatatrack & trackingLST).toReplaceWith(hltGeneralTracks, _hltGeneralTracksLSTSingleIterPatatrack) + +_hltGeneralTracksLSTSeeding = hltGeneralTracks.clone( + TrackProducers = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST"], + hasSelector = [0,0,0], + indivShareFrac = [0.1,0.1,0.1], + selectedTrackQuals = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST"], + setsToMerge = [cms.PSet( + pQual = cms.bool(True), + tLists = cms.vint32(0,1,2) + )] + ) + +from Configuration.ProcessModifiers.seedingLST_cff import seedingLST +(seedingLST & trackingLST).toReplaceWith(hltGeneralTracks, _hltGeneralTracksLSTSeeding) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepClusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepClusters_cfi.py index ed02f3aac573f..1656241d78dc7 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepClusters_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepClusters_cfi.py @@ -12,3 +12,10 @@ trackClassifier = cms.InputTag("","QualityMasks"), trajectories = cms.InputTag("hltInitialStepTrackSelectionHighPurity") ) + +_hltHighPtTripletStepClustersLST = hltHighPtTripletStepClusters.clone( + trajectories = "hltInitialStepSeedTracksLST" +) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +trackingLST.toReplaceWith(hltHighPtTripletStepClusters, _hltHighPtTripletStepClustersLST) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeedTracksLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeedTracksLST_cfi.py new file mode 100644 index 0000000000000..7a48ace8c4e83 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepSeedTracksLST_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +hltHighPtTripletStepSeedTracksLST = cms.EDProducer( + "TrackFromSeedProducer", + src = cms.InputTag("hltHighPtTripletStepSeeds"), + beamSpot = cms.InputTag("hltOnlineBeamSpot"), + TTRHBuilder = cms.string("hltESPTTRHBuilderWithoutRefit") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCandidatespLSTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCandidatespLSTCLST_cfi.py new file mode 100644 index 0000000000000..6492ae62a6224 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCandidatespLSTCLST_cfi.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltHighPtTripletStepTrackCandidates_cfi import hltHighPtTripletStepTrackCandidates as _hltHighPtTripletStepTrackCandidates +hltHighPtTripletStepTrackCandidatespLSTCLST = _hltHighPtTripletStepTrackCandidates.clone( src = "hltInitialStepTrackCandidates:pLSTSsLST" ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCutClassifierpLSTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCutClassifierpLSTCLST_cfi.py new file mode 100644 index 0000000000000..e2c99d1e6dfd6 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackCutClassifierpLSTCLST_cfi.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltHighPtTripletStepTrackCutClassifier_cfi import hltHighPtTripletStepTrackCutClassifier as _hltHighPtTripletStepTrackCutClassifier +hltHighPtTripletStepTrackCutClassifierpLSTCLST = _hltHighPtTripletStepTrackCutClassifier.clone( src = "hltHighPtTripletStepTrackspLSTCLST" ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST_cfi.py new file mode 100644 index 0000000000000..db9cba801df17 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltHighPtTripletStepTrackSelectionHighPurity_cfi import hltHighPtTripletStepTrackSelectionHighPurity as _hltHighPtTripletStepTrackSelectionHighPurity +hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST = _hltHighPtTripletStepTrackSelectionHighPurity.clone( + originalMVAVals = "hltHighPtTripletStepTrackCutClassifierpLSTCLST:MVAValues", + originalQualVals = "hltHighPtTripletStepTrackCutClassifierpLSTCLST:QualityMasks", + originalSource = "hltHighPtTripletStepTrackspLSTCLST" +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackspLSTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackspLSTCLST_cfi.py new file mode 100644 index 0000000000000..9d78785012a7c --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltHighPtTripletStepTrackspLSTCLST_cfi.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltHighPtTripletStepTracks_cfi import hltHighPtTripletStepTracks as _hltHighPtTripletStepTracks +hltHighPtTripletStepTrackspLSTCLST = _hltHighPtTripletStepTracks.clone( src = "hltHighPtTripletStepTrackCandidatespLSTCLST" ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeedTracksLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeedTracksLST_cfi.py new file mode 100644 index 0000000000000..b803257685b64 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeedTracksLST_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +hltInitialStepSeedTracksLST = cms.EDProducer( + "TrackFromSeedProducer", + src = cms.InputTag("hltInitialStepSeeds"), + beamSpot = cms.InputTag("hltOnlineBeamSpot"), + TTRHBuilder = cms.string("hltESPTTRHBuilderWithoutRefit") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py index 6eca9fb8de4d9..d43490415d5c3 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepSeeds_cfi.py @@ -11,5 +11,9 @@ originRadius = cms.double(0.1), useEventsWithNoVertex = cms.bool(True), usePV = cms.bool(False), - useProtoTrackKinematics = cms.bool(False) + useProtoTrackKinematics = cms.bool(False), + includeFourthHit = cms.bool(False) ) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +trackingLST.toModify(hltInitialStepSeeds, includeFourthHit = True) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCandidates_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCandidates_cfi.py index d504fc7fe972e..09cb1c6af611a 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCandidates_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCandidates_cfi.py @@ -23,3 +23,26 @@ src = cms.InputTag("hltInitialStepSeeds"), useHitsSplitting = cms.bool(False) ) + +_hltInitialStepTrackCandidatesLST = cms.EDProducer('LSTOutputConverter', + lstOutput = cms.InputTag('hltLST'), + phase2OTHits = cms.InputTag('hltPhase2OTHitsInputLST'), + lstPixelSeeds = cms.InputTag('hltPixelSeedInputLST'), + includeT5s = cms.bool(True), + includeNonpLSTSs = cms.bool(False), + propagatorAlong = cms.ESInputTag('', 'PropagatorWithMaterial'), + propagatorOpposite = cms.ESInputTag('', 'PropagatorWithMaterialOpposite'), + SeedCreatorPSet = cms.PSet( + ComponentName = cms.string('SeedFromConsecutiveHitsCreator'), + propagator = cms.string('PropagatorWithMaterial'), + SeedMomentumForBOFF = cms.double(5), + OriginTransverseErrorMultiplier = cms.double(1), + MinOneOverPtError = cms.double(1), + magneticField = cms.string(''), + TTRHBuilder = cms.string('WithTrackAngle'), + forceKinematicWithRegionDirection = cms.bool(False) + ) +) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +trackingLST.toReplaceWith(hltInitialStepTrackCandidates, _hltInitialStepTrackCandidatesLST) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifierpLSTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifierpLSTCLST_cfi.py new file mode 100644 index 0000000000000..5ce18b8b69a20 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifierpLSTCLST_cfi.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltInitialStepTrackCutClassifier_cfi import hltInitialStepTrackCutClassifier as _hltInitialStepTrackCutClassifier +hltInitialStepTrackCutClassifierpLSTCLST = _hltInitialStepTrackCutClassifier.clone( src = "hltInitialStepTrackspLSTCLST" ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifierpTTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifierpTTCLST_cfi.py new file mode 100644 index 0000000000000..35adc3f698f38 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackCutClassifierpTTCLST_cfi.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltInitialStepTrackCutClassifier_cfi import hltInitialStepTrackCutClassifier as _hltInitialStepTrackCutClassifier +hltInitialStepTrackCutClassifierpTTCLST = _hltInitialStepTrackCutClassifier.clone( src = "hltInitialStepTrackspTTCLST" ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPuritypLSTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPuritypLSTCLST_cfi.py new file mode 100644 index 0000000000000..edf0d6527564f --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPuritypLSTCLST_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltInitialStepTrackSelectionHighPurity_cfi import hltInitialStepTrackSelectionHighPurity as _hltInitialStepTrackSelectionHighPurity +hltInitialStepTrackSelectionHighPuritypLSTCLST = _hltInitialStepTrackSelectionHighPurity.clone( + originalMVAVals = "hltInitialStepTrackCutClassifierpLSTCLST:MVAValues", + originalQualVals = "hltInitialStepTrackCutClassifierpLSTCLST:QualityMasks", + originalSource = "hltInitialStepTrackspLSTCLST" +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPuritypTTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPuritypTTCLST_cfi.py new file mode 100644 index 0000000000000..ce39843dd293f --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackSelectionHighPuritypTTCLST_cfi.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltInitialStepTrackSelectionHighPurity_cfi import hltInitialStepTrackSelectionHighPurity as _hltInitialStepTrackSelectionHighPurity +hltInitialStepTrackSelectionHighPuritypTTCLST = _hltInitialStepTrackSelectionHighPurity.clone( + originalMVAVals = "hltInitialStepTrackCutClassifierpTTCLST:MVAValues", + originalQualVals = "hltInitialStepTrackCutClassifierpTTCLST:QualityMasks", + originalSource = "hltInitialStepTrackspTTCLST" +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTracksT5TCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTracksT5TCLST_cfi.py new file mode 100644 index 0000000000000..a7c0cc2b302d1 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTracksT5TCLST_cfi.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltInitialStepTracks_cfi import hltInitialStepTracks as _hltInitialStepTracks +hltInitialStepTracksT5TCLST = _hltInitialStepTracks.clone( src = "hltInitialStepTrackCandidates:t5TCsLST" ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackspLSTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackspLSTCLST_cfi.py new file mode 100644 index 0000000000000..0c3f3617b54bd --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackspLSTCLST_cfi.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltInitialStepTracks_cfi import hltInitialStepTracks as _hltInitialStepTracks +hltInitialStepTrackspLSTCLST = _hltInitialStepTracks.clone( src = "hltInitialStepTrackCandidates:pLSTCsLST" ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackspTTCLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackspTTCLST_cfi.py new file mode 100644 index 0000000000000..84e716174a4ee --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltInitialStepTrackspTTCLST_cfi.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +from ..modules.hltInitialStepTracks_cfi import hltInitialStepTracks as _hltInitialStepTracks +hltInitialStepTrackspTTCLST = _hltInitialStepTracks.clone( src = "hltInitialStepTrackCandidates:pTTCsLST" ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltLST_cfi.py new file mode 100644 index 0000000000000..dd8337d88d205 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltLST_cfi.py @@ -0,0 +1,18 @@ +import FWCore.ParameterSet.Config as cms + +hltLST = cms.EDProducer('LSTProducer@alpaka', + pixelSeedInput = cms.InputTag('hltPixelSeedInputLST'), + phase2OTHitsInput = cms.InputTag('hltPhase2OTHitsInputLST'), + verbose = cms.bool(False), + nopLSDupClean = cms.bool(False), + tcpLSTriplets = cms.bool(False), + mightGet = cms.optional.untracked.vstring, + alpaka = cms.untracked.PSet( + backend = cms.untracked.string('') + ) +) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +from Configuration.ProcessModifiers.seedingLST_cff import seedingLST +(seedingLST & trackingLST).toModify(hltLST, nopLSDupClean = True, + tcpLSTriplets = True ) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2OTHitsInputLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2OTHitsInputLST_cfi.py new file mode 100644 index 0000000000000..ef388d2efd059 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2OTHitsInputLST_cfi.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +hltPhase2OTHitsInputLST = cms.EDProducer('LSTPhase2OTHitsInputProducer', + phase2OTRecHits = cms.InputTag('hltSiPhase2RecHits'), + mightGet = cms.optional.untracked.vstring +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSoA_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSoA_cfi.py index d52dbb5f12d09..0ab0ce7737f2c 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSoA_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracksSoA_cfi.py @@ -41,3 +41,8 @@ # autoselect the alpaka backend alpaka = cms.untracked.PSet(backend = cms.untracked.string('')) ) + +_hltPhase2PixelTracksSoASingleIterPatatrack = hltPhase2PixelTracksSoA.clone( minHitsPerNtuplet = 3 ) + +from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack +singleIterPatatrack.toReplaceWith(hltPhase2PixelTracksSoA, _hltPhase2PixelTracksSoASingleIterPatatrack) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelSeedInputLST_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelSeedInputLST_cfi.py new file mode 100644 index 0000000000000..c85dfc1682512 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPixelSeedInputLST_cfi.py @@ -0,0 +1,16 @@ +import FWCore.ParameterSet.Config as cms + +hltPixelSeedInputLST = cms.EDProducer('LSTPixelSeedInputProducer', + beamSpot = cms.InputTag('hltOnlineBeamSpot'), + seedTracks = cms.VInputTag( + 'hltInitialStepSeedTracksLST', + 'hltHighPtTripletStepSeedTracksLST' + ) +) + +_hltPixelSeedInputLSTSingleIterPatatrack = hltPixelSeedInputLST.clone( + seedTracks = ['hltInitialStepSeedTracksLST'] +) + +from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack +singleIterPatatrack.toReplaceWith(hltPixelSeedInputLST, _hltPixelSeedInputLSTSingleIterPatatrack) diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2Clusters_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2Clusters_cfi.py index 342699f45689b..f3b391e015cab 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2Clusters_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2Clusters_cfi.py @@ -1,4 +1,11 @@ import FWCore.ParameterSet.Config as cms -from RecoLocalTracker.SiPhase2Clusterizer.phase2TrackerClusterizer_cfi import siPhase2Clusters as _siPhase2Clusters -hltSiPhase2Clusters = _siPhase2Clusters.clone() +# Clusterizer options +hltSiPhase2Clusters = cms.EDProducer('Phase2TrackerClusterizer', + src = cms.InputTag("mix", "Tracker"), + maxClusterSize = cms.uint32(0), # was 8 + maxNumberClusters = cms.uint32(0) +) + +from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2 +premix_stage2.toModify(hltSiPhase2Clusters, src = "mixData:Tracker") diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2RecHits_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2RecHits_cfi.py new file mode 100644 index 0000000000000..32a3d48a6ad91 --- /dev/null +++ b/HLTrigger/Configuration/python/HLT_75e33/modules/hltSiPhase2RecHits_cfi.py @@ -0,0 +1,7 @@ +import FWCore.ParameterSet.Config as cms + +# RecHits options +hltSiPhase2RecHits = cms.EDProducer("Phase2TrackerRecHits", + src = cms.InputTag("hltSiPhase2Clusters"), + Phase2StripCPE = cms.ESInputTag("phase2StripCPEESProducer", "Phase2StripCPE") +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/psets/HLTPSetTrajectoryBuilderForGsfElectrons_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/psets/HLTPSetTrajectoryBuilderForGsfElectrons_cfi.py index 6f625533dbc49..9a76c110f0470 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/psets/HLTPSetTrajectoryBuilderForGsfElectrons_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/psets/HLTPSetTrajectoryBuilderForGsfElectrons_cfi.py @@ -2,7 +2,7 @@ HLTPSetTrajectoryBuilderForGsfElectrons = cms.PSet( ComponentType = cms.string('CkfTrajectoryBuilder'), - TTRHBuilder = cms.string('hltESPTTRHBWithTrackAngle'), + TTRHBuilder = cms.string('hltESPTTRHBuilderWithTrackAngle'), alwaysUseInvalidHits = cms.bool(True), estimator = cms.string('hltESPChi2ChargeMeasurementEstimator2000'), intermediateCleaning = cms.bool(False), @@ -15,4 +15,4 @@ refToPSet_ = cms.string('HLTPSetTrajectoryFilterForElectrons') ), updator = cms.string('hltESPKFUpdator') -) \ No newline at end of file +) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSequence_cfi.py index 6f168f3abbc63..8c617bd954d72 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTHighPtTripletStepSequence_cfi.py @@ -6,4 +6,27 @@ from ..modules.hltHighPtTripletStepTrackSelectionHighPurity_cfi import * from ..sequences.HLTHighPtTripletStepSeedingSequence_cfi import * -HLTHighPtTripletStepSequence = cms.Sequence(HLTHighPtTripletStepSeedingSequence+hltHighPtTripletStepTrackCandidates+hltHighPtTripletStepTracks+hltHighPtTripletStepTrackCutClassifier+hltHighPtTripletStepTrackSelectionHighPurity) +HLTHighPtTripletStepSequence = cms.Sequence( + HLTHighPtTripletStepSeedingSequence + +hltHighPtTripletStepTrackCandidates + +hltHighPtTripletStepTracks + +hltHighPtTripletStepTrackCutClassifier + +hltHighPtTripletStepTrackSelectionHighPurity +) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +trackingLST.toReplaceWith(HLTHighPtTripletStepSequence, HLTHighPtTripletStepSequence.copyAndExclude([HLTHighPtTripletStepSeedingSequence])) + +from ..modules.hltHighPtTripletStepTrackCandidatespLSTCLST_cfi import * +from ..modules.hltHighPtTripletStepTrackspLSTCLST_cfi import * +from ..modules.hltHighPtTripletStepTrackCutClassifierpLSTCLST_cfi import * +from ..modules.hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST_cfi import * +_HLTHighPtTripletStepSequenceLSTSeeding = cms.Sequence( + hltHighPtTripletStepTrackCandidatespLSTCLST + +hltHighPtTripletStepTrackspLSTCLST + +hltHighPtTripletStepTrackCutClassifierpLSTCLST + +hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST +) + +from Configuration.ProcessModifiers.seedingLST_cff import seedingLST +(seedingLST & trackingLST).toReplaceWith(HLTHighPtTripletStepSequence, _HLTHighPtTripletStepSequenceLSTSeeding) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepSequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepSequence_cfi.py index f674cf77fe168..7473f986cf483 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepSequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTInitialStepSequence_cfi.py @@ -7,3 +7,45 @@ from ..modules.hltInitialStepTrackSelectionHighPurity_cfi import * HLTInitialStepSequence = cms.Sequence(hltInitialStepSeeds+hltInitialStepTrackCandidates+hltInitialStepTracks+hltInitialStepTrackCutClassifier+hltInitialStepTrackSelectionHighPurity) + +from ..modules.hltInitialStepSeedTracksLST_cfi import * +from ..sequences.HLTHighPtTripletStepSeedingSequence_cfi import * +from ..modules.hltHighPtTripletStepSeedTracksLST_cfi import * +from ..modules.hltPixelSeedInputLST_cfi import * +from ..modules.hltSiPhase2RecHits_cfi import * +from ..modules.hltPhase2OTHitsInputLST_cfi import * +from ..modules.hltLST_cfi import * +from ..modules.hltInitialStepTrackspTTCLST_cfi import * +from ..modules.hltInitialStepTrackspLSTCLST_cfi import * +from ..modules.hltInitialStepTracksT5TCLST_cfi import * +from ..modules.hltInitialStepTrackCutClassifierpTTCLST_cfi import * +from ..modules.hltInitialStepTrackCutClassifierpLSTCLST_cfi import * +from ..modules.hltInitialStepTrackSelectionHighPuritypTTCLST_cfi import * +from ..modules.hltInitialStepTrackSelectionHighPuritypLSTCLST_cfi import * +_HLTInitialStepSequenceLST = cms.Sequence( + hltInitialStepSeeds + +hltInitialStepSeedTracksLST + +HLTHighPtTripletStepSeedingSequence + +hltHighPtTripletStepSeedTracksLST + +hltPixelSeedInputLST + +hltSiPhase2RecHits # Probably need to move elsewhere in the final setup + +hltPhase2OTHitsInputLST # Probably need to move elsewhere in the final setup + +hltLST + +hltInitialStepTrackCandidates + +hltInitialStepTrackspTTCLST + +hltInitialStepTrackspLSTCLST + +hltInitialStepTracksT5TCLST + +hltInitialStepTrackCutClassifierpTTCLST + +hltInitialStepTrackCutClassifierpLSTCLST + +hltInitialStepTrackSelectionHighPuritypTTCLST + +hltInitialStepTrackSelectionHighPuritypLSTCLST +) + +from Configuration.ProcessModifiers.trackingLST_cff import trackingLST +trackingLST.toReplaceWith(HLTInitialStepSequence, _HLTInitialStepSequenceLST) + +from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack +(singleIterPatatrack & trackingLST).toReplaceWith(HLTInitialStepSequence, HLTInitialStepSequence.copyAndExclude([HLTHighPtTripletStepSeedingSequence,hltHighPtTripletStepSeedTracksLST])) + +from Configuration.ProcessModifiers.seedingLST_cff import seedingLST +(seedingLST & trackingLST).toReplaceWith(HLTInitialStepSequence, _HLTInitialStepSequenceLST.copyAndExclude([hltInitialStepTrackspLSTCLST,hltInitialStepTrackCutClassifierpLSTCLST,hltInitialStepTrackSelectionHighPuritypLSTCLST])) diff --git a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py index e10294c40bb74..4235e1a72f331 100644 --- a/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py +++ b/HLTrigger/Configuration/python/HLT_75e33/sequences/HLTTrackingV61Sequence_cfi.py @@ -10,3 +10,6 @@ from ..sequences.HLTOtLocalRecoSequence_cfi import * HLTTrackingV61Sequence = cms.Sequence((HLTItLocalRecoSequence+HLTOtLocalRecoSequence+hltTrackerClusterCheck+HLTPhase2PixelTracksSequence+hltPhase2PixelVertices+HLTInitialStepSequence+HLTHighPtTripletStepSequence+hltGeneralTracks)) + +from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack +singleIterPatatrack.toReplaceWith(HLTTrackingV61Sequence, HLTTrackingV61Sequence.copyAndExclude([HLTHighPtTripletStepSequence])) diff --git a/HLTrigger/Configuration/python/HLT_75e33_cff.py b/HLTrigger/Configuration/python/HLT_75e33_cff.py index b5f5d2d9e100f..cfe5517a495c4 100644 --- a/HLTrigger/Configuration/python/HLT_75e33_cff.py +++ b/HLTrigger/Configuration/python/HLT_75e33_cff.py @@ -84,7 +84,7 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltPhase2L3MuonPixelTrackCleanerBySharedHits_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltPhase2L3MuonTrackAlgoPriorityOrder_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltPixelTracksCleanerBySharedHits_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltTTRBWR_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPTTRHBuilderWithTrackAngle_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPKFFittingSmootherForL2Muon_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPKFTrajectoryFitterForL2Muon_cfi") @@ -96,6 +96,9 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPSiPixelCablingSoA_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPSiPixelGainCalibrationForHLTSoA_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPModulesDevLST_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPTTRHBuilderWithoutRefit_cfi") + fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_L1Seeded_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_Unseeded_cfi") diff --git a/HLTrigger/Configuration/python/HLT_75e33_timing_cff.py b/HLTrigger/Configuration/python/HLT_75e33_timing_cff.py index e68e419d2152a..fb83d0f14a4c1 100644 --- a/HLTrigger/Configuration/python/HLT_75e33_timing_cff.py +++ b/HLTrigger/Configuration/python/HLT_75e33_timing_cff.py @@ -89,7 +89,7 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltPhase2L3MuonPixelTrackCleanerBySharedHits_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltPhase2L3MuonTrackAlgoPriorityOrder_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltPixelTracksCleanerBySharedHits_cfi") -fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltTTRBWR_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPTTRHBuilderWithTrackAngle_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPKFFittingSmootherForL2Muon_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPKFTrajectoryFitterForL2Muon_cfi") @@ -101,6 +101,9 @@ fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPSiPixelCablingSoA_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPSiPixelGainCalibrationForHLTSoA_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPModulesDevLST_cfi") +fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPTTRHBuilderWithoutRefit_cfi") + fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_L1Seeded_cfi") fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_DoubleEle23_12_Iso_L1Seeded_cfi") diff --git a/RecoTracker/LSTCore/interface/Common.h b/RecoTracker/LSTCore/interface/Common.h index f65ca7a50d867..7e91501087c59 100644 --- a/RecoTracker/LSTCore/interface/Common.h +++ b/RecoTracker/LSTCore/interface/Common.h @@ -28,15 +28,15 @@ namespace lst { constexpr unsigned int max_blocks = 80; constexpr unsigned int max_connected_modules = 40; - constexpr unsigned int n_max_pixel_segments_per_module = 50000; + constexpr unsigned int n_max_pixel_segments_per_module = 500000; constexpr unsigned int n_max_pixel_md_per_modules = 2 * n_max_pixel_segments_per_module; constexpr unsigned int n_max_pixel_triplets = 5000; constexpr unsigned int n_max_pixel_quintuplets = 15000; - constexpr unsigned int n_max_pixel_track_candidates = 30000; - constexpr unsigned int n_max_nonpixel_track_candidates = 1000; + constexpr unsigned int n_max_pixel_track_candidates = 300000; + constexpr unsigned int n_max_nonpixel_track_candidates = 10000; constexpr unsigned int size_superbins = 45000;