Skip to content

Commit

Permalink
Merge pull request #32797 from cms-tsg-storm/HLTscouting1130pre2
Browse files Browse the repository at this point in the history 
Replacing HLT Scouting trigger paths by new Run3 Scouting trigger path
  • Loading branch information
@cmsbuild
cmsbuild authored Feb 4, 2021
2 parents e7e1c00 + fccf164 commit 0182ade
Show file tree
Hide file tree
Showing 19 changed files with 12,608 additions and 1,966 deletions.
3,989 changes: 3,710 additions & 279 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake1_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_3_0/Fake1 --type Fake1

# /dev/CMSSW_11_3_0/Fake1/V4 (CMSSW_11_3_0_pre1)
# /dev/CMSSW_11_3_0/Fake1/V5 (CMSSW_11_3_0_pre2)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_3_0/Fake1/V4')
tableName = cms.string('/dev/CMSSW_11_3_0/Fake1/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake2_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_3_0/Fake2 --type Fake2

# /dev/CMSSW_11_3_0/Fake2/V4 (CMSSW_11_3_0_pre1)
# /dev/CMSSW_11_3_0/Fake2/V5 (CMSSW_11_3_0_pre2)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_3_0/Fake2/V4')
tableName = cms.string('/dev/CMSSW_11_3_0/Fake2/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_3_0/Fake --type Fake

# /dev/CMSSW_11_3_0/Fake/V4 (CMSSW_11_3_0_pre1)
# /dev/CMSSW_11_3_0/Fake/V5 (CMSSW_11_3_0_pre2)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_3_0/Fake/V4')
tableName = cms.string('/dev/CMSSW_11_3_0/Fake/V5')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
3,203 changes: 2,566 additions & 637 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_3_0/HIon --type HIon

# /dev/CMSSW_11_3_0/HIon/V3 (CMSSW_11_3_0_pre1)
# /dev/CMSSW_11_3_0/HIon/V7 (CMSSW_11_3_0_pre2)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_3_0/HIon/V3')
tableName = cms.string('/dev/CMSSW_11_3_0/HIon/V7')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -12311,7 +12311,8 @@
DPtOverPtCuts_byTrackAlgo = cms.vdouble( 0.5, 0.5, 0.5, 0.5, 0.5, 0.5 ),
muonMaxDPtOPt = cms.double( 1.0 ),
trackQuality = cms.string( "highPurity" ),
cleanBadConvertedBrems = cms.bool( False )
cleanBadConvertedBrems = cms.bool( False ),
vetoEndcap = cms.bool( False )
),
cms.PSet( source = cms.InputTag( "hltParticleFlowClusterECALUnseeded" ),
importerName = cms.string( "ECALClusterImporter" ),
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_3_0/PIon --type PIon

# /dev/CMSSW_11_3_0/PIon/V3 (CMSSW_11_3_0_pre1)
# /dev/CMSSW_11_3_0/PIon/V7 (CMSSW_11_3_0_pre2)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_3_0/PIon/V3')
tableName = cms.string('/dev/CMSSW_11_3_0/PIon/V7')
)

fragment.transferSystem = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_3_0/PRef --type PRef

# /dev/CMSSW_11_3_0/PRef/V3 (CMSSW_11_3_0_pre1)
# /dev/CMSSW_11_3_0/PRef/V7 (CMSSW_11_3_0_pre2)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_3_0/PRef/V3')
tableName = cms.string('/dev/CMSSW_11_3_0/PRef/V7')
)

