Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HLT menu development for 13_2_X (1/N) #42611

Merged
merged 1 commit into from
Aug 21, 2023
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
354 changes: 272 additions & 82 deletions HLTrigger/Configuration/python/HLT_2023v12_cff.py

Large diffs are not rendered by default.

432 changes: 342 additions & 90 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_Fake1_cff.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# hltGetConfiguration /dev/CMSSW_13_0_0/Fake1 --cff --data --type Fake1
# hltGetConfiguration /dev/CMSSW_13_2_0/Fake1 --cff --data --type Fake1

# /dev/CMSSW_13_0_0/Fake1/V9 (CMSSW_13_0_2)
# /dev/CMSSW_13_2_0/Fake1/V5 (CMSSW_13_2_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )


fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_13_0_0/Fake1/V9')
tableName = cms.string('/dev/CMSSW_13_2_0/Fake1/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_Fake2_cff.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# hltGetConfiguration /dev/CMSSW_13_0_0/Fake2 --cff --data --type Fake2
# hltGetConfiguration /dev/CMSSW_13_2_0/Fake2 --cff --data --type Fake2

# /dev/CMSSW_13_0_0/Fake2/V9 (CMSSW_13_0_2)
# /dev/CMSSW_13_2_0/Fake2/V5 (CMSSW_13_2_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )


fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_13_0_0/Fake2/V9')
tableName = cms.string('/dev/CMSSW_13_2_0/Fake2/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_Fake_cff.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# hltGetConfiguration /dev/CMSSW_13_0_0/Fake --cff --data --type Fake
# hltGetConfiguration /dev/CMSSW_13_2_0/Fake --cff --data --type Fake

# /dev/CMSSW_13_0_0/Fake/V9 (CMSSW_13_0_2)
# /dev/CMSSW_13_2_0/Fake/V5 (CMSSW_13_2_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )


fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_13_0_0/Fake/V9')
tableName = cms.string('/dev/CMSSW_13_2_0/Fake/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
356 changes: 274 additions & 82 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

195 changes: 99 additions & 96 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration /dev/CMSSW_13_0_0/PIon --cff --data --type PIon
# hltGetConfiguration /dev/CMSSW_13_2_0/PIon --cff --data --type PIon

# /dev/CMSSW_13_0_0/PIon/V153 (CMSSW_13_0_2)
# /dev/CMSSW_13_2_0/PIon/V12 (CMSSW_13_2_0)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,7 +12,7 @@
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_13_0_0/PIon/V153')
tableName = cms.string('/dev/CMSSW_13_2_0/PIon/V12')
)

fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
Expand Down Expand Up @@ -1641,8 +1641,8 @@
appendToDataLabel = cms.string( "" )
)
fragment.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer",
PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
PixelShapeFile = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
ComponentName = cms.string( "ClusterShapeHitFilter" ),
isPhase2 = cms.bool( False ),
doPixelShapeCut = cms.bool( True ),
Expand Down Expand Up @@ -1815,6 +1815,7 @@
)
fragment.cosmicsNavigationSchoolESProducer = cms.ESProducer( "NavigationSchoolESProducer",
ComponentName = cms.string( "CosmicNavigationSchool" ),
PluginName = cms.string( "" ),
SimpleMagneticField = cms.string( "" )
)
fragment.ctppsGeometryESModule = cms.ESProducer( "CTPPSGeometryESModule",
Expand Down Expand Up @@ -2994,8 +2995,8 @@
appendToDataLabel = cms.string( "" )
)
fragment.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer",
PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
PixelShapeFile = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ),
isPhase2 = cms.bool( False ),
doPixelShapeCut = cms.bool( True ),
Expand Down Expand Up @@ -3138,8 +3139,8 @@
appendToDataLabel = cms.string( "" )
)
fragment.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer",
PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
PixelShapeFile = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ),
isPhase2 = cms.bool( False ),
doPixelShapeCut = cms.bool( True ),
Expand Down Expand Up @@ -3345,8 +3346,8 @@
appendToDataLabel = cms.string( "" )
)
fragment.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer",
PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
PixelShapeFile = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ),
isPhase2 = cms.bool( False ),
doPixelShapeCut = cms.bool( True ),
Expand Down Expand Up @@ -3522,6 +3523,7 @@
)
fragment.navigationSchoolESProducer = cms.ESProducer( "NavigationSchoolESProducer",
ComponentName = cms.string( "SimpleNavigationSchool" ),
PluginName = cms.string( "" ),
SimpleMagneticField = cms.string( "ParabolicMf" )
)
fragment.preshowerDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer",
Expand Down
57 changes: 40 additions & 17 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration /dev/CMSSW_13_0_0/PRef --cff --data --type PRef
# hltGetConfiguration /dev/CMSSW_13_2_0/PRef --cff --data --type PRef

