Skip to content

Commit bece389

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#42698 from cms-tsg-storm/HLTdevelopment132X_for133X
HLT menu development for `13_2_X` (2/N) [`13_3_X`]
2 parents dcf6d72 + eec755c commit bece389

25 files changed

+59794
-27956
lines changed

‎Configuration/HLT/python/autoCondHLT.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#Next time you change the customisations, change also the snapshot time in the affected tuple,
1515
#and leave unchanged the snapshot times for the other tuples.
1616

17-
l1Menus= {
17+
l1Menus = {
1818
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
1919
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
2020
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
@@ -23,7 +23,7 @@
2323
'2023v12' : ( ','.join( [ 'L1Menu_Collisions2023_v1_2_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-06-13 14:12:00.000"] ), ),
2424
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2022_v1_1_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-10-26 10:46:29.000"] ), ),
2525
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
26-
'PRef' : ( ','.join( [ 'L1Menu_pp502Collisions2017_v4_m6_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-11-03 18:00:00.000"] ), ),
26+
'PRef' : ( ','.join( [ 'L1Menu_CollisionsPPRef2023_v1_0_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-08-30 08:07:26.000"] ), ),
2727
}
2828

2929
hltGTs = {

‎HLTrigger/Configuration/python/HLT_2023v12_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hltGetConfiguration /frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT --cff --data --type 2023v12
22

3-
# /frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT/V6 (CMSSW_13_2_0)
3+
# /frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT/V7 (CMSSW_13_2_1)
44

55
import FWCore.ParameterSet.Config as cms
66

@@ -12,7 +12,7 @@
1212
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
1313

1414
fragment.HLTConfigVersion = cms.PSet(
15-
tableName = cms.string('/frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT/V6')
15+
tableName = cms.string('/frozen/2023/2e34/v1.2/CMSSW_13_2_X/HLT/V7')
1616
)
1717

1818
fragment.transferSystem = cms.PSet(

‎HLTrigger/Configuration/python/HLT_FULL_cff.py‎

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

‎HLTrigger/Configuration/python/HLT_Fake1_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# hltGetConfiguration /dev/CMSSW_13_2_0/Fake1 --cff --data --type Fake1
22

3-
# /dev/CMSSW_13_2_0/Fake1/V5 (CMSSW_13_2_0)
3+
# /dev/CMSSW_13_2_0/Fake1/V6 (CMSSW_13_2_1)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99

1010
fragment.HLTConfigVersion = cms.PSet(
11-
tableName = cms.string('/dev/CMSSW_13_2_0/Fake1/V5')
11+
tableName = cms.string('/dev/CMSSW_13_2_0/Fake1/V6')
1212
)
1313

1414
fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )

‎HLTrigger/Configuration/python/HLT_Fake2_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# hltGetConfiguration /dev/CMSSW_13_2_0/Fake2 --cff --data --type Fake2
22

3-
# /dev/CMSSW_13_2_0/Fake2/V5 (CMSSW_13_2_0)
3+
# /dev/CMSSW_13_2_0/Fake2/V6 (CMSSW_13_2_1)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99

1010
fragment.HLTConfigVersion = cms.PSet(
11-
tableName = cms.string('/dev/CMSSW_13_2_0/Fake2/V5')
11+
tableName = cms.string('/dev/CMSSW_13_2_0/Fake2/V6')
1212
)
1313

1414
fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )

‎HLTrigger/Configuration/python/HLT_Fake_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# hltGetConfiguration /dev/CMSSW_13_2_0/Fake --cff --data --type Fake
22

3-
# /dev/CMSSW_13_2_0/Fake/V5 (CMSSW_13_2_0)
3+
# /dev/CMSSW_13_2_0/Fake/V6 (CMSSW_13_2_1)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99

1010
fragment.HLTConfigVersion = cms.PSet(
11-
tableName = cms.string('/dev/CMSSW_13_2_0/Fake/V5')
11+
tableName = cms.string('/dev/CMSSW_13_2_0/Fake/V6')
1212
)
1313

1414
fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )

‎HLTrigger/Configuration/python/HLT_GRun_cff.py‎

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

‎HLTrigger/Configuration/python/HLT_HIon_cff.py‎

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

‎HLTrigger/Configuration/python/HLT_PIon_cff.py‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hltGetConfiguration /dev/CMSSW_13_2_0/PIon --cff --data --type PIon
22

3-
# /dev/CMSSW_13_2_0/PIon/V12 (CMSSW_13_2_0)
3+
# /dev/CMSSW_13_2_0/PIon/V21 (CMSSW_13_2_1)
44

55
import FWCore.ParameterSet.Config as cms
66

@@ -12,7 +12,7 @@
1212
fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
1313

1414
fragment.HLTConfigVersion = cms.PSet(
15-
tableName = cms.string('/dev/CMSSW_13_2_0/PIon/V12')
15+
tableName = cms.string('/dev/CMSSW_13_2_0/PIon/V21')
1616
)
1717

1818
fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet(
@@ -719,7 +719,7 @@
719719
requireSeedHitsInRebuild = cms.bool( True ),
720720
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
721721
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
722-
maxPtForLooperReconstruction = cms.double( 0.7 ),
722+
maxPtForLooperReconstruction = cms.double( 0.0 ),
723723
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
724724
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetInitialStepTrajectoryFilterPreSplittingForFullTrackingPPOnAA" ) ),
725725
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -774,7 +774,7 @@
774774
requireSeedHitsInRebuild = cms.bool( True ),
775775
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
776776
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
777-
maxPtForLooperReconstruction = cms.double( 0.7 ),
777+
maxPtForLooperReconstruction = cms.double( 0.0 ),
778778
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
779779
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetInitialStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
780780
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -822,7 +822,7 @@
822822
requireSeedHitsInRebuild = cms.bool( True ),
823823
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
824824
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
825-
maxPtForLooperReconstruction = cms.double( 0.7 ),
825+
maxPtForLooperReconstruction = cms.double( 0.0 ),
826826
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
827827
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetLowPtQuadStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
828828
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -870,7 +870,7 @@
870870
requireSeedHitsInRebuild = cms.bool( True ),
871871
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
872872
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
873-
maxPtForLooperReconstruction = cms.double( 0.7 ),
873+
maxPtForLooperReconstruction = cms.double( 0.0 ),
874874
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
875875
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetHighPtTripletStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
876876
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -918,7 +918,7 @@
918918
requireSeedHitsInRebuild = cms.bool( True ),
919919
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
920920
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
921-
maxPtForLooperReconstruction = cms.double( 0.7 ),
921+
maxPtForLooperReconstruction = cms.double( 0.0 ),
922922
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
923923
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetLowPtTripletStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
924924
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1014,7 +1014,7 @@
10141014
requireSeedHitsInRebuild = cms.bool( True ),
10151015
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
10161016
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1017-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1017+
maxPtForLooperReconstruction = cms.double( 0.0 ),
10181018
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
10191019
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetPixelPairStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
10201020
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1086,7 +1086,7 @@
10861086
requireSeedHitsInRebuild = cms.bool( True ),
10871087
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
10881088
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1089-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1089+
maxPtForLooperReconstruction = cms.double( 0.0 ),
10901090
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
10911091
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetPixelLessStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
10921092
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1158,7 +1158,7 @@
11581158
requireSeedHitsInRebuild = cms.bool( True ),
11591159
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
11601160
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1161-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1161+
maxPtForLooperReconstruction = cms.double( 0.0 ),
11621162
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
11631163
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetTobTecStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
11641164
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1206,7 +1206,7 @@
12061206
requireSeedHitsInRebuild = cms.bool( True ),
12071207
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
12081208
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1209-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1209+
maxPtForLooperReconstruction = cms.double( 0.0 ),
12101210
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
12111211
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetJetCoreStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
12121212
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1254,7 +1254,7 @@
12541254
requireSeedHitsInRebuild = cms.bool( True ),
12551255
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
12561256
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1257-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1257+
maxPtForLooperReconstruction = cms.double( 0.0 ),
12581258
propagatorOpposite = cms.string( "PropagatorWithMaterialForMixedStepOpposite" ),
12591259
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetMixedTripletStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
12601260
propagatorAlong = cms.string( "PropagatorWithMaterialForMixedStep" ),
@@ -1278,7 +1278,7 @@
12781278
requireSeedHitsInRebuild = cms.bool( True ),
12791279
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
12801280
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1281-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1281+
maxPtForLooperReconstruction = cms.double( 0.0 ),
12821282
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
12831283
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetDetachedQuadStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
12841284
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1302,7 +1302,7 @@
13021302
requireSeedHitsInRebuild = cms.bool( True ),
13031303
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
13041304
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1305-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1305+
maxPtForLooperReconstruction = cms.double( 0.0 ),
13061306
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
13071307
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetDetachedTripletStepTrajectoryFilterForFullTrackingPPOnAA" ) ),
13081308
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1350,7 +1350,7 @@
13501350
requireSeedHitsInRebuild = cms.bool( True ),
13511351
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
13521352
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1353-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1353+
maxPtForLooperReconstruction = cms.double( 0.0 ),
13541354
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
13551355
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetInitialStepTrajectoryFilterForDmesonPPOnAA" ) ),
13561356
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1398,7 +1398,7 @@
13981398
requireSeedHitsInRebuild = cms.bool( True ),
13991399
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
14001400
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1401-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1401+
maxPtForLooperReconstruction = cms.double( 0.0 ),
14021402
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
14031403
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetLowPtQuadStepTrajectoryFilterForDmesonPPOnAA" ) ),
14041404
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1446,7 +1446,7 @@
14461446
requireSeedHitsInRebuild = cms.bool( True ),
14471447
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
14481448
maxDPhiForLooperReconstruction = cms.double( 2.0 ),
1449-
maxPtForLooperReconstruction = cms.double( 0.7 ),
1449+
maxPtForLooperReconstruction = cms.double( 0.0 ),
14501450
propagatorOpposite = cms.string( "PropagatorWithMaterialParabolicMfOpposite" ),
14511451
trajectoryFilter = cms.PSet( refToPSet_ = cms.string( "HLTPSetHighPtTripletStepTrajectoryFilterForDmesonPPOnAA" ) ),
14521452
propagatorAlong = cms.string( "PropagatorWithMaterialParabolicMf" ),
@@ -1477,6 +1477,11 @@
14771477
'HLT_ZeroBias_v8' )
14781478
)
14791479

1480+
fragment.hltESSTfGraphRecord = cms.ESSource( "EmptyESSource",
1481+
recordName = cms.string( "TfGraphRecord" ),
1482+
iovIsRunNotTime = cms.bool( True ),
1483+
firstValid = cms.vuint32( 1 )
1484+
)
14801485
fragment.CSCChannelMapperESSource = cms.ESSource( "EmptyESSource",
14811486
recordName = cms.string( "CSCChannelMapperRecord" ),
14821487
iovIsRunNotTime = cms.bool( True ),
@@ -1613,6 +1618,11 @@
16131618
appendToDataLabel = cms.string( "" )
16141619
)
16151620

1621+
fragment.hltESPTrackSelectionTfCKF = cms.ESProducer( "TfGraphDefProducer",
1622+
ComponentName = cms.string( "hltESPTrackSelectionTfCKF" ),
1623+
FileName = cms.FileInPath( "RecoTracker/FinalTrackSelectors/data/TrackTfClassifier/CKF_Run3_12_5_0_pre5.pb" ),
1624+
appendToDataLabel = cms.string( "" )
1625+
)
16161626
fragment.AnyDirectionAnalyticalPropagator = cms.ESProducer( "AnalyticalPropagatorESProducer",
16171627
MaxDPhi = cms.double( 1.6 ),
16181628
ComponentName = cms.string( "AnyDirectionAnalyticalPropagator" ),

0 commit comments

Comments
 (0)