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

HLT menu development for `14_0_X` (6/N) [`14_1_X`]
cms-sw · Apr 14, 2024 · 36a26dc · 36a26dc
2 parents 40583c2 + 4e07c35
commit 36a26dc
Show file tree

Hide file tree

Showing 18 changed files with 277 additions and 43 deletions.
diff --git a/HLTrigger/Configuration/python/HLT_2024v11_cff.py b/HLTrigger/Configuration/python/HLT_2024v11_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/HLT --cff --data --type FULL
 
-# /dev/CMSSW_14_0_0/HLT/V116 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/HLT/V118 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -11,7 +11,7 @@
 fragment.load("Configuration.StandardSequences.Accelerators_cff")
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V116")
+  tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V118")
 )
 
 fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 
@@ -111838,7 +111838,7 @@
       'HLT_DiPFJetAve100_HFJEC_v25',
       'HLT_DiPFJetAve140_v21',
       'HLT_DiPFJetAve160_HFJEC_v24',
-      'HLT_DiPFJetAve180_PPSMatch_Xi0p3_QuadJet_Max2ProtPerRP_v2 / 0',
+      'HLT_DiPFJetAve180_PPSMatch_Xi0p3_QuadJet_Max2ProtPerRP_v2',
       'HLT_DiPFJetAve200_v21',
       'HLT_DiPFJetAve220_HFJEC_v24',
       'HLT_DiPFJetAve260_HFJEC_v7',

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
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/HIon --cff --data --type HIon
 
-# /dev/CMSSW_14_0_0/HIon/V102 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/HIon/V105 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -11,7 +11,7 @@
 fragment.load("Configuration.StandardSequences.Accelerators_cff")
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V102")
+  tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V105")
 )
 
 fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 

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/V102 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/PIon/V105 (CMSSW_14_0_5)
 
 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/V102")
+  tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V105")
 )
 
 fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/PRef --cff --data --type PRef
 
-# /dev/CMSSW_14_0_0/PRef/V102 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/PRef/V105 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -11,7 +11,7 @@
 fragment.load("Configuration.StandardSequences.Accelerators_cff")
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V102")
+  tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V105")
 )
 
 fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_Special_cff.py b/HLTrigger/Configuration/python/HLT_Special_cff.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/Special --cff --data --type Special
 
-# /dev/CMSSW_14_0_0/Special/V102 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/Special/V105 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -11,7 +11,7 @@
 fragment.load("Configuration.StandardSequences.Accelerators_cff")
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/Special/V102")
+  tableName = cms.string("/dev/CMSSW_14_0_0/Special/V105")
 )
 
 fragment.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
@@ -552,6 +552,8 @@
     'HLT_PFHT280_QuadPFJet30_PNet2BTagMean0p60_v5',
     'HLT_PFHT280_QuadPFJet30_v5',
     'HLT_PFHT280_QuadPFJet35_PNet2BTagMean0p60_v5',
+    'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_PNet3BTag_2p0_v1',
+    'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_PNet3BTag_4p3_v1',
     'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepJet_4p5_v9',
     'HLT_PFHT330PT30_QuadPFJet_75_60_45_40_v17',
     'HLT_PFHT340_QuadPFJet70_50_40_40_PNet2BTagMean0p70_v6',

diff --git a/HLTrigger/Configuration/tables/GRun.txt b/HLTrigger/Configuration/tables/GRun.txt
@@ -448,7 +448,9 @@ HLT_IsoMu24_eta2p1_MediumDeepTauPFTauHPS35_L2NN_eta2p1_CrossL1_v*
 HLT_IsoMu24_eta2p1_LooseDeepTauPFTauHPS30_eta2p1_CrossL1_v*                     #       CMSHLT-2209
 HLT_IsoMu24_eta2p1_LooseDeepTauPFTauHPS180_eta2p1_v*                            #       CMSHLT-2209
 HLT_LooseDeepTauPFTauHPS180_L2NN_eta2p1_v*                                      #       CMSHLT-2209
-HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepJet_4p5_v*			# CMSHLT-2184
+HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepJet_4p5_v*                #       CMSHLT-2184
+HLT_PFHT330PT30_QuadPFJet_75_60_45_40_PNet3BTag_4p3_v*                          #       CMSHLT-3159, CMSHLT-3119
+HLT_PFHT330PT30_QuadPFJet_75_60_45_40_PNet3BTag_2p0_v*                          #       CMSHLT-3159, CMSHLT-3119
 HLT_PFHT400_FivePFJet_120_120_60_30_30_PNet2BTag_5p6_v*                                 # CMSHLT-3023
 HLT_PFHT400_FivePFJet_120_120_60_30_30_PNet2BTag_4p3_v*                                 # CMSHLT-3023
 HLT_PFHT400_SixPFJet32_v*                   # CMSHLT-1857, CMSHLT-2705

diff --git a/HLTrigger/Configuration/tables/makeOnlineSpecial b/HLTrigger/Configuration/tables/makeOnlineSpecial
@@ -7,7 +7,7 @@ echo
 echo "Create online version of the combined Special subtable"
 echo
 MASTER="/dev/CMSSW_14_0_0/HLT"             # no version, take the latest one
-TARGET="/online/special/2024/v1.1/TABLE"   # where to store the online-compliant menu
+TARGET="/online/special/2024/v1.2/TABLE"   # where to store the online-compliant menu
 PREFIX="online_"
 TABLES="Special"
 
@@ -18,8 +18,8 @@ echo
 echo "Create online versions of special subtables from combined Special table"
 echo
 
