Merge pull request #39114 from cms-tsg-storm/HLTdevelopment124X

HLT menu development for `12_4_X` (7/N)
cms-sw · Aug 23, 2022 · 191566c · 191566c
2 parents b46958c + e437f24
commit 191566c
Show file tree

Hide file tree

Showing 19 changed files with 1,099 additions and 930 deletions.
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
@@ -1,6 +1,6 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_12_4_0/HIon --type HIon
 
-# /dev/CMSSW_12_4_0/HIon/V94 (CMSSW_12_4_0)
+# /dev/CMSSW_12_4_0/HIon/V110 (CMSSW_12_4_0)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -12,7 +12,7 @@
 fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_12_4_0/HIon/V94')
+  tableName = cms.string('/dev/CMSSW_12_4_0/HIon/V110')
 )
 
 fragment.transferSystem = 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 --cff --data /dev/CMSSW_12_4_0/PIon --type PIon
 
-# /dev/CMSSW_12_4_0/PIon/V94 (CMSSW_12_4_0)
+# /dev/CMSSW_12_4_0/PIon/V110 (CMSSW_12_4_0)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -12,7 +12,7 @@
 fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_12_4_0/PIon/V94')
+  tableName = cms.string('/dev/CMSSW_12_4_0/PIon/V110')
 )
 
 fragment.transferSystem = 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 --cff --data /dev/CMSSW_12_4_0/PRef --type PRef
 
-# /dev/CMSSW_12_4_0/PRef/V94 (CMSSW_12_4_0)
+# /dev/CMSSW_12_4_0/PRef/V110 (CMSSW_12_4_0)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -12,7 +12,7 @@
 fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_12_4_0/PRef/V94')
+  tableName = cms.string('/dev/CMSSW_12_4_0/PRef/V110')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -2580,9 +2580,9 @@
   ExpressAlignment = cms.vstring( 'ExpressAlignment' ),
   ExpressCosmics = cms.vstring(  ),
   NanoDST = cms.vstring( 'L1Accept' ),
