Merge pull request #41231 from cms-tsg-storm/HLTdevelopment130X_for131X

HLT menu development for `13_0_X` (6/N): GRun menu V1.0 of 2023 [`13_1_X`]
cms-sw · Mar 30, 2023 · 3307e07 · 3307e07
2 parents d6b11db + 8cd37e2
commit 3307e07
Show file tree

Hide file tree

Showing 31 changed files with 194,615 additions and 24,524 deletions.
diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -21,6 +21,7 @@
     'FULL'         : ( ','.join( [ 'L1Menu_Collisions2023_v1_0_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-03-08 09:39:50.000"] ), ),
     'GRun'         : ( ','.join( [ 'L1Menu_Collisions2023_v1_0_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-03-08 09:39:50.000"] ), ),
     '2022v15'      : ( ','.join( [ 'L1Menu_Collisions2022_v1_3_0-d1_xml'                     ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-08-01 08:47:17.000"] ), ),
+    '2023v10'      : ( ','.join( [ 'L1Menu_Collisions2023_v1_0_0_xml'                        ,l1tMenuRecord,connectionString,l1tMenuLabel, "2023-03-08 09:39:50.000"] ), ),
     'HIon'         : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2022_v1_1_0-d1_xml'            ,l1tMenuRecord,connectionString,l1tMenuLabel, "2022-10-26 10:46:29.000"] ), ),
     'PIon'         : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml'                          ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
     'PRef'         : ( ','.join( [ 'L1Menu_pp502Collisions2017_v4_m6_xml'                    ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-11-03 18:00:00.000"] ), ),
@@ -37,6 +38,7 @@
     'run3_mc_FULL'           : ('phase1_2023_realistic'   ,l1Menus['FULL']),
     'run3_mc_GRun'           : ('phase1_2023_realistic'   ,l1Menus['GRun']),
     'run3_mc_2022v15'        : ('phase1_2022_realistic'   ,l1Menus['2022v15']),
+    'run3_mc_2023v10'        : ('phase1_2023_realistic'   ,l1Menus['2023v10']),
     'run3_mc_HIon'           : ('phase1_2023_realistic_hi',l1Menus['HIon']),
     'run3_mc_PIon'           : ('phase1_2023_realistic'   ,l1Menus['PIon']),
     'run3_mc_PRef'           : ('phase1_2023_realistic'   ,l1Menus['PRef']),
@@ -48,6 +50,7 @@
     'run3_hlt_FULL'          : ('run3_hlt'                ,l1Menus['FULL']),
     'run3_hlt_GRun'          : ('run3_hlt'                ,l1Menus['GRun']),
     'run3_hlt_2022v15'       : ('run3_hlt'                ,l1Menus['2022v15']),
+    'run3_hlt_2023v10'       : ('run3_hlt'                ,l1Menus['2023v10']),
     'run3_hlt_HIon'          : ('run3_hlt'                ,l1Menus['HIon']),
     'run3_hlt_PIon'          : ('run3_hlt'                ,l1Menus['PIon']),
     'run3_hlt_PRef'          : ('run3_hlt'                ,l1Menus['PRef']),
@@ -59,6 +62,7 @@
     'run3_data_FULL'         : ('run3_data_prompt'        ,l1Menus['FULL']),
     'run3_data_GRun'         : ('run3_data_prompt'        ,l1Menus['GRun']),
     'run3_data_2022v15'      : ('run3_data_prompt'        ,l1Menus['2022v15']),
+    'run3_data_2023v10'      : ('run3_data_prompt'        ,l1Menus['2023v10']),
     '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/HLTrigger/Configuration/python/HLT_2022v15_cff.py b/HLTrigger/Configuration/python/HLT_2022v15_cff.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /frozen/2022/2e34/v1.5/CMSSW_13_0_X/HLT --cff --data --type 2022v15
 
-# /frozen/2022/2e34/v1.5/CMSSW_13_0_X/HLT/V11 (CMSSW_13_0_0)
+# /frozen/2022/2e34/v1.5/CMSSW_13_0_X/HLT/V13 (CMSSW_13_0_1)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -12,7 +12,7 @@
 fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/frozen/2022/2e34/v1.5/CMSSW_13_0_X/HLT/V11')
+  tableName = cms.string('/frozen/2022/2e34/v1.5/CMSSW_13_0_X/HLT/V13')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -50064,6 +50064,7 @@
 fragment.hltL1TPFJetsMatching = cms.EDProducer( "L1TPFJetsMatching",
     L1JetTrigger = cms.InputTag( "hltL1DiJetVBF" ),
     JetSrc = cms.InputTag( "hltAK4PFJetsTightIDCorrected" ),
+    matchingMode = cms.string( "VBF" ),
     pt1Min = cms.double( 110.0 ),
     pt2Min = cms.double( 35.0 ),
     pt3Min = cms.double( 110.0 ),
@@ -66895,6 +66896,7 @@
 fragment.hltVBFL1TLooseIDPFJetsMatching = cms.EDProducer( "L1TPFJetsMatching",
     L1JetTrigger = cms.InputTag( "hltL1VBFDiJetOR" ),
     JetSrc = cms.InputTag( "hltAK4PFJetsLooseIDCorrected" ),
+    matchingMode = cms.string( "VBF" ),
     pt1Min = cms.double( 115.0 ),
     pt2Min = cms.double( 40.0 ),
     pt3Min = cms.double( 110.0 ),
@@ -72280,6 +72282,7 @@
 fragment.hltVBFIsoTauL1TLooseIDPFJetsMatching = cms.EDProducer( "L1TPFJetsMatching",
     L1JetTrigger = cms.InputTag( "hltL1VBFDiJetIsoTau" ),
     JetSrc = cms.InputTag( "hltAK4PFJetsLooseIDCorrected" ),
+    matchingMode = cms.string( "VBF" ),
     pt1Min = cms.double( 40.0 ),
     pt2Min = cms.double( 40.0 ),
     pt3Min = cms.double( 40.0 ),
@@ -72298,7 +72301,7 @@
     MaxEta = cms.double( -1.0 ),
     MinN = cms.int32( 2 )
 )
-fragment.hltPFDiJetCorrCheckerWithMediumDiTau = cms.EDProducer( "HLTPFDiJetCorrCheckerWithDiTau",
+fragment.hltPFDiJetCorrCheckerWithMediumDiTau = cms.EDProducer( "HLTDiPFJetPlusTausCandidatePFJetProducer",
     pfJetSrc = cms.InputTag( 'hltVBFIsoTauL1TLooseIDPFJetsMatching','TwoJets' ),
     tauSrc = cms.InputTag( "hltHpsDoublePFTau20MediumDitauWPDeepTauNoMatch" ),
     extraTauPtCut = cms.double( 45.0 ),