-MASTER="/online/special/2024/v1.1/Special" # no version, take the latest one
-TARGET="/online/special/2024/v1.1/TABLE"   # where to store the online-compliant menu
+MASTER="/online/special/2024/v1.2/Special" # no version, take the latest one
+TARGET="/online/special/2024/v1.2/TABLE"   # where to store the online-compliant menu
 PREFIX="online_"
 TABLES="Circulating Cosmics ECALTiming FirstCollisions LumiScan PPS Splashes TrackerVR"
 

diff --git a/HLTrigger/Configuration/tables/online_grun.txt b/HLTrigger/Configuration/tables/online_grun.txt
@@ -448,7 +448,9 @@ HLT_IsoMu24_eta2p1_MediumDeepTauPFTauHPS35_L2NN_eta2p1_CrossL1_v*
 HLT_IsoMu24_eta2p1_LooseDeepTauPFTauHPS30_eta2p1_CrossL1_v*                     #       CMSHLT-2209
 HLT_IsoMu24_eta2p1_LooseDeepTauPFTauHPS180_eta2p1_v*                            #       CMSHLT-2209
 HLT_LooseDeepTauPFTauHPS180_L2NN_eta2p1_v*                                      #       CMSHLT-2209
-HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepJet_4p5_v*			# CMSHLT-2184
+HLT_PFHT330PT30_QuadPFJet_75_60_45_40_TriplePFBTagDeepJet_4p5_v*                #       CMSHLT-2184
+HLT_PFHT330PT30_QuadPFJet_75_60_45_40_PNet3BTag_4p3_v*                          #       CMSHLT-3159, CMSHLT-3119
+HLT_PFHT330PT30_QuadPFJet_75_60_45_40_PNet3BTag_2p0_v*                          #       CMSHLT-3159, CMSHLT-3119
 HLT_PFHT400_FivePFJet_120_120_60_30_30_PNet2BTag_5p6_v*                                 # CMSHLT-3023
 HLT_PFHT400_FivePFJet_120_120_60_30_30_PNet2BTag_4p3_v*                                 # CMSHLT-3023
 HLT_PFHT400_SixPFJet32_v*                   # CMSHLT-1857, CMSHLT-2705

diff --git a/HLTrigger/Configuration/test/OnLine_HLT_2024v11.py b/HLTrigger/Configuration/test/OnLine_HLT_2024v11.py
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/HLT --full --data --type FULL --unprescale --process HLTFULL --globaltag auto:run3_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root
 
-# /dev/CMSSW_14_0_0/HLT/V116 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/HLT/V118 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -11,7 +11,7 @@
 process.load("Configuration.StandardSequences.Accelerators_cff")
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V116")
+  tableName = cms.string("/dev/CMSSW_14_0_0/HLT/V118")
 )
 
 process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 
@@ -112489,7 +112489,7 @@
       'HLT_DiPFJetAve100_HFJEC_v25',
       'HLT_DiPFJetAve140_v21',
       'HLT_DiPFJetAve160_HFJEC_v24',
-      'HLT_DiPFJetAve180_PPSMatch_Xi0p3_QuadJet_Max2ProtPerRP_v2 / 0',
+      'HLT_DiPFJetAve180_PPSMatch_Xi0p3_QuadJet_Max2ProtPerRP_v2',
       'HLT_DiPFJetAve200_v21',
       'HLT_DiPFJetAve220_HFJEC_v24',
       'HLT_DiPFJetAve260_HFJEC_v7',

diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/HIon --full --data --type HIon --unprescale --process HLTHIon --globaltag auto:run3_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root
 
-# /dev/CMSSW_14_0_0/HIon/V102 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/HIon/V105 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -11,7 +11,7 @@
 process.load("Configuration.StandardSequences.Accelerators_cff")
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V102")
+  tableName = cms.string("/dev/CMSSW_14_0_0/HIon/V105")
 )
 
 process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 

diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/PIon --full --data --type PIon --unprescale --process HLTPIon --globaltag auto:run3_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root
 
-# /dev/CMSSW_14_0_0/PIon/V102 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/PIon/V105 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -9,7 +9,7 @@
 process.load("Configuration.StandardSequences.Accelerators_cff")
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V102")
+  tableName = cms.string("/dev/CMSSW_14_0_0/PIon/V105")
 )
 
 process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 

diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/PRef --full --data --type PRef --unprescale --process HLTPRef --globaltag auto:run3_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root
 
-# /dev/CMSSW_14_0_0/PRef/V102 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/PRef/V105 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -11,7 +11,7 @@
 process.load("Configuration.StandardSequences.Accelerators_cff")
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V102")
+  tableName = cms.string("/dev/CMSSW_14_0_0/PRef/V105")
 )
 
 process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet( 

diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Special.py b/HLTrigger/Configuration/test/OnLine_HLT_Special.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_14_0_0/Special --full --data --type Special --unprescale --process HLTSpecial --globaltag auto:run3_hlt_Special --input file:RelVal_Raw_Special_DATA.root
 
-# /dev/CMSSW_14_0_0/Special/V102 (CMSSW_14_0_5)
+# /dev/CMSSW_14_0_0/Special/V105 (CMSSW_14_0_5)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -11,7 +11,7 @@
 process.load("Configuration.StandardSequences.Accelerators_cff")
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string("/dev/CMSSW_14_0_0/Special/V102")
+  tableName = cms.string("/dev/CMSSW_14_0_0/Special/V105")
 )
 
 process.HLTIter4PSetTrajectoryBuilderIT = cms.PSet(