Skip to content

Commit

Permalink
Merge pull request #46049 from cms-tsg-storm/HLTdevelopment140X_for141X
Browse files Browse the repository at this point in the history
HLT menu development for `14_0_X` (10/N) [`14_1_X`]
  • Loading branch information
cmsbuild authored Sep 20, 2024
2 parents 3bd1233 + c8466d4 commit d88ba97
Show file tree
Hide file tree
Showing 23 changed files with 1,771 additions and 2,170 deletions.
32 changes: 16 additions & 16 deletions Configuration/HLT/python/addOnTestsHLT.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Configuration/HLT/python/autoCondHLT.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
'2024v14' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-03 09:00:00.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2023_v1_1_5_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-10-24 16:59:55.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_CollisionsPPRef2023_v1_1_2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-09-21 19:00:00.000"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_CollisionsPPRef2024_v0_0_2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-09-08 12:00:00.000"] ), ),
'Special' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-03 09:00:00.000"] ), ),
}

Expand Down
780 changes: 353 additions & 427 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hltGetConfiguration /dev/CMSSW_14_0_0/GRun --cff --data --type GRun

# /dev/CMSSW_14_0_0/GRun/V169 (CMSSW_14_0_11)
# /dev/CMSSW_14_0_0/GRun/V181 (CMSSW_14_0_11)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment.load("Configuration.StandardSequences.Accelerators_cff")

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V169")
tableName = cms.string("/dev/CMSSW_14_0_0/GRun/V181")
)

fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet(
Expand Down Expand Up @@ -5495,7 +5495,7 @@
appendToDataLabel = cms.string( "" ),
alpaka = cms.untracked.PSet( backend = cms.untracked.string( "" ) )
)
fragment.hltESPPixelCPEFastHIon = cms.ESProducer( "PixelCPEFastESProducerHIonPhase1",
fragment.hltESPPixelCPEFastParamsHIonPhase1 = cms.ESProducer( "PixelCPEFastParamsESProducerAlpakaHIonPhase1@alpaka",
LoadTemplatesFromDB = cms.bool( True ),
Alpha2Order = cms.bool( True ),
ClusterProbComputationFlag = cms.int32( 0 ),
Expand All @@ -5521,7 +5521,7 @@
EdgeClusterErrorY = cms.double( 85.0 ),
UseErrorsFromTemplates = cms.bool( True ),
TruncatePixelCharge = cms.bool( True ),
ComponentName = cms.string( "hltESPPixelCPEFastHIon" ),
ComponentName = cms.string( "PixelCPEFastParamsHIonPhase1" ),
MagneticFieldRecord = cms.ESInputTag( "","" ),
appendToDataLabel = cms.string( "" )
)
Expand Down Expand Up @@ -14621,15 +14621,15 @@
offset = cms.uint32( 0 ),
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" )
)
fragment.hltPixelRecHitsSoAMonitorCPU = cms.EDProducer( "SiPixelPhase1MonitorRecHitsSoAAlpaka",
fragment.hltSiPixelRecHitsSoAMonitorCPU = cms.EDProducer( "SiPixelPhase1MonitorRecHitsSoAAlpaka",
pixelHitsSrc = cms.InputTag( "hltSiPixelRecHitsSoASerialSync" ),
TopFolderName = cms.string( "SiPixelHeterogeneous/PixelRecHitsCPU" )
)
fragment.hltPixelRecHitsSoAMonitorGPU = cms.EDProducer( "SiPixelPhase1MonitorRecHitsSoAAlpaka",
fragment.hltSiPixelRecHitsSoAMonitorGPU = cms.EDProducer( "SiPixelPhase1MonitorRecHitsSoAAlpaka",
pixelHitsSrc = cms.InputTag( "hltSiPixelRecHitsSoA" ),
TopFolderName = cms.string( "SiPixelHeterogeneous/PixelRecHitsGPU" )
)
fragment.hltPixelRecHitsSoACompareGPUvsCPU = cms.EDProducer( "SiPixelPhase1CompareRecHits",
fragment.hltSiPixelRecHitsSoACompareGPUvsCPU = cms.EDProducer( "SiPixelPhase1CompareRecHits",
pixelHitsReferenceSoA = cms.InputTag( "hltSiPixelRecHitsSoASerialSync" ),
pixelHitsTargetSoA = cms.InputTag( "hltSiPixelRecHitsSoA" ),
topFolderName = cms.string( "SiPixelHeterogeneous/PixelRecHitsCompareGPUvsCPU" ),
Expand All @@ -14653,19 +14653,19 @@
topFolderName = cms.string( "SiPixelHeterogeneous/PixelTrackCompareGPUvsCPU" ),
useQualityCut = cms.bool( True ),
minQuality = cms.string( "loose" ),
deltaR2cut = cms.double( 0.04 )
deltaR2cut = cms.double( 4.0E-4 )
)
fragment.hltPixelVertexSoAMonitorCPU = cms.EDProducer( "SiPixelMonitorVertexSoAAlpaka",
fragment.hltPixelVerticesSoAMonitorCPU = cms.EDProducer( "SiPixelMonitorVertexSoAAlpaka",
pixelVertexSrc = cms.InputTag( "hltPixelVerticesSoASerialSync" ),
beamSpotSrc = cms.InputTag( "hltOnlineBeamSpot" ),
topFolderName = cms.string( "SiPixelHeterogeneous/PixelVertexCPU" )
)
fragment.hltPixelVertexSoAMonitorGPU = cms.EDProducer( "SiPixelMonitorVertexSoAAlpaka",
fragment.hltPixelVerticesSoAMonitorGPU = cms.EDProducer( "SiPixelMonitorVertexSoAAlpaka",
pixelVertexSrc = cms.InputTag( "hltPixelVerticesSoA" ),
beamSpotSrc = cms.InputTag( "hltOnlineBeamSpot" ),
topFolderName = cms.string( "SiPixelHeterogeneous/PixelVertexGPU" )
)
fragment.hltPixelVertexSoACompareGPUvsCPU = cms.EDProducer( "SiPixelCompareVertices",
fragment.hltPixelVerticesSoACompareGPUvsCPU = cms.EDProducer( "SiPixelCompareVertices",
pixelVertexReferenceSoA = cms.InputTag( "hltPixelVerticesSoASerialSync" ),
pixelVertexTargetSoA = cms.InputTag( "hltPixelVerticesSoA" ),
beamSpotSrc = cms.InputTag( "hltOnlineBeamSpot" ),
Expand Down Expand Up @@ -16410,8 +16410,8 @@
thresh_PFClusterES = cms.double( 0.5 ),
seedThresholdIsET = cms.bool( True ),
isOOTCollection = cms.bool( False ),
barrelRecHits = cms.InputTag( 'ecalRecHit','EcalRecHitsEE' ),
endcapRecHits = cms.InputTag( 'ecalRecHit','EcalRecHitsEB' ),
barrelRecHits = cms.InputTag( "" ),
endcapRecHits = cms.InputTag( "" ),
PFSuperClusterCollectionEndcapWithPreshower = cms.string( "hltParticleFlowSuperClusterECALEndcapWithPreshower" ),
dropUnseedable = cms.bool( False ),
ClusteringType = cms.string( "Mustache" )
Expand Down Expand Up @@ -17907,8 +17907,8 @@
thresh_PFClusterES = cms.double( 0.5 ),
seedThresholdIsET = cms.bool( True ),
isOOTCollection = cms.bool( False ),
barrelRecHits = cms.InputTag( 'ecalRecHit','EcalRecHitsEE' ),
endcapRecHits = cms.InputTag( 'ecalRecHit','EcalRecHitsEB' ),
barrelRecHits = cms.InputTag( "" ),
endcapRecHits = cms.InputTag( "" ),
PFSuperClusterCollectionEndcapWithPreshower = cms.string( "hltParticleFlowSuperClusterECALEndcapWithPreshower" ),
dropUnseedable = cms.bool( False ),
ClusteringType = cms.string( "Mustache" )
Expand Down Expand Up @@ -87629,7 +87629,7 @@
fragment.HLTAK8PFCorrectorProducersSequence = cms.Sequence( fragment.hltAK8PFFastJetCorrector + fragment.hltAK8PFRelativeCorrector + fragment.hltAK8PFAbsoluteCorrector + fragment.hltAK8PFResidualCorrector + fragment.hltAK8PFCorrector )
fragment.HLTAK8PFJetsCorrectionSequence = cms.Sequence( fragment.hltFixedGridRhoFastjetAll + fragment.HLTAK8PFCorrectorProducersSequence + fragment.hltAK8PFJetsCorrected + fragment.hltAK8PFJetsLooseIDCorrected + fragment.hltAK8PFJetsTightIDCorrected )
fragment.HLTAK8PFJetsSequence = cms.Sequence( fragment.HLTPreAK8PFJetsRecoSequence + fragment.HLTAK8PFJetsReconstructionSequence + fragment.HLTAK8PFJetsCorrectionSequence )
fragment.HLTDQMPixelReconstruction = cms.Sequence( fragment.hltPixelRecHitsSoAMonitorCPU + fragment.hltPixelRecHitsSoAMonitorGPU + fragment.hltPixelRecHitsSoACompareGPUvsCPU + fragment.hltPixelTracksSoAMonitorCPU + fragment.hltPixelTracksSoAMonitorGPU + fragment.hltPixelTracksSoACompareGPUvsCPU + fragment.hltPixelVertexSoAMonitorCPU + fragment.hltPixelVertexSoAMonitorGPU + fragment.hltPixelVertexSoACompareGPUvsCPU )
fragment.HLTDQMPixelReconstruction = cms.Sequence( fragment.hltSiPixelRecHitsSoAMonitorCPU + fragment.hltSiPixelRecHitsSoAMonitorGPU + fragment.hltSiPixelRecHitsSoACompareGPUvsCPU + fragment.hltPixelTracksSoAMonitorCPU + fragment.hltPixelTracksSoAMonitorGPU + fragment.hltPixelTracksSoACompareGPUvsCPU + fragment.hltPixelVerticesSoAMonitorCPU + fragment.hltPixelVerticesSoAMonitorGPU + fragment.hltPixelVerticesSoACompareGPUvsCPU )
fragment.HLTL2muonrecoSequenceNoVtx = cms.Sequence( fragment.HLTL2muonrecoNocandSequence + fragment.hltL2MuonCandidatesNoVtx )
fragment.HLTIterL3OImuonTkCandidateSequenceNoVtx = cms.Sequence( fragment.hltIterL3OISeedsFromL2MuonsNoVtx + fragment.hltIterL3OITrackCandidatesNoVtx + fragment.hltIterL3OIMuCtfWithMaterialTracksNoVtx + fragment.hltIterL3OIMuonTrackCutClassifierNoVtx + fragment.hltIterL3OIMuonTrackSelectionHighPurityNoVtx + fragment.hltL3MuonsIterL3OINoVtx )
fragment.HLTIterL3MuonRecoPixelTracksSequenceNoVtx = cms.Sequence( fragment.HLTRecopixelvertexingSequence + fragment.hltIterL3MuonPixelTracksTrackingRegionsNoVtx + fragment.hltPixelTracksInRegionL2NoVtx )
Expand Down
Loading

0 comments on commit d88ba97

Please sign in to comment.