Skip to content

Commit 80fe037

Browse files
cmsbuildcmsbuild
authored
Merge pull request #46804 from cms-tsg-storm/HLTdevelopment141X_for150X
HLT menu development for `14_1_X` (4/N) [`15_0_X`]
2 parents 1108aa4 + db1d41b commit 80fe037

21 files changed

+1228
-719
lines changed

‎Configuration/AlCa/python/autoCond.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
# GlobalTag for MC production (cosmics) with perfectly aligned and calibrated detector for Phase1 2024, Strip tracker in DECO mode
9999
'phase1_2024_cosmics_design' : '140X_mcRun3_2024cosmics_design_deco_v11',
100100
# GlobalTag for MC production with realistic conditions for Phase1 2024 detector for Heavy Ion
101-
'phase1_2024_realistic_hi' : '141X_mcRun3_2024_realistic_HI_v8',
101+
'phase1_2024_realistic_hi' : '141X_mcRun3_2024_realistic_HI_v10',
102102
# GlobalTag for MC production with realistic conditions for Phase1 2024 detector for ppRef5TeV
103103
'phase1_2024_realistic_ppRef5TeV' : '141X_mcRun3_2024_realistic_ppRef5TeV_v5',
104104
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2025

‎Configuration/HLT/python/autoCondHLT.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
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"] ), ),
21-
'FULL' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-03 09:00:00.000"] ), ),
22-
'GRun' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-03 09:00:00.000"] ), ),
23-
'2024v14' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-03 09:00:00.000"] ), ),
24-
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2024_v1_0_5_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-10-11 21:16:08.000"] ), ),
21+
'FULL' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-26 09:00:00.000"] ), ),
22+
'GRun' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-26 09:00:00.000"] ), ),
23+
'2024v14' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-26 09:00:00.000"] ), ),
24+
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2024_v1_0_6_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-11-05 11:11:22.000"] ), ),
2525
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
2626
'PRef' : ( ','.join( [ 'L1Menu_CollisionsPPRef2024_v1_0_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-09-24 11:45:00.000"] ), ),
27-
'Special' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-03 09:00:00.000"] ), ),
27+
'Special' : ( ','.join( [ 'L1Menu_Collisions2024_v1_3_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-07-26 09:00:00.000"] ), ),
2828
}
2929

3030
hltGTs = {

‎HLTrigger/Configuration/python/HLT_FULL_cff.py‎

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

‎HLTrigger/Configuration/python/HLT_GRun_cff.py‎

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

3-
# /dev/CMSSW_14_1_0/GRun/V40 (CMSSW_14_1_1)
3+
# /dev/CMSSW_14_1_0/GRun/V50 (CMSSW_14_1_1)
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_1_0/GRun/V40")
12+
tableName = cms.string("/dev/CMSSW_14_1_0/GRun/V50")
1313
)
1414

1515
fragment.HLTGroupedCkfTrajectoryBuilderP5 = cms.PSet(
@@ -6406,8 +6406,8 @@
64066406
recoverEEFE = cms.bool( False ),
64076407
dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ),
64086408
dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ),
6409-
logWarningEtThreshold_EB_FE = cms.double( 50.0 ),
6410-
logWarningEtThreshold_EE_FE = cms.double( 50.0 ),
6409+
logWarningEtThreshold_EB_FE = cms.double( -1.0 ),
6410+
logWarningEtThreshold_EE_FE = cms.double( -1.0 ),
64116411
ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ),
64126412
eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ),
64136413
ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ),
@@ -11160,8 +11160,8 @@
1116011160
recoverEEFE = cms.bool( False ),
1116111161
dbStatusToBeExcludedEE = cms.vint32( 14, 78, 142 ),
1116211162
dbStatusToBeExcludedEB = cms.vint32( 14, 78, 142 ),
11163-
logWarningEtThreshold_EB_FE = cms.double( 50.0 ),
11164-
logWarningEtThreshold_EE_FE = cms.double( 50.0 ),
11163+
logWarningEtThreshold_EB_FE = cms.double( -1.0 ),
11164+
logWarningEtThreshold_EE_FE = cms.double( -1.0 ),
1116511165
ebDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebDetId' ),
1116611166
eeDetIdToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','eeDetId' ),
1116711167
ebFEToBeRecovered = cms.InputTag( 'hltEcalDetIdToBeRecovered','ebFE' ),

0 commit comments

Comments
 (0)