Skip to content

Commit 640cd98

Browse files
authored
Merge pull request #46048 from cms-tsg-storm/HLTdevelopment140X_for142X
HLT menu development for `14_0_X` (10/N) [`14_2_X`]
2 parents 354a892 + c171eb2 commit 640cd98

24 files changed

+1771
-2235
lines changed

Configuration/HLT/python/addOnTestsHLT.py

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

Configuration/HLT/python/autoCondHLT.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
'2024v14' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-03 09:00:00.000"] ), ),
2424
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2023_v1_1_5_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-10-24 16:59:55.000"] ), ),
2525
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
26-
'PRef' : ( ','.join( [ 'L1Menu_CollisionsPPRef2023_v1_1_2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-09-21 19:00:00.000"] ), ),
26+
'PRef' : ( ','.join( [ 'L1Menu_CollisionsPPRef2024_v0_0_2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-09-08 12:00:00.000"] ), ),
2727
'Special' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-03 09:00:00.000"] ), ),
2828
}
2929

HLTrigger/Configuration/python/HLT_FULL_cff.py

Lines changed: 353 additions & 427 deletions
Large diffs are not rendered by default.

HLTrigger/Configuration/python/HLT_GRun_cff.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hltGetConfiguration /dev/CMSSW_14_0_0/GRun --cff --data --type GRun
22

3-
# /dev/CMSSW_14_0_0/GRun/V169 (CMSSW_14_0_11)
3+
# /dev/CMSSW_14_0_0/GRun/V181 (CMSSW_14_0_11)
44

55
import FWCore.ParameterSet.Config as cms
66

@@ -9,7 +9,7 @@
99
fragment.load("Configuration.StandardSequences.Accelerators_cff")
1010

1111
fragment.HLTConfigVersion = cms.PSet(
12-
tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V169")
12+
tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V181")
1313
)
1414

1515
fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet(
@@ -5495,7 +5495,7 @@
54955495
appendToDataLabel = cms.string( "" ),
54965496
alpaka = cms.untracked.PSet( backend = cms.untracked.string( "" ) )
54975497
)
5498-
fragment.hltESPPixelCPEFastHIon = cms.ESProducer( "PixelCPEFastESProducerHIonPhase1",
5498+
fragment.hltESPPixelCPEFastParamsHIonPhase1 = cms.ESProducer( "PixelCPEFastParamsESProducerAlpakaHIonPhase1@alpaka",
54995499
LoadTemplatesFromDB = cms.bool( True ),
55005500
Alpha2Order = cms.bool( True ),
55015501
ClusterProbComputationFlag = cms.int32( 0 ),
@@ -5521,7 +5521,7 @@
55215521
EdgeClusterErrorY = cms.double( 85.0 ),
55225522
UseErrorsFromTemplates = cms.bool( True ),
55235523
TruncatePixelCharge = cms.bool( True ),
5524-
ComponentName = cms.string( "hltESPPixelCPEFastHIon" ),
5524+
ComponentName = cms.string( "PixelCPEFastParamsHIonPhase1" ),
55255525
MagneticFieldRecord = cms.ESInputTag( "","" ),
55265526
appendToDataLabel = cms.string( "" )
55275527
)
@@ -14621,15 +14621,15 @@
1462114621
offset = cms.uint32( 0 ),
1462214622
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" )
1462314623
)
14624-
fragment.hltPixelRecHitsSoAMonitorCPU = cms.EDProducer( "SiPixelPhase1MonitorRecHitsSoAAlpaka",
14624+
fragment.hltSiPixelRecHitsSoAMonitorCPU = cms.EDProducer( "SiPixelPhase1MonitorRecHitsSoAAlpaka",
1462514625
pixelHitsSrc = cms.InputTag( "hltSiPixelRecHitsSoASerialSync" ),
1462614626
TopFolderName = cms.string( "SiPixelHeterogeneous/PixelRecHitsCPU" )
1462714627
)
14628-
fragment.hltPixelRecHitsSoAMonitorGPU = cms.EDProducer( "SiPixelPhase1MonitorRecHitsSoAAlpaka",
14628+
fragment.hltSiPixelRecHitsSoAMonitorGPU = cms.EDProducer( "SiPixelPhase1MonitorRecHitsSoAAlpaka",
1462914629
pixelHitsSrc = cms.InputTag( "hltSiPixelRecHitsSoA" ),
1463014630
TopFolderName = cms.string( "SiPixelHeterogeneous/PixelRecHitsGPU" )
1463114631
)
14632-
fragment.hltPixelRecHitsSoACompareGPUvsCPU = cms.EDProducer( "SiPixelPhase1CompareRecHits",
14632+
fragment.hltSiPixelRecHitsSoACompareGPUvsCPU = cms.EDProducer( "SiPixelPhase1CompareRecHits",
1463314633
pixelHitsReferenceSoA = cms.InputTag( "hltSiPixelRecHitsSoASerialSync" ),
1463414634
pixelHitsTargetSoA = cms.InputTag( "hltSiPixelRecHitsSoA" ),
1463514635
topFolderName = cms.string( "SiPixelHeterogeneous/PixelRecHitsCompareGPUvsCPU" ),
@@ -14653,19 +14653,19 @@
1465314653
topFolderName = cms.string( "SiPixelHeterogeneous/PixelTrackCompareGPUvsCPU" ),
1465414654
useQualityCut = cms.bool( True ),
1465514655
minQuality = cms.string( "loose" ),
14656-
deltaR2cut = cms.double( 0.04 )
14656+
deltaR2cut = cms.double( 4.0E-4 )
1465714657
)
14658-
fragment.hltPixelVertexSoAMonitorCPU = cms.EDProducer( "SiPixelMonitorVertexSoAAlpaka",
14658+
fragment.hltPixelVerticesSoAMonitorCPU = cms.EDProducer( "SiPixelMonitorVertexSoAAlpaka",
1465914659
pixelVertexSrc = cms.InputTag( "hltPixelVerticesSoASerialSync" ),
1466014660
beamSpotSrc = cms.InputTag( "hltOnlineBeamSpot" ),
1466114661
topFolderName = cms.string( "SiPixelHeterogeneous/PixelVertexCPU" )
1466214662
)
14663-
fragment.hltPixelVertexSoAMonitorGPU = cms.EDProducer( "SiPixelMonitorVertexSoAAlpaka",
14663+
fragment.hltPixelVerticesSoAMonitorGPU = cms.EDProducer( "SiPixelMonitorVertexSoAAlpaka",
1466414664
pixelVertexSrc = cms.InputTag( "hltPixelVerticesSoA" ),
1466514665
beamSpotSrc = cms.InputTag( "hltOnlineBeamSpot" ),
1466614666
topFolderName = cms.string( "SiPixelHeterogeneous/PixelVertexGPU" )
1466714667
)
14668-
fragment.hltPixelVertexSoACompareGPUvsCPU = cms.EDProducer( "SiPixelCompareVertices",
14668+
fragment.hltPixelVerticesSoACompareGPUvsCPU = cms.EDProducer( "SiPixelCompareVertices",
1466914669
pixelVertexReferenceSoA = cms.InputTag( "hltPixelVerticesSoASerialSync" ),
1467014670
pixelVertexTargetSoA = cms.InputTag( "hltPixelVerticesSoA" ),
1467114671
beamSpotSrc = cms.InputTag( "hltOnlineBeamSpot" ),
@@ -16410,8 +16410,8 @@
1641016410
thresh_PFClusterES = cms.double( 0.5 ),
1641116411
seedThresholdIsET = cms.bool( True ),
1641216412
isOOTCollection = cms.bool( False ),
16413-
barrelRecHits = cms.InputTag( 'ecalRecHit','EcalRecHitsEE' ),
16414-
endcapRecHits = cms.InputTag( 'ecalRecHit','EcalRecHitsEB' ),
16413+
barrelRecHits = cms.InputTag( "" ),
16414+
endcapRecHits = cms.InputTag( "" ),
1641516415
PFSuperClusterCollectionEndcapWithPreshower = cms.string( "hltParticleFlowSuperClusterECALEndcapWithPreshower" ),
1641616416
dropUnseedable = cms.bool( False ),
1641716417
ClusteringType = cms.string( "Mustache" )
@@ -17907,8 +17907,8 @@
1790717907
thresh_PFClusterES = cms.double( 0.5 ),
1790817908
seedThresholdIsET = cms.bool( True ),
1790917909
isOOTCollection = cms.bool( False ),
17910-
barrelRecHits = cms.InputTag( 'ecalRecHit','EcalRecHitsEE' ),
17911-
endcapRecHits = cms.InputTag( 'ecalRecHit','EcalRecHitsEB' ),
17910+
barrelRecHits = cms.InputTag( "" ),
17911+
endcapRecHits = cms.InputTag( "" ),
1791217912
PFSuperClusterCollectionEndcapWithPreshower = cms.string( "hltParticleFlowSuperClusterECALEndcapWithPreshower" ),
1791317913
dropUnseedable = cms.bool( False ),
1791417914
ClusteringType = cms.string( "Mustache" )
@@ -87629,7 +87629,7 @@
8762987629
fragment.HLTAK8PFCorrectorProducersSequence = cms.Sequence( fragment.hltAK8PFFastJetCorrector + fragment.hltAK8PFRelativeCorrector + fragment.hltAK8PFAbsoluteCorrector + fragment.hltAK8PFResidualCorrector + fragment.hltAK8PFCorrector )
8763087630
fragment.HLTAK8PFJetsCorrectionSequence = cms.Sequence( fragment.hltFixedGridRhoFastjetAll + fragment.HLTAK8PFCorrectorProducersSequence + fragment.hltAK8PFJetsCorrected + fragment.hltAK8PFJetsLooseIDCorrected + fragment.hltAK8PFJetsTightIDCorrected )
8763187631
fragment.HLTAK8PFJetsSequence = cms.Sequence( fragment.HLTPreAK8PFJetsRecoSequence + fragment.HLTAK8PFJetsReconstructionSequence + fragment.HLTAK8PFJetsCorrectionSequence )
87632-
fragment.HLTDQMPixelReconstruction = cms.Sequence( fragment.hltPixelRecHitsSoAMonitorCPU + fragment.hltPixelRecHitsSoAMonitorGPU + fragment.hltPixelRecHitsSoACompareGPUvsCPU + fragment.hltPixelTracksSoAMonitorCPU + fragment.hltPixelTracksSoAMonitorGPU + fragment.hltPixelTracksSoACompareGPUvsCPU + fragment.hltPixelVertexSoAMonitorCPU + fragment.hltPixelVertexSoAMonitorGPU + fragment.hltPixelVertexSoACompareGPUvsCPU )
87632+
fragment.HLTDQMPixelReconstruction = cms.Sequence( fragment.hltSiPixelRecHitsSoAMonitorCPU + fragment.hltSiPixelRecHitsSoAMonitorGPU + fragment.hltSiPixelRecHitsSoACompareGPUvsCPU + fragment.hltPixelTracksSoAMonitorCPU + fragment.hltPixelTracksSoAMonitorGPU + fragment.hltPixelTracksSoACompareGPUvsCPU + fragment.hltPixelVerticesSoAMonitorCPU + fragment.hltPixelVerticesSoAMonitorGPU + fragment.hltPixelVerticesSoACompareGPUvsCPU )
8763387633
fragment.HLTL2muonrecoSequenceNoVtx = cms.Sequence( fragment.HLTL2muonrecoNocandSequence + fragment.hltL2MuonCandidatesNoVtx )
8763487634
fragment.HLTIterL3OImuonTkCandidateSequenceNoVtx = cms.Sequence( fragment.hltIterL3OISeedsFromL2MuonsNoVtx + fragment.hltIterL3OITrackCandidatesNoVtx + fragment.hltIterL3OIMuCtfWithMaterialTracksNoVtx + fragment.hltIterL3OIMuonTrackCutClassifierNoVtx + fragment.hltIterL3OIMuonTrackSelectionHighPurityNoVtx + fragment.hltL3MuonsIterL3OINoVtx )
8763587635
fragment.HLTIterL3MuonRecoPixelTracksSequenceNoVtx = cms.Sequence( fragment.HLTRecopixelvertexingSequence + fragment.hltIterL3MuonPixelTracksTrackingRegionsNoVtx + fragment.hltPixelTracksInRegionL2NoVtx )

0 commit comments

Comments
 (0)