# /dev/CMSSW_13_0_0/PRef/V153 (CMSSW_13_0_2)
# /dev/CMSSW_13_2_0/PRef/V12 (CMSSW_13_2_0)

import FWCore.ParameterSet.Config as cms

Expand All @@ -12,7 +12,7 @@
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_13_0_0/PRef/V153')
tableName = cms.string('/dev/CMSSW_13_2_0/PRef/V12')
)

fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
Expand Down Expand Up @@ -1724,8 +1724,8 @@
appendToDataLabel = cms.string( "" )
)
fragment.ClusterShapeHitFilterESProducer = cms.ESProducer( "ClusterShapeHitFilterESProducer",
PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
PixelShapeFile = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
ComponentName = cms.string( "ClusterShapeHitFilter" ),
isPhase2 = cms.bool( False ),
doPixelShapeCut = cms.bool( True ),
Expand Down Expand Up @@ -1898,6 +1898,7 @@
)
fragment.cosmicsNavigationSchoolESProducer = cms.ESProducer( "NavigationSchoolESProducer",
ComponentName = cms.string( "CosmicNavigationSchool" ),
PluginName = cms.string( "" ),
SimpleMagneticField = cms.string( "" )
)
fragment.ctppsGeometryESModule = cms.ESProducer( "CTPPSGeometryESModule",
Expand Down Expand Up @@ -3077,8 +3078,8 @@
appendToDataLabel = cms.string( "" )
)
fragment.hltESPMixedStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer",
PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
PixelShapeFile = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
ComponentName = cms.string( "hltESPMixedStepClusterShapeHitFilter" ),
isPhase2 = cms.bool( False ),
doPixelShapeCut = cms.bool( True ),
Expand Down Expand Up @@ -3221,8 +3222,8 @@
appendToDataLabel = cms.string( "" )
)
fragment.hltESPPixelLessStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer",
PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
PixelShapeFile = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
ComponentName = cms.string( "hltESPPixelLessStepClusterShapeHitFilter" ),
isPhase2 = cms.bool( False ),
doPixelShapeCut = cms.bool( True ),
Expand Down Expand Up @@ -3428,8 +3429,8 @@
appendToDataLabel = cms.string( "" )
)
fragment.hltESPTobTecStepClusterShapeHitFilter = cms.ESProducer( "ClusterShapeHitFilterESProducer",
PixelShapeFile = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoPixelVertexing/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
PixelShapeFile = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_noL1.par" ),
PixelShapeFileL1 = cms.string( "RecoTracker/PixelLowPtUtilities/data/pixelShapePhase1_loose.par" ),
ComponentName = cms.string( "hltESPTobTecStepClusterShapeHitFilter" ),
isPhase2 = cms.bool( False ),
doPixelShapeCut = cms.bool( True ),
Expand Down Expand Up @@ -3605,6 +3606,7 @@
)
fragment.navigationSchoolESProducer = cms.ESProducer( "NavigationSchoolESProducer",
ComponentName = cms.string( "SimpleNavigationSchool" ),
PluginName = cms.string( "" ),
SimpleMagneticField = cms.string( "ParabolicMf" )
)
fragment.preshowerDetIdAssociator = cms.ESProducer( "DetIdAssociatorESProducer",
Expand Down Expand Up @@ -4868,12 +4870,15 @@
Phase2DigiBaseline = cms.double( 1200.0 ),
Phase2KinkADC = cms.int32( 8 )
)
fragment.hltSiPixelClustersGPU = cms.EDProducer( "SiPixelRawToClusterCUDA",
isRun2 = cms.bool( False ),
fragment.hltSiPixelClustersGPU = cms.EDProducer( "SiPixelRawToClusterCUDAPhase1",
IncludeErrors = cms.bool( True ),
UseQualityInfo = cms.bool( False ),
clusterThreshold_layer1 = cms.int32( 4000 ),
clusterThreshold_otherLayers = cms.int32( 4000 ),
VCaltoElectronGain = cms.double( 1.0 ),
VCaltoElectronGain_L1 = cms.double( 1.0 ),
VCaltoElectronOffset = cms.double( 0.0 ),
VCaltoElectronOffset_L1 = cms.double( 0.0 ),
InputLabel = cms.InputTag( "rawDataCollector" ),
Regions = cms.PSet( ),
CablingMapLabel = cms.string( "" )
Expand Down Expand Up @@ -4989,6 +4994,9 @@
useSimpleTripletCleaner = cms.bool( True ),
idealConditions = cms.bool( False ),
includeJumpingForwardDoublets = cms.bool( True ),
z0Cut = cms.double( 12.0 ),
ptCut = cms.double( 0.5 ),
phiCuts = cms.vint32( 522, 730, 730, 522, 626, 626, 522, 522, 626, 626, 626, 522, 522, 522, 522, 522, 522, 522, 522 ),
trackQualityCuts = cms.PSet(
chi2MaxPt = cms.double( 10.0 ),
tripletMaxTip = cms.double( 0.3 ),
Expand Down Expand Up @@ -5026,6 +5034,9 @@
useSimpleTripletCleaner = cms.bool( True ),
idealConditions = cms.bool( False ),
includeJumpingForwardDoublets = cms.bool( True ),
z0Cut = cms.double( 12.0 ),
ptCut = cms.double( 0.5 ),
phiCuts = cms.vint32( 522, 730, 730, 522, 626, 626, 522, 522, 626, 626, 626, 522, 522, 522, 522, 522, 522, 522, 522 ),
trackQualityCuts = cms.PSet(
chi2MaxPt = cms.double( 10.0 ),
tripletMaxTip = cms.double( 0.3 ),
Expand Down Expand Up @@ -5063,6 +5074,7 @@
useDensity = cms.bool( True ),
useDBSCAN = cms.bool( False ),
useIterative = cms.bool( False ),
doSplitting = cms.bool( True ),
minT = cms.int32( 2 ),
eps = cms.double( 0.07 ),
errmax = cms.double( 0.01 ),
Expand All @@ -5077,6 +5089,7 @@
useDensity = cms.bool( True ),
useDBSCAN = cms.bool( False ),
useIterative = cms.bool( False ),
doSplitting = cms.bool( True ),
minT = cms.int32( 2 ),
eps = cms.double( 0.07 ),
errmax = cms.double( 0.01 ),
Expand Down Expand Up @@ -5125,6 +5138,9 @@
useSimpleTripletCleaner = cms.bool( True ),
idealConditions = cms.bool( False ),
includeJumpingForwardDoublets = cms.bool( True ),
z0Cut = cms.double( 12.0 ),
ptCut = cms.double( 0.5 ),
phiCuts = cms.vint32( 522, 730, 730, 522, 626, 626, 522, 522, 626, 626, 626, 522, 522, 522, 522, 522, 522, 522, 522 ),
trackQualityCuts = cms.PSet(
chi2MaxPt = cms.double( 10.0 ),
tripletMaxTip = cms.double( 0.3 ),
Expand All @@ -5150,6 +5166,7 @@
useDensity = cms.bool( True ),
useDBSCAN = cms.bool( False ),
useIterative = cms.bool( False ),
doSplitting = cms.bool( True ),
minT = cms.int32( 2 ),
eps = cms.double( 0.07 ),
errmax = cms.double( 0.01 ),
Expand Down Expand Up @@ -5990,7 +6007,12 @@
ProductLabel = cms.InputTag( "rawDataCollector" )
)
fragment.hltSiStripRawToClustersFacility = cms.EDProducer( "SiStripClusterizerFromRaw",
ProductLabel = cms.InputTag( "rawDataCollector" ),
ConditionsLabel = cms.string( "" ),
onDemand = cms.bool( True ),
DoAPVEmulatorCheck = cms.bool( False ),
LegacyUnpacker = cms.bool( False ),
HybridZeroSuppressed = cms.bool( False ),
Clusterizer = cms.PSet(
ConditionsLabel = cms.string( "" ),
ClusterThreshold = cms.double( 5.0 ),
Expand All @@ -6012,10 +6034,7 @@
doAPVRestore = cms.bool( False ),
SiStripFedZeroSuppressionMode = cms.uint32( 4 ),
PedestalSubtractionFedMode = cms.bool( True )
),
DoAPVEmulatorCheck = cms.bool( False ),
HybridZeroSuppressed = cms.bool( False ),
ProductLabel = cms.InputTag( "rawDataCollector" )
)
)
fragment.hltSiStripClusters = cms.EDProducer( "MeasurementTrackerEventProducer",
measurementTracker = cms.string( "hltESPMeasurementTracker" ),
Expand Down Expand Up @@ -6314,6 +6333,7 @@
TTRHBuilder = cms.string( "hltESPTTRHBuilderPixelOnly" ),
usePV = cms.bool( False ),
includeFourthHit = cms.bool( True ),
produceComplement = cms.bool( False ),
SeedCreatorPSet = cms.PSet( refToPSet_ = cms.string( "HLTSeedFromProtoTracks" ) )
)
fragment.hltIter0IterL3MuonPixelSeedsFromPixelTracksFiltered = cms.EDProducer( "MuonHLTSeedMVAClassifier",
Expand Down Expand Up @@ -6610,6 +6630,7 @@
TTRHBuilder = cms.string( "hltESPTTRHBuilderPixelOnly" ),
usePV = cms.bool( False ),
includeFourthHit = cms.bool( True ),
produceComplement = cms.bool( False ),
SeedCreatorPSet = cms.PSet( refToPSet_ = cms.string( "HLTSeedFromProtoTracks" ) )
)
fragment.hltIter0IterL3FromL1MuonPixelSeedsFromPixelTracksFiltered = cms.EDProducer( "MuonHLTSeedMVAClassifier",
Expand Down Expand Up @@ -7205,6 +7226,7 @@
TTRHBuilder = cms.string( "hltESPTTRHBuilderPixelOnly" ),
usePV = cms.bool( False ),
includeFourthHit = cms.bool( True ),
produceComplement = cms.bool( False ),
SeedCreatorPSet = cms.PSet( refToPSet_ = cms.string( "HLTSeedFromProtoTracks" ) )
)
fragment.hltIter0PFlowCkfTrackCandidates = cms.EDProducer( "CkfTrackCandidateMaker",
Expand Down Expand Up @@ -7376,6 +7398,7 @@
produceIntermediateHitDoublets = cms.bool( False ),
maxElement = cms.uint32( 0 ),
maxElementTotal = cms.uint32( 50000000 ),
putEmptyIfMaxElementReached = cms.bool( False ),
layerPairs = cms.vuint32( 0 )
)
fragment.hltDoubletRecoveryPFlowPixelSeeds = cms.EDProducer( "SeedCreatorFromRegionConsecutiveHitsEDProducer",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# /dev/CMSSW_13_0_0/GRun
# /dev/CMSSW_13_2_0/GRun

import FWCore.ParameterSet.Config as cms

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# /dev/CMSSW_13_0_0/HIon
# /dev/CMSSW_13_2_0/HIon

import FWCore.ParameterSet.Config as cms

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# /dev/CMSSW_13_0_0/PIon
# /dev/CMSSW_13_2_0/PIon

import FWCore.ParameterSet.Config as cms

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# /dev/CMSSW_13_0_0/PRef
# /dev/CMSSW_13_2_0/PRef

import FWCore.ParameterSet.Config as cms

Expand Down
Loading