Integration of CMSHLT-2790 and CMSHLT-2970

cms-tsg-storm · Nov 15, 2023 · 91d67c9 · 91d67c9
1 parent a0d6091
commit 91d67c9
Show file tree

Hide file tree

Showing 10 changed files with 199 additions and 243 deletions.
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_13_2_0/HLT --cff --data --type FULL
 
-# /dev/CMSSW_13_2_0/HLT/V92 (CMSSW_13_2_3)
+# /dev/CMSSW_13_2_0/HLT/V95 (CMSSW_13_2_3)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -12,7 +12,7 @@
 fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_13_2_0/HLT/V92')
+  tableName = cms.string('/dev/CMSSW_13_2_0/HLT/V95')
 )
 
 fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( 
@@ -115122,10 +115122,6 @@
 fragment.hltTriggerSummaryRAW = cms.EDProducer( "TriggerSummaryProducerRAW",
     processName = cms.string( "@" )
 )
-fragment.hltPreHLTAnalyzerEndpath = cms.EDFilter( "HLTPrescaler",
-    offset = cms.uint32( 0 ),
-    L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" )
-)
 fragment.hltL1TGlobalSummary = cms.EDAnalyzer( "L1TGlobalSummary",
     AlgInputTag = cms.InputTag( "hltGtStage2Digis" ),
     ExtInputTag = cms.InputTag( "hltGtStage2Digis" ),
@@ -115198,10 +115194,10 @@
       'AlCa_EcalPi0EBonly_v20',
       'AlCa_EcalPi0EEonlyForHI_v8',
       'AlCa_EcalPi0EEonly_v20',
-      'AlCa_HIEcalEtaEBonly_v7',
-      'AlCa_HIEcalEtaEEonly_v7',
-      'AlCa_HIEcalPi0EBonly_v7',
-      'AlCa_HIEcalPi0EEonly_v7' )
+      'AlCa_HIEcalEtaEBonly_v7 / 3',
+      'AlCa_HIEcalEtaEEonly_v7 / 3',
+      'AlCa_HIEcalPi0EBonly_v7 / 3',
+      'AlCa_HIEcalPi0EEonly_v7 / 3' )
 )
 fragment.hltPreDatasetAlCaP0 = cms.EDFilter( "HLTPrescaler",
     offset = cms.uint32( 0 ),
@@ -115812,13 +115808,13 @@
     l1tIgnoreMaskAndPrescale = cms.bool( False ),
     throw = cms.bool( True ),
     triggerConditions = cms.vstring( 'HLT_HICsAK4PFJet100Eta1p5_v10 / 15',
-      'HLT_HIDmesonPPOnAATrackingGlobal_Dpt30_v4 / 20',
+      'HLT_HIDmesonPPOnAATrackingGlobal_Dpt30_v4 / 0',
       'HLT_HIDoubleEle15GsfMass50_v10',
-      'HLT_HIDoubleGEDPhoton20_v3 / 5',
+      'HLT_HIDoubleGEDPhoton20_v3 / 65',
       'HLT_HIL1SingleMu5_SingleEG20Gsf_v3',
       'HLT_HIL1SingleMu5_SingleGEDPhoton20_v3 / 25',
       'HLT_HIL2DoubleMu0_M1p5to6_Open_v3 / 335',
-      'HLT_HIL3DoubleMu2_Quarkonia_Open_v3 / 150',
+      'HLT_HIL3DoubleMu2_Quarkonia_Open_v3 / 200',
       'HLT_HIMinimumBiasHF1ANDZDC1nOR_copy_v1 / 20',
       'HLT_HIMinimumBiasHF1ANDZDC2nOR_copy_v2 / 20',
       'HLT_HIMinimumBiasHF1AND_copy_v2 / 20' )
@@ -115850,26 +115846,26 @@
     throw = cms.bool( True ),
     triggerConditions = cms.vstring( 'HLT_HICentrality30100_FirstCollisionAfterAbortGap_v10 / 0',
       'HLT_HICsAK4PFJet100Eta1p5_v10 / 3',
-      'HLT_HIEle20Gsf_v10 / 3',
+      'HLT_HIEle20Gsf_v10 / 2',
       'HLT_HIGEDPhoton40_v10 / 3',
       'HLT_HIL1NotBptxOR_v10',
-      'HLT_HIL1SingleMu0_Cosmic_v3',
-      'HLT_HIL1UnpairedBunchBptxMinus_v10',
-      'HLT_HIL1UnpairedBunchBptxPlus_v10',
-      'HLT_HIL3DoubleMu0_M2to4p5_Open_v3 / 50',
-      'HLT_HIL3DoubleMu2_M7to15_Open_v3 / 50',
-      'HLT_HIL3SingleMu12_v3 / 0',
-      'HLT_HIL3SingleMu3_SinglePuAK4CaloJet40_v3 / 10',
-      'HLT_HIL3SingleMu5_v3 / 0',
-      'HLT_HIL3SingleMu7_v3 / 0',
+      'HLT_HIL1SingleMu0_Cosmic_v3 / 0',
+      'HLT_HIL1UnpairedBunchBptxMinus_v10 / 2',
+      'HLT_HIL1UnpairedBunchBptxPlus_v10 / 2',
+      'HLT_HIL3DoubleMu0_M2to4p5_Open_v3 / 40',
+      'HLT_HIL3DoubleMu2_M7to15_Open_v3 / 25',
+      'HLT_HIL3SingleMu12_v3',
+      'HLT_HIL3SingleMu3_SinglePuAK4CaloJet40_v3 / 35',
+      'HLT_HIL3SingleMu5_v3 / 2000',
+      'HLT_HIL3SingleMu7_v3 / 800',
       'HLT_HIMinimumBiasHF1ANDZDC1nOR_copy_v1',
       'HLT_HIMinimumBiasHF1ANDZDC2nOR_copy_v2',
       'HLT_HIMinimumBiasHF1AND_copy_v2',
-      'HLT_HIPhysics_v10 / 2',
-      'HLT_HIPuAK4CaloJet100Eta5p1_v10 / 2',
+      'HLT_HIPhysics_v10',
+      'HLT_HIPuAK4CaloJet100Eta5p1_v10 / 8',
       'HLT_HIRandom_v7',
-      'HLT_HIZeroBias_FirstCollisionAfterAbortGap_v10',
-      'HLT_HIZeroBias_v10' )
+      'HLT_HIZeroBias_FirstCollisionAfterAbortGap_v10 / 2',
+      'HLT_HIZeroBias_v10 / 5' )
 )
 fragment.hltPreDatasetHIExpressPhysics = cms.EDFilter( "HLTPrescaler",
     offset = cms.uint32( 0 ),
@@ -115883,26 +115879,26 @@
     throw = cms.bool( True ),
     triggerConditions = cms.vstring( 'HLT_HICentrality30100_FirstCollisionAfterAbortGap_v10 / 0',
       'HLT_HICsAK4PFJet100Eta1p5_v10 / 3',
-      'HLT_HIEle20Gsf_v10 / 3',
-      'HLT_HIGEDPhoton40_v10 / 3',
+      'HLT_HIEle20Gsf_v10',
+      'HLT_HIGEDPhoton40_v10 / 2',
       'HLT_HIL1NotBptxOR_v10',
-      'HLT_HIL1SingleMu0_Cosmic_v3',
-      'HLT_HIL1UnpairedBunchBptxMinus_v10',
-      'HLT_HIL1UnpairedBunchBptxPlus_v10',
-      'HLT_HIL3DoubleMu0_M2to4p5_Open_v3 / 50',
-      'HLT_HIL3DoubleMu2_M7to15_Open_v3 / 50',
-      'HLT_HIL3SingleMu12_v3 / 0',
-      'HLT_HIL3SingleMu3_SinglePuAK4CaloJet40_v3 / 10',
-      'HLT_HIL3SingleMu5_v3 / 0',
-      'HLT_HIL3SingleMu7_v3 / 0',
+      'HLT_HIL1SingleMu0_Cosmic_v3 / 0',
+      'HLT_HIL1UnpairedBunchBptxMinus_v10 / 2',
+      'HLT_HIL1UnpairedBunchBptxPlus_v10 / 2',
+      'HLT_HIL3DoubleMu0_M2to4p5_Open_v3 / 40',
+      'HLT_HIL3DoubleMu2_M7to15_Open_v3 / 25',
+      'HLT_HIL3SingleMu12_v3',
+      'HLT_HIL3SingleMu3_SinglePuAK4CaloJet40_v3 / 35',
+      'HLT_HIL3SingleMu5_v3 / 2000',
+      'HLT_HIL3SingleMu7_v3 / 800',
       'HLT_HIMinimumBiasHF1ANDZDC1nOR_copy_v1',
       'HLT_HIMinimumBiasHF1ANDZDC2nOR_copy_v2',
       'HLT_HIMinimumBiasHF1AND_copy_v2',
-      'HLT_HIPhysics_v10 / 2',
-      'HLT_HIPuAK4CaloJet100Eta5p1_v10 / 2',
+      'HLT_HIPhysics_v10',
+      'HLT_HIPuAK4CaloJet100Eta5p1_v10 / 5',
       'HLT_HIRandom_v7',
-      'HLT_HIZeroBias_FirstCollisionAfterAbortGap_v10',
-      'HLT_HIZeroBias_v10' )
+      'HLT_HIZeroBias_FirstCollisionAfterAbortGap_v10 / 2',
+      'HLT_HIZeroBias_v10 / 5' )
 )
 fragment.hltPreDatasetHIExpressPhysicsRawPrime = cms.EDFilter( "HLTPrescaler",
     offset = cms.uint32( 0 ),
@@ -116129,8 +116125,8 @@
       'HLT_HIL1SingleMu0_Cosmic_v3',
       'HLT_HIL1UnpairedBunchBptxMinus_v10',
       'HLT_HIL1UnpairedBunchBptxPlus_v10',
-      'HLT_HIL3DoubleMu0_M2to4p5_Open_v3 / 50',
-      'HLT_HIL3DoubleMu2_M7to15_Open_v3 / 50',
+      'HLT_HIL3DoubleMu0_M2to4p5_Open_v3 / 75',
+      'HLT_HIL3DoubleMu2_M7to15_Open_v3 / 75',
       'HLT_HIL3SingleMu12_v3 / 0',
       'HLT_HIL3SingleMu3_SinglePuAK4CaloJet40_v3 / 10',
       'HLT_HIL3SingleMu5_v3 / 0',
@@ -116142,7 +116138,7 @@
       'HLT_HIPuAK4CaloJet100Eta5p1_v10 / 2',
       'HLT_HIRandom_v7 / 3',
       'HLT_HIZeroBias_FirstCollisionAfterAbortGap_v10',
-      'HLT_HIZeroBias_v10' )
+      'HLT_HIZeroBias_v10 / 3' )
 )
 fragment.hltPreDatasetHIOnlineMonitor = cms.EDFilter( "HLTPrescaler",
     offset = cms.uint32( 0 ),
@@ -116154,9 +116150,9 @@
     l1tResults = cms.InputTag( "" ),
     l1tIgnoreMaskAndPrescale = cms.bool( False ),
     throw = cms.bool( True ),
-    triggerConditions = cms.vstring( 'HLT_HIMinimumBiasHF1ANDZDC1nOR_v1',
-      'HLT_HIMinimumBiasHF1ANDZDC2nOR_v3',
-      'HLT_HIMinimumBiasHF1AND_v3' )
+    triggerConditions = cms.vstring( 'HLT_HIMinimumBiasHF1ANDZDC1nOR_v1 / 700',
+      'HLT_HIMinimumBiasHF1ANDZDC2nOR_v3 / 700',
+      'HLT_HIMinimumBiasHF1AND_v3 / 700' )
 )
 fragment.hltPreDatasetHIMinimumBias0 = cms.EDFilter( "HLTPrescaler",
     offset = cms.uint32( 0 ),
@@ -120199,7 +120195,7 @@
 fragment.MC_QuadPFJet100_75_50_30_PNet2CvsL0p3And1CvsL0p5_VBF3Tight_v4 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sTripleJet957565VBFIorHTTIorDoubleJetCIorSingleJetorQuadJet95756520 + fragment.hltPreMCQuadPFJet100755030PNet2CvsL0p3And1CvsL0p5VBF3Tight + fragment.HLTAK4CaloJetsSequence + fragment.hltQuadJet20 + fragment.hltTripleJet35 + fragment.hltDoubleJet50 + fragment.hltSingleJet80 + fragment.HLTAK4PFJetsSequence + fragment.hltPFQuadJetLooseID30 + fragment.hltPFTripleJetLooseID50 + fragment.hltPFDoubleJetLooseID75 + fragment.hltPFSingleJetLooseID100 + fragment.hlt2PFCentralJetTightIDPt30 + fragment.HLTJetFlavourTagParticleNetSequencePF + fragment.hltPF2CentralJetTightIDPt30 + fragment.hltPNetCvsLTag0p5 + fragment.hlt2PNetCvsLTag0p3 + fragment.hltVBFPFPNetCvsLSortedMqq460Detaqq3p5 + fragment.HLTEndSequence )
 fragment.MC_Run3_PFScoutingPixelTracking_v22 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sMCRun3PFScoutingPixelTracking + fragment.hltPreMCRun3PFScoutingPixelTracking + fragment.HLTPFScoutingPixelTrackingSequence + fragment.HLTEndSequence )
 fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltFEDSelectorTCDS + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
-fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltPreHLTAnalyzerEndpath + fragment.hltL1TGlobalSummary + fragment.hltTrigReport )
+fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltL1TGlobalSummary + fragment.hltTrigReport )
 fragment.Dataset_AlCaLowPtJet = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetAlCaLowPtJet + fragment.hltPreDatasetAlCaLowPtJet )
 fragment.Dataset_AlCaLumiPixelsCountsExpress = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetAlCaLumiPixelsCountsExpress + fragment.hltPreDatasetAlCaLumiPixelsCountsExpress )
 fragment.Dataset_AlCaLumiPixelsCountsPrompt = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetAlCaLumiPixelsCountsPrompt + fragment.hltPreDatasetAlCaLumiPixelsCountsPrompt )

diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
@@ -1,6 +1,6 @@
 # hltGetConfiguration /dev/CMSSW_13_2_0/GRun --cff --data --type GRun
 
-# /dev/CMSSW_13_2_0/GRun/V72 (CMSSW_13_2_3)
+# /dev/CMSSW_13_2_0/GRun/V73 (CMSSW_13_2_3)
 
 import FWCore.ParameterSet.Config as cms
 
@@ -12,7 +12,7 @@
 fragment.ProcessAcceleratorCUDA = ProcessAcceleratorCUDA()
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_13_2_0/GRun/V72')
+  tableName = cms.string('/dev/CMSSW_13_2_0/GRun/V73')
 )
 
 fragment.HLTIter0PSetTrajectoryBuilderIT = cms.PSet( 
@@ -85914,10 +85914,6 @@
 fragment.hltTriggerSummaryRAW = cms.EDProducer( "TriggerSummaryProducerRAW",
     processName = cms.string( "@" )
 )
-fragment.hltPreHLTAnalyzerEndpath = cms.EDFilter( "HLTPrescaler",
-    offset = cms.uint32( 0 ),
-    L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" )
-)
 fragment.hltL1TGlobalSummary = cms.EDAnalyzer( "L1TGlobalSummary",
     AlgInputTag = cms.InputTag( "hltGtStage2Digis" ),
     ExtInputTag = cms.InputTag( "hltGtStage2Digis" ),
@@ -89289,7 +89285,7 @@
 fragment.MC_QuadPFJet100_75_50_30_PNet2CvsL0p3And1CvsL0p5_VBF3Tight_v4 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sTripleJet957565VBFIorHTTIorDoubleJetCIorSingleJetorQuadJet95756520 + fragment.hltPreMCQuadPFJet100755030PNet2CvsL0p3And1CvsL0p5VBF3Tight + fragment.HLTAK4CaloJetsSequence + fragment.hltQuadJet20 + fragment.hltTripleJet35 + fragment.hltDoubleJet50 + fragment.hltSingleJet80 + fragment.HLTAK4PFJetsSequence + fragment.hltPFQuadJetLooseID30 + fragment.hltPFTripleJetLooseID50 + fragment.hltPFDoubleJetLooseID75 + fragment.hltPFSingleJetLooseID100 + fragment.hlt2PFCentralJetTightIDPt30 + fragment.HLTJetFlavourTagParticleNetSequencePF + fragment.hltPF2CentralJetTightIDPt30 + fragment.hltPNetCvsLTag0p5 + fragment.hlt2PNetCvsLTag0p3 + fragment.hltVBFPFPNetCvsLSortedMqq460Detaqq3p5 + fragment.HLTEndSequence )
 fragment.MC_Run3_PFScoutingPixelTracking_v22 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sMCRun3PFScoutingPixelTracking + fragment.hltPreMCRun3PFScoutingPixelTracking + fragment.HLTPFScoutingPixelTrackingSequence + fragment.HLTEndSequence )
 fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltFEDSelectorTCDS + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
-fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltPreHLTAnalyzerEndpath + fragment.hltL1TGlobalSummary + fragment.hltTrigReport )
+fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltL1TGlobalSummary + fragment.hltTrigReport )
 fragment.Dataset_AlCaLowPtJet = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetAlCaLowPtJet + fragment.hltPreDatasetAlCaLowPtJet )
 fragment.Dataset_AlCaLumiPixelsCountsExpress = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetAlCaLumiPixelsCountsExpress + fragment.hltPreDatasetAlCaLumiPixelsCountsExpress )
 fragment.Dataset_AlCaLumiPixelsCountsPrompt = cms.Path( fragment.HLTDatasetPathBeginSequence + fragment.hltDatasetAlCaLumiPixelsCountsPrompt + fragment.hltPreDatasetAlCaLumiPixelsCountsPrompt )