Merge pull request #45160 from cms-tsg-storm/HLTdevelopment140X_for141X

HLT menu development for `14_0_X` (8/N) [`14_1_X`]
cms-sw · Jun 11, 2024 · 6aae8dc · 6aae8dc
2 parents 4639c10 + 6de0ecf
commit 6aae8dc
Show file tree

Hide file tree

Showing 33 changed files with 27,758 additions and 24,062 deletions.
diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -20,7 +20,7 @@
     'Fake2'        : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml'                         ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
     'FULL'         : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
     'GRun'         : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
-    '2024v12'      : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12:00:00.000"] ), ),
+    '2024v13'      : ( ','.join( [ 'L1Menu_Collisions2024_v1_2_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2024-04-24 12: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"] ), ),
@@ -37,7 +37,7 @@
     'run2_mc_Fake2'          : ('run2_mc'                 ,l1Menus['Fake2']),
     'run3_mc_FULL'           : ('phase1_2024_realistic'   ,l1Menus['FULL']),
     'run3_mc_GRun'           : ('phase1_2024_realistic'   ,l1Menus['GRun']),
-    'run3_mc_2024v12'        : ('phase1_2024_realistic'   ,l1Menus['2024v12']),
+    'run3_mc_2024v13'        : ('phase1_2024_realistic'   ,l1Menus['2024v13']),
     'run3_mc_HIon'           : ('phase1_2023_realistic_hi',l1Menus['HIon']),
     'run3_mc_PIon'           : ('phase1_2024_realistic'   ,l1Menus['PIon']),
     'run3_mc_PRef'           : ('phase1_2024_realistic'   ,l1Menus['PRef']),
@@ -49,7 +49,7 @@
     'run2_hlt_Fake2'         : ('run2_hlt_relval'         ,l1Menus['Fake2']),
     'run3_hlt_FULL'          : ('run3_hlt'                ,l1Menus['FULL']),
     'run3_hlt_GRun'          : ('run3_hlt'                ,l1Menus['GRun']),
-    'run3_hlt_2024v12'       : ('run3_hlt'                ,l1Menus['2024v12']),
+    'run3_hlt_2024v13'       : ('run3_hlt'                ,l1Menus['2024v13']),
     'run3_hlt_HIon'          : ('run3_hlt'                ,l1Menus['HIon']),
     'run3_hlt_PIon'          : ('run3_hlt'                ,l1Menus['PIon']),
     'run3_hlt_PRef'          : ('run3_hlt'                ,l1Menus['PRef']),
@@ -61,7 +61,7 @@
     'run2_data_Fake2'        : ('run2_data'               ,l1Menus['Fake2']),
     'run3_data_FULL'         : ('run3_data_prompt'        ,l1Menus['FULL']),
     'run3_data_GRun'         : ('run3_data_prompt'        ,l1Menus['GRun']),
-    'run3_data_2024v12'      : ('run3_data_prompt'        ,l1Menus['2024v12']),
+    'run3_data_2024v13'      : ('run3_data_prompt'        ,l1Menus['2024v13']),
     'run3_data_HIon'         : ('run3_data_prompt'        ,l1Menus['HIon']),
     'run3_data_PIon'         : ('run3_data_prompt'        ,l1Menus['PIon']),
     'run3_data_PRef'         : ('run3_data_prompt'        ,l1Menus['PRef']),

diff --git a/...r/Configuration/python/HLT_2024v12_cff.py → ...r/Configuration/python/HLT_2024v13_cff.py b/...r/Configuration/python/HLT_2024v12_cff.py → ...r/Configuration/python/HLT_2024v13_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/PIon --cff --data --type PIon
 
-# /dev/CMSSW_14_0_0/PIon/V124 (CMSSW_14_0_6)
+# /dev/CMSSW_14_0_0/PIon/V141 (CMSSW_14_0_6)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -9,7 +9,7 @@
 fragment.load("Configuration.StandardSequences.Accelerators_cff")
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V124")
+  tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V141")
 )
 
 fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 
@@ -3608,10 +3608,6 @@
     offset = cms.uint32( 0 ),
     L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" )
 )
-fragment.hltFEDSelectorTCDS = cms.EDProducer( "EvFFEDSelector",
-    inputTag = cms.InputTag( "rawDataCollector" ),
-    fedList = cms.vuint32( 1024, 1025 )
-)
 fragment.hltTriggerSummaryAOD = cms.EDProducer( "TriggerSummaryProducerAOD",
     throw = cms.bool( False ),
     processName = cms.string( "@" ),
@@ -3695,7 +3691,7 @@
 fragment.HLT_Random_v3 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPreRandom + fragment.HLTEndSequence )
 fragment.HLT_Physics_v12 = cms.Path( fragment.HLTBeginSequenceL1Fat + fragment.hltPrePhysics + fragment.HLTEndSequence )
 fragment.HLT_ZeroBias_v11 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sZeroBias + fragment.hltPreZeroBias + fragment.HLTEndSequence )
-fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltFEDSelectorTCDS + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
+fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
 fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltL1TGlobalSummary + fragment.hltTrigReport )
 fragment.Dataset_HLTPhysics = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetHLTPhysics + fragment.hltPreDatasetHLTPhysics )
 fragment.Dataset_OnlineMonitor = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetOnlineMonitor + fragment.hltPreDatasetOnlineMonitor )