fragment.transferSystem = cms.PSet(
Expand Down
19 changes: 1 addition & 18 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,24 +983,7 @@
streamPhysicsScoutingMonitor_datasetScoutingMonitor_selector.l1tResults = cms.InputTag('')
streamPhysicsScoutingMonitor_datasetScoutingMonitor_selector.throw = cms.bool(False)
streamPhysicsScoutingMonitor_datasetScoutingMonitor_selector.triggerConditions = cms.vstring(
'DST_CaloJet40_BTagScouting_v15',
'DST_CaloJet40_CaloBTagScouting_v14',
'DST_CaloJet40_CaloScouting_PFScouting_v15',
'DST_DoubleMu1_noVtx_CaloScouting_v2',
'DST_DoubleMu3_noVtx_CaloScouting_Monitoring_v6',
'DST_DoubleMu3_noVtx_CaloScouting_v6',
'DST_DoubleMu3_noVtx_Mass10_PFScouting_v3',
'DST_HT250_CaloBTagScouting_v10',
'DST_HT250_CaloScouting_v10',
'DST_HT410_BTagScouting_v16',
'DST_HT410_PFScouting_v16',
'DST_L1DoubleMu_BTagScouting_v16',
'DST_L1DoubleMu_CaloScouting_PFScouting_v15',
'DST_L1HTT_BTagScouting_v15',
'DST_L1HTT_CaloBTagScouting_v14',
'DST_L1HTT_CaloScouting_PFScouting_v15',
'DST_ZeroBias_BTagScouting_v15',
'DST_ZeroBias_CaloScouting_PFScouting_v14',
'DST_Run3_PFScoutingPixelTracking_v16',
'HLT_Ele115_CaloIdVT_GsfTrkIdT_v14',
'HLT_Ele35_WPTight_Gsf_v9',
'HLT_IsoMu27_v16',
Expand Down
13 changes: 0 additions & 13 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,24 +204,11 @@ def customiseFor2018Input(process):

return process

def customiseFor32291(process):
"""Improving the boundary between PFAlgo and PFTICL (or simPF) for phase2"""

# for PFBlockProducer
for producer in producers_by_type(process, "PFBlockProducer"):
if hasattr(producer,'elementImporters'):
for ps in producer.elementImporters.value():
if hasattr(ps,'importerName') and (ps.importerName == 'GeneralTracksImporter'):
if not hasattr(ps,'vetoEndcap'):
ps.vetoEndcap = cms.bool( False )

return process

# CMSSW version specific customizations
def customizeHLTforCMSSW(process, menuType="GRun"):

# add call to action function in proper order: newest last!
# process = customiseFor12718(process)
process = customiseFor32291(process)

return process
20 changes: 1 addition & 19 deletions HLTrigger/Configuration/tables/GRun.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ HLT_PFJet60_v* # CMSHLT-1233
HLT_PFJet80_v* # CMSHLT-1233
HLT_BTagMu_AK8DiJet170_Mu5_v* # CMSHLT-1234
HLT_BTagMu_AK8Jet300_Mu5_v* # CMSHLT-1234
DST_DoubleMu3_noVtx_CaloScouting_Monitoring_v* # CMSHLT-1243, CMSHLT-1587
DST_DoubleMu3_noVtx_CaloScouting_v* # CMSHLT-1243, CMSHLT-1587, CMSHLT-1589
HLT_TrkMu12_DoubleTrkMu5NoFiltersNoVtx_v* # CMSHLT-1244
HLT_TrkMu16_DoubleTrkMu6NoFiltersNoVtx_v* # CMSHLT-1244
HLT_TrkMu17_DoubleTrkMu8NoFiltersNoVtx_v* # CMSHLT-1244
Expand Down Expand Up @@ -293,20 +291,7 @@ HLT_RsqMR300_Rsq0p09_MR200_4jet_v* # CMSHLT-1323
HLT_RsqMR300_Rsq0p09_MR200_v* # CMSHLT-1323
HLT_RsqMR320_Rsq0p09_MR200_4jet_v* # CMSHLT-1323
HLT_RsqMR320_Rsq0p09_MR200_v* # CMSHLT-1323
DST_CaloJet40_BTagScouting_v* # CMSHLT-1324
DST_CaloJet40_CaloBTagScouting_v* # CMSHLT-1324
DST_CaloJet40_CaloScouting_PFScouting_v* # CMSHLT-1324
DST_HT250_CaloBTagScouting_v* # CMSHLT-1324, CMSHLT-1574
DST_HT250_CaloScouting_v* # CMSHLT-1324, CMSHLT-1574
DST_HT410_BTagScouting_v* # CMSHLT-1324, CMSHLT-1574
DST_HT410_PFScouting_v* # CMSHLT-1324, CMSHLT-1574
DST_L1DoubleMu_BTagScouting_v* # CMSHLT-1324
DST_L1DoubleMu_CaloScouting_PFScouting_v* # CMSHLT-1324
DST_L1HTT_BTagScouting_v* # CMSHLT-1324, CMSHLT-1574
DST_L1HTT_CaloBTagScouting_v* # CMSHLT-1324, CMSHLT-1574
DST_L1HTT_CaloScouting_PFScouting_v* # CMSHLT-1324, CMSHLT-1574
DST_ZeroBias_BTagScouting_v* # CMSHLT-1324
DST_ZeroBias_CaloScouting_PFScouting_v* # CMSHLT-1324
DST_Run3_PFScoutingPixelTracking_v* # CMSHLT-2120
HLT_IsoMu24_eta2p1_MediumChargedIsoPFTau50_Trk30_eta2p1_1pr_v* # CMSHLT-1326, CMSHLT-1713, CMSHLT-1742
HLT_MediumChargedIsoPFTau180HighPtRelaxedIso_Trk50_eta2p1_1pr_v* # CMSHLT-1326
HLT_MediumChargedIsoPFTau180HighPtRelaxedIso_Trk50_eta2p1_v* # CMSHLT-1326
Expand Down Expand Up @@ -504,8 +489,6 @@ HLT_PFJetFwd15_v* # CMSHLT-1662
HLT_PFJetFwd25_v* # CMSHLT-1662
HLT_AK8PFJetFwd15_v* # CMSHLT-1662
HLT_AK8PFJetFwd25_v* # CMSHLT-1662
DST_DoubleMu1_noVtx_CaloScouting_v* # CMSHLT-1725
DST_DoubleMu3_noVtx_Mass10_PFScouting_v* # CMSHLT-1729
HLT_Photon75_R9Id90_HE10_IsoM_EBOnly_CaloMJJ300_PFJetsMJJ400DEta3_v* # CMSHLT-1750
HLT_Photon75_R9Id90_HE10_IsoM_EBOnly_CaloMJJ400_PFJetsMJJ600DEta3_v* # CMSHLT-1750
HLT_MediumChargedIsoPFTau50_Trk30_eta2p1_1pr_MET140_v* # CMSHLT-1742
Expand Down Expand Up @@ -730,7 +713,6 @@ PhysicsMuonsOutput
ParkingHLTPhysicsOutput
ParkingZeroBiasOutput
PhysicsScoutingMonitorOutput # CMSHLT-487, CMSHLT-548, CMSHLT-599, CMSHLT-603
ScoutingCaloMuonOutput # CMSHLT-1243
ScoutingPFOutput # CMSHLT-548
DQMOutput
DQMEventDisplayOutput
Expand Down
Loading

0 comments on commit 0182ade

Please sign in to comment.