-  PhysicsCommissioning = cms.vstring( 'HLTPhysics',
+  PhysicsCommissioning = cms.vstring( 'EmptyBX',
+    'HLTPhysics',
     'ZeroBias' ),
-  PhysicsEndOfFill = cms.vstring( 'EmptyBX' ),
   PhysicsHIZeroBias1 = cms.vstring( 'HIZeroBias1',
     'HIZeroBias2' ),
   PhysicsHIZeroBias2 = cms.vstring( 'HIZeroBias3',

diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
diff --git a/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py b/HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py
@@ -5,6 +5,16 @@
 
 # stream PhysicsCommissioning
 
+from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsCommissioning_datasetEmptyBX_selector
+streamPhysicsCommissioning_datasetEmptyBX_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
+streamPhysicsCommissioning_datasetEmptyBX_selector.l1tResults = cms.InputTag('')
+streamPhysicsCommissioning_datasetEmptyBX_selector.throw      = cms.bool(False)
+streamPhysicsCommissioning_datasetEmptyBX_selector.triggerConditions = cms.vstring(
+    'HLT_HIL1NotBptxORForPPRef_v3',
+    'HLT_HIL1UnpairedBunchBptxMinusForPPRef_v3',
+    'HLT_HIL1UnpairedBunchBptxPlusForPPRef_v3'
+)
+
 from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsCommissioning_datasetHLTPhysics_selector
 streamPhysicsCommissioning_datasetHLTPhysics_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
 streamPhysicsCommissioning_datasetHLTPhysics_selector.l1tResults = cms.InputTag('')
@@ -22,19 +32,6 @@
 )
 
 
-# stream PhysicsEndOfFill
-
-from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsEndOfFill_datasetEmptyBX_selector
-streamPhysicsEndOfFill_datasetEmptyBX_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
-streamPhysicsEndOfFill_datasetEmptyBX_selector.l1tResults = cms.InputTag('')
-streamPhysicsEndOfFill_datasetEmptyBX_selector.throw      = cms.bool(False)
-streamPhysicsEndOfFill_datasetEmptyBX_selector.triggerConditions = cms.vstring(
-    'HLT_HIL1NotBptxORForPPRef_v3',
-    'HLT_HIL1UnpairedBunchBptxMinusForPPRef_v3',
-    'HLT_HIL1UnpairedBunchBptxPlusForPPRef_v3'
-)
-
-
 # stream PhysicsHIZeroBias1
 
 from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsHIZeroBias1_datasetHIZeroBias1_selector

diff --git a/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py b/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py
@@ -309,8 +309,8 @@
         'keep *_hltPPSCalibrationRaw_*_*',
         'keep *_hltParticleFlowForTaus_*_*',
         'keep *_hltParticleFlow_*_*',
+        'keep *_hltParticleNetDiscriminatorsJetTagsAK8_*_*',
         'keep *_hltParticleNetDiscriminatorsJetTags_*_*',
-        'keep *_hltParticleNetONNXJetTagsAK8_*_*',
         'keep *_hltPixelTracksCPU_*_*',
         'keep *_hltPixelTracksFromGPU_*_*',
         'keep *_hltPixelTracks_*_*',
@@ -652,8 +652,8 @@
         'keep *_hltPPSCalibrationRaw_*_*',
         'keep *_hltParticleFlowForTaus_*_*',
         'keep *_hltParticleFlow_*_*',
+        'keep *_hltParticleNetDiscriminatorsJetTagsAK8_*_*',
         'keep *_hltParticleNetDiscriminatorsJetTags_*_*',
-        'keep *_hltParticleNetONNXJetTagsAK8_*_*',
         'keep *_hltPixelTracksCPU_*_*',
         'keep *_hltPixelTracksFromGPU_*_*',
         'keep *_hltPixelTracks_*_*',

diff --git a/HLTrigger/Configuration/scripts/hltIntegrationTests b/HLTrigger/Configuration/scripts/hltIntegrationTests
@@ -241,7 +241,7 @@ mkdir  "$WORKDIR"
 cd     "$WORKDIR"
 
 # find the list of all trigger paths
-TRIGGERS=$(hltListPaths "$MENU" $HLTLISTPATHPROXY -p --no-dep --exclude "^HLTriggerFinalPath$" "^Dataset_.+")
+TRIGGERS=$(hltListPaths "$MENU" $HLTLISTPATHPROXY -p --no-dep --exclude "^HLTriggerFinalPath$" "^Dataset_.+" "^DST_HLTMuon_Run3_PFScoutingPixelTracking_v[0-9]+$")
 echo "${TRIGGERS[@]}" > paths.txt
 
 # print some info

diff --git a/HLTrigger/Configuration/tables/GRun.txt b/HLTrigger/Configuration/tables/GRun.txt
@@ -258,7 +258,8 @@ HLT_TripleMu_10_5_5_DZ_v*	#	CMSHLT-1311
 HLT_TripleMu_12_10_5_v*	#	CMSHLT-1311
 HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass3p8_v*	#	CMSHLT-1311, CMSHLT-1436
 HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass8_v*	#	CMSHLT-1311, CMSHLT-1436
-DST_Run3_PFScoutingPixelTracking_v* # CMSHLT-2120, CMSHLT-2231
+DST_Run3_PFScoutingPixelTracking_v*         # CMSHLT-2120, CMSHLT-2231
+DST_HLTMuon_Run3_PFScoutingPixelTracking_v* # CMSHLT-2428
 HLT_Ele12_CaloIdL_TrackIdL_IsoVL_PFJet30_v*	#	CMSHLT-1330
 HLT_Ele17_CaloIdM_TrackIdM_PFJet30_v*	#	CMSHLT-1330
 HLT_Ele23_CaloIdL_TrackIdL_IsoVL_PFJet30_v*	#	CMSHLT-1330
@@ -623,6 +624,7 @@ HLT_Diphoton20_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v*  # CMSHLT-2282
 HLT_Diphoton20_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v* # CMSHLT-2282
 HLT_Diphoton22_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v*  # CMSHLT-2282
 HLT_Diphoton22_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v* # CMSHLT-2282
+HLT_Mu50_L1SingleMuShower_v* # CMSHLT-2373
 
 HLT_L1SingleMuCosmics_v*							#	CMSHLT-2097
 
@@ -638,11 +640,12 @@ DQM_PixelReconstruction_v* # CMSHLT-2287
 
 ## EndPaths / FinalPaths ##
 
-PhysicsEndOfFillOutput
 PhysicsCommissioningOutput
+PhysicsDispJetBTagMuEGTauOutput        # CMSHLT-2431
 PhysicsEGammaOutput
-PhysicsHadronsTausOutput
-PhysicsMuonsOutput
+PhysicsJetMETOutput                    # CMSHLT-2431
+PhysicsMuonOutput                      # CMSHLT-2431
+PhysicsReservedDoubleMuonLowMassOutput # CMSHLT-2431
 PhysicsScoutingPFMonitorOutput # CMSHLT-487, CMSHLT-548, CMSHLT-599, CMSHLT-603, CMSHLT-2231
 ScoutingPFOutput               # CMSHLT-548, CMSHLT-2231
 DQMOutput

diff --git a/HLTrigger/Configuration/tables/PRef.txt b/HLTrigger/Configuration/tables/PRef.txt
@@ -43,12 +43,12 @@ DQM_HIPixelReconstruction_v* # CMSHLT-2287, CMSHLT-2343, CMSHLT-2403
 
 ## EndPaths / FinalPaths ##
 
-PhysicsEndOfFillOutput
 PhysicsCommissioningOutput
+PhysicsDispJetBTagMuEGTauOutput # CMSHLT-2431
 PhysicsEGammaOutput
-PhysicsHadronsTausOutput
-PhysicsMuonsOutput
 PhysicsForwardOutput
+PhysicsJetMETOutput             # CMSHLT-2431
+PhysicsMuonOutput               # CMSHLT-2431
 PhysicsTracksOutput
 
 PhysicsHIZeroBias1Output

diff --git a/HLTrigger/Configuration/tables/online_grun.txt b/HLTrigger/Configuration/tables/online_grun.txt
@@ -258,7 +258,8 @@ HLT_TripleMu_10_5_5_DZ_v*	#	CMSHLT-1311
 HLT_TripleMu_12_10_5_v*	#	CMSHLT-1311
 HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass3p8_v*	#	CMSHLT-1311, CMSHLT-1436
 HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_Mass8_v*	#	CMSHLT-1311, CMSHLT-1436
-DST_Run3_PFScoutingPixelTracking_v* # CMSHLT-2120, CMSHLT-2231
+DST_Run3_PFScoutingPixelTracking_v*         # CMSHLT-2120, CMSHLT-2231
+DST_HLTMuon_Run3_PFScoutingPixelTracking_v* # CMSHLT-2428
 HLT_Ele12_CaloIdL_TrackIdL_IsoVL_PFJet30_v*	#	CMSHLT-1330
 HLT_Ele17_CaloIdM_TrackIdM_PFJet30_v*	#	CMSHLT-1330
 HLT_Ele23_CaloIdL_TrackIdL_IsoVL_PFJet30_v*	#	CMSHLT-1330
@@ -623,6 +624,7 @@ HLT_Diphoton20_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v*  # CMSHLT-2282
 HLT_Diphoton20_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v* # CMSHLT-2282
 HLT_Diphoton22_14_eta1p5_R9IdL_AND_HE_AND_IsoTCaloIdT_v*  # CMSHLT-2282
 HLT_Diphoton22_14_eta1p5_R9IdL_AND_HET_AND_IsoTCaloIdT_v* # CMSHLT-2282
+HLT_Mu50_L1SingleMuShower_v* # CMSHLT-2373
 
 HLT_L1SingleMuCosmics_v*							#	CMSHLT-2097
 
@@ -638,11 +640,12 @@ DQM_PixelReconstruction_v* # CMSHLT-2287
 
 ## EndPaths / FinalPaths ##
 
-PhysicsEndOfFillOutput
 PhysicsCommissioningOutput
+PhysicsDispJetBTagMuEGTauOutput        # CMSHLT-2431
 PhysicsEGammaOutput
-PhysicsHadronsTausOutput
-PhysicsMuonsOutput
+PhysicsJetMETOutput                    # CMSHLT-2431
+PhysicsMuonOutput                      # CMSHLT-2431
+PhysicsReservedDoubleMuonLowMassOutput # CMSHLT-2431
 PhysicsScoutingPFMonitorOutput # CMSHLT-487, CMSHLT-548, CMSHLT-599, CMSHLT-603, CMSHLT-2231
 ScoutingPFOutput               # CMSHLT-548, CMSHLT-2231
 DQMOutput

diff --git a/HLTrigger/Configuration/tables/online_hion.txt b/HLTrigger/Configuration/tables/online_hion.txt
@@ -485,6 +485,6 @@ PhysicsHIMinimumBiasReducedFormat11Output
 PhysicsHITrackerNZSOutput
 PhysicsHIForwardOutput
 
-#HLTAnalyzerEndpath              # only in 'HIon', not in 'online'
+#HLTAnalyzerEndpath            # only in 'HIon', not in 'online'
 RatesMonitoring                # only in 'online', not in 'HIon'
 DQMHistograms                  # only in 'online', not in 'HIon'
diff --git a/HLTrigger/Configuration/tables/online_pref.txt b/HLTrigger/Configuration/tables/online_pref.txt
@@ -181,12 +181,12 @@ DQM_HIPixelReconstruction_v* # CMSHLT-2287, CMSHLT-2343, CMSHLT-2403
 
 ## EndPaths / FinalPaths ##
 
-PhysicsEndOfFillOutput
 PhysicsCommissioningOutput
+PhysicsDispJetBTagMuEGTauOutput # CMSHLT-2431
 PhysicsEGammaOutput
-PhysicsHadronsTausOutput
-PhysicsMuonsOutput
 PhysicsForwardOutput
+PhysicsJetMETOutput             # CMSHLT-2431
+PhysicsMuonOutput               # CMSHLT-2431
 PhysicsTracksOutput
 
 PhysicsHIZeroBias1Output
@@ -215,6 +215,6 @@ NanoDSTOutput
 
 ######## paths that are different between PRef and online_pref ################################
 
-#HLTAnalyzerEndpath              # only in 'GRun', not in 'online'
+#HLTAnalyzerEndpath            # only in 'GRun', not in 'online'
 RatesMonitoring                # only in 'online', not in 'GRun'
 DQMHistograms                  # only in 'online', not in 'GRun'