Skip to content

Commit

Permalink
Merge pull request #24542 from cms-tsg-storm/HLT_V3p5_102X
Browse files Browse the repository at this point in the history 
HLT V3.6 for development menus (102X)
  • Loading branch information
@cmsbuild
cmsbuild committed Oct 16, 2018
2 parents aa968dc + 8a0bc5a commit 64135c9
Show file tree
Hide file tree
Showing 16 changed files with 4,366 additions and 682 deletions.
4 changes: 2 additions & 2 deletions Configuration/HLT/python/autoCondHLT.py
View file
Expand Up @@ -18,9 +18,9 @@
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2018_v2_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-06-20 15:05:19.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2018_v2_1_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-08-14 11:03:08.000"] ), ),
'2018v32' : ( ','.join( [ 'L1Menu_Collisions2018_v1_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-04-16 09:58:43.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2018_v2_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-06-20 15:05:19.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2018_v2_1_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-08-14 11:03:08.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.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"] ), ),
Expand Down
1,027 changes: 869 additions & 158 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file

Large diffs are not rendered by default.

1,106 changes: 979 additions & 127 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/HIon --type HIon

# /dev/CMSSW_10_1_0/HIon/V60 (CMSSW_10_1_7)
# /dev/CMSSW_10_1_0/HIon/V83 (CMSSW_10_1_10_HLT1)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_1_0/HIon/V60')
tableName = cms.string('/dev/CMSSW_10_1_0/HIon/V83')
)

fragment.transferSystem = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/PIon --type PIon

# /dev/CMSSW_10_1_0/PIon/V60 (CMSSW_10_1_7)
# /dev/CMSSW_10_1_0/PIon/V83 (CMSSW_10_1_10_HLT1)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_1_0/PIon/V60')
tableName = cms.string('/dev/CMSSW_10_1_0/PIon/V83')
)

fragment.transferSystem = cms.PSet(
Expand Down
93 changes: 70 additions & 23 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file

Large diffs are not rendered by default.

44 changes: 43 additions & 1 deletion HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
View file
Expand Up @@ -15,11 +15,28 @@
'HLT_Mu8_IP3_part0_v3',
'HLT_Mu8_IP5_part0_v2',
'HLT_Mu8_IP6_part0_v2',
'HLT_Mu9_IP0_part0_v2',
'HLT_Mu9_IP3_part0_v2',
'HLT_Mu9_IP4_part0_v2',
'HLT_Mu9_IP5_part0_v2',
'HLT_Mu9_IP6_part0_v3'
)

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamParkingBPH1_datasetParkingBPHPromptCSCS_selector
streamParkingBPH1_datasetParkingBPHPromptCSCS_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamParkingBPH1_datasetParkingBPHPromptCSCS_selector.l1tResults = cms.InputTag('')
streamParkingBPH1_datasetParkingBPHPromptCSCS_selector.throw = cms.bool(False)
streamParkingBPH1_datasetParkingBPHPromptCSCS_selector.triggerConditions = cms.vstring(
'HLT_Mu12_IP6_ToCSCS_v1',
'HLT_Mu7_IP4_ToCSCS_v1',
'HLT_Mu8_IP3_ToCSCS_v1',
'HLT_Mu8_IP5_ToCSCS_v1',
'HLT_Mu8_IP6_ToCSCS_v1',
'HLT_Mu9_IP4_ToCSCS_v1',
'HLT_Mu9_IP5_ToCSCS_v1',
'HLT_Mu9_IP6_ToCSCS_v1'
)


# stream ParkingBPH2

Expand Down Expand Up @@ -177,7 +194,7 @@
streamPhysicsCommissioning_datasetNoBPTX_selector.l1tResults = cms.InputTag('')
streamPhysicsCommissioning_datasetNoBPTX_selector.throw = cms.bool(False)
streamPhysicsCommissioning_datasetNoBPTX_selector.triggerConditions = cms.vstring(
'HLT_CDC_L2cosmic_5_er1p0_v1',
'HLT_CDC_L2cosmic_10_er1p0_v1',
'HLT_CDC_L2cosmic_5p5_er1p0_v1',
'HLT_L2Mu10_NoVertex_NoBPTX3BX_v5',
'HLT_L2Mu10_NoVertex_NoBPTX_v6',
Expand Down Expand Up @@ -328,6 +345,27 @@
'HLT_L1UnpairedBunchBptxPlus_v2'
)

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsEndOfFill_datasetFSQJet1_selector
streamPhysicsEndOfFill_datasetFSQJet1_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsEndOfFill_datasetFSQJet1_selector.l1tResults = cms.InputTag('')
streamPhysicsEndOfFill_datasetFSQJet1_selector.throw = cms.bool(False)
streamPhysicsEndOfFill_datasetFSQJet1_selector.triggerConditions = cms.vstring(
'HLT_DiPFJet15_NoCaloMatched_v16',
'HLT_DiPFJet25_NoCaloMatched_v16'
)

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsEndOfFill_datasetFSQJet2_selector
streamPhysicsEndOfFill_datasetFSQJet2_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsEndOfFill_datasetFSQJet2_selector.l1tResults = cms.InputTag('')
streamPhysicsEndOfFill_datasetFSQJet2_selector.throw = cms.bool(False)
streamPhysicsEndOfFill_datasetFSQJet2_selector.triggerConditions = cms.vstring(
'HLT_DiPFJet15_FBEta3_NoCaloMatched_v17',
'HLT_DiPFJet25_FBEta3_NoCaloMatched_v17',
'HLT_DiPFJetAve15_HFJEC_v17',
'HLT_DiPFJetAve25_HFJEC_v17',
'HLT_DiPFJetAve35_HFJEC_v17'
)

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamPhysicsEndOfFill_datasetHINCaloJets_selector
streamPhysicsEndOfFill_datasetHINCaloJets_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamPhysicsEndOfFill_datasetHINCaloJets_selector.l1tResults = cms.InputTag('')
Expand Down Expand Up @@ -536,6 +574,9 @@
'HLT_PFHT350MinPFJet15_v9',
'HLT_PFHT350_v19',
'HLT_PFHT370_v17',
'HLT_PFHT400_FivePFJet_100_100_60_30_30_DoublePFBTagDeepCSV_4p5_v8',
'HLT_PFHT400_FivePFJet_100_100_60_30_30_v8',
'HLT_PFHT400_FivePFJet_120_120_60_30_30_DoublePFBTagDeepCSV_4p5_v8',
'HLT_PFHT400_SixPFJet32_DoublePFBTagDeepCSV_2p94_v8',
'HLT_PFHT400_SixPFJet32_v8',
'HLT_PFHT430_v17',
Expand Down Expand Up @@ -665,6 +706,7 @@
streamPhysicsHadronsTaus_datasetTau_selector.l1tResults = cms.InputTag('')
streamPhysicsHadronsTaus_datasetTau_selector.throw = cms.bool(False)
streamPhysicsHadronsTaus_datasetTau_selector.triggerConditions = cms.vstring(
'HLT_DoubleMediumChargedIsoPFTauHPS30_L1MaxMass_Trk1_eta2p1_Reg_v1',
'HLT_DoubleMediumChargedIsoPFTauHPS35_Trk1_TightID_eta2p1_Reg_v1',
'HLT_DoubleMediumChargedIsoPFTauHPS35_Trk1_eta2p1_Reg_v4',
'HLT_DoubleMediumChargedIsoPFTauHPS40_Trk1_TightID_eta2p1_Reg_v1',
Expand Down
14 changes: 14 additions & 0 deletions HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py
View file
Expand Up @@ -199,12 +199,19 @@
'keep *_hltIter1PFlowTrackSelectionHighPurity_*_*',
'keep *_hltIter2HighPtTkMuMerged_*_*',
'keep *_hltIter2HighPtTkMuTrackSelectionHighPurity_*_*',
'keep *_hltIter2IterL3FromL1MuonMerged_*_*',
'keep *_hltIter2IterL3MuonMerged_*_*',
'keep *_hltIter2MergedForBTag_*_*',
'keep *_hltIter2MergedForElectrons_*_*',
'keep *_hltIter2Merged_*_*',
'keep *_hltIter2PFlowTrackSelectionHighPurity_*_*',
'keep *_hltIter3Merged_*_*',
'keep *_hltIter4Merged_*_*',
'keep *_hltIterL3GlbMuon_*_*',
'keep *_hltIterL3MuonMerged_*_*',
'keep *_hltIterL3MuonsNoID_*_*',
'keep *_hltIterL3Muons_*_*',
'keep *_hltIterL3OIMuonTrackSelectionHighPurity_*_*',
'keep *_hltIterativeCone5PileupSubtractionCaloJets_*_*',
'keep *_hltL1HLTSingleIsoPFTau35Trk20Met60JetsMatch_*_*',
'keep *_hltL1IsoElectronTrackIsol_*_*',
Expand Down Expand Up @@ -531,12 +538,19 @@
'keep *_hltIter1PFlowTrackSelectionHighPurity_*_*',
'keep *_hltIter2HighPtTkMuMerged_*_*',
'keep *_hltIter2HighPtTkMuTrackSelectionHighPurity_*_*',
'keep *_hltIter2IterL3FromL1MuonMerged_*_*',
'keep *_hltIter2IterL3MuonMerged_*_*',
'keep *_hltIter2MergedForBTag_*_*',
'keep *_hltIter2MergedForElectrons_*_*',
'keep *_hltIter2Merged_*_*',
'keep *_hltIter2PFlowTrackSelectionHighPurity_*_*',
'keep *_hltIter3Merged_*_*',
'keep *_hltIter4Merged_*_*',
'keep *_hltIterL3GlbMuon_*_*',
'keep *_hltIterL3MuonMerged_*_*',
'keep *_hltIterL3MuonsNoID_*_*',
'keep *_hltIterL3Muons_*_*',
'keep *_hltIterL3OIMuonTrackSelectionHighPurity_*_*',
'keep *_hltIterativeCone5PileupSubtractionCaloJets_*_*',
'keep *_hltL1HLTSingleIsoPFTau35Trk20Met60JetsMatch_*_*',
'keep *_hltL1IsoElectronTrackIsol_*_*',
Expand Down
22 changes: 21 additions & 1 deletion HLTrigger/Configuration/tables/GRun.txt
View file
Expand Up @@ -670,7 +670,6 @@ HLT_Mu9_IP4_part4_v* # CMSHLT-1886
HLT_Mu8_IP5_part4_v* # CMSHLT-1886
HLT_Mu8_IP6_part4_v* # CMSHLT-1886
HLT_ZeroBias_Alignment_v* # CMSHLT-1892
HLT_CDC_L2cosmic_5_er1p0_v* # CMSHLT-1896
HLT_CDC_L2cosmic_5p5_er1p0_v* # CMSHLT-1896
HLT_DoubleL2Mu23NoVtx_2Cha_CosmicSeed_NoL2Matched_v* # CMSHLT-1907
HLT_DoubleL2Mu25NoVtx_2Cha_CosmicSeed_NoL2Matched_v* # CMSHLT-1907
Expand All @@ -689,6 +688,27 @@ HLT_BTagMu_AK4Jet300_Mu5_noalgo_v* # CMSHLT-1941
HLT_BTagMu_AK8DiJet170_Mu5_noalgo_v* # CMSHLT-1941
HLT_BTagMu_AK8Jet170_DoubleMu5_noalgo_v* # CMSHLT-1941
HLT_BTagMu_AK8Jet300_Mu5_noalgo_v* # CMSHLT-1941
HLT_Mu12_IP6_ToCSCS_v* # CMSHLT-1951
HLT_Mu7_IP4_ToCSCS_v* # CMSHLT-1951
HLT_Mu8_IP3_ToCSCS_v* # CMSHLT-1951
HLT_Mu8_IP5_ToCSCS_v* # CMSHLT-1951
HLT_Mu8_IP6_ToCSCS_v* # CMSHLT-1951
HLT_Mu9_IP4_ToCSCS_v* # CMSHLT-1951
HLT_Mu9_IP5_ToCSCS_v* # CMSHLT-1951
HLT_Mu9_IP6_ToCSCS_v* # CMSHLT-1951
HLT_CDC_L2cosmic_10_er1p0_v* # CMSHLT-1967
HLT_DiPFJet15_NoCaloMatched_v* # CMSHLT-1972
HLT_DiPFJet25_NoCaloMatched_v* # CMSHLT-1972
HLT_DiPFJet15_FBEta3_NoCaloMatched_v* # CMSHLT-1972
HLT_DiPFJet25_FBEta3_NoCaloMatched_v* # CMSHLT-1972
HLT_DiPFJetAve15_HFJEC_v* # CMSHLT-1972
HLT_DiPFJetAve25_HFJEC_v* # CMSHLT-1972
HLT_DiPFJetAve35_HFJEC_v* # CMSHLT-1972
HLT_Mu9_IP0_part0_v* # CMSHLT-1979
HLT_Mu9_IP3_part0_v* # CMSHLT1979
HLT_PFHT400_FivePFJet_100_100_60_30_30_v* # CMSHLT-1978
HLT_PFHT400_FivePFJet_100_100_60_30_30_DoublePFBTagDeepCSV_4p5_v* # CMSHLT-1978
HLT_PFHT400_FivePFJet_120_120_60_30_30_DoublePFBTagDeepCSV_4p5_v* # CMSHLT-1978

## EndPath ##

Expand Down
2 changes: 1 addition & 1 deletion HLTrigger/Configuration/tables/makeOnlineGRun
View file
Expand Up @@ -4,7 +4,7 @@
#

MASTER="/dev/CMSSW_10_1_0/HLT" # no version, take the latest one
TARGET="/online/collisions/2018/2e34/v3.0/HLT" # where to store the online-compliant menu
TARGET="/online/collisions/2018/2e34/v3.5/HLT" # where to store the online-compliant menu
TABLES="online_grun"

source subtables.sh
Expand Down
15 changes: 14 additions & 1 deletion HLTrigger/Configuration/tables/online_grun.txt
View file
Expand Up @@ -660,7 +660,6 @@ HLT_Mu9_IP4_part4_v* # CMSHLT-1886
HLT_Mu8_IP5_part4_v* # CMSHLT-1886
HLT_Mu8_IP6_part4_v* # CMSHLT-1886
HLT_ZeroBias_Alignment_v* # CMSHLT-1892
HLT_CDC_L2cosmic_5_er1p0_v* # CMSHLT-1896
HLT_CDC_L2cosmic_5p5_er1p0_v* # CMSHLT-1896
HLT_DoubleL2Mu23NoVtx_2Cha_CosmicSeed_NoL2Matched_v* # CMSHLT-1907
HLT_DoubleL2Mu25NoVtx_2Cha_CosmicSeed_NoL2Matched_v* # CMSHLT-1907
Expand All @@ -679,6 +678,20 @@ HLT_BTagMu_AK4Jet300_Mu5_noalgo_v* # CMSHLT-1941
HLT_BTagMu_AK8DiJet170_Mu5_noalgo_v* # CMSHLT-1941
HLT_BTagMu_AK8Jet170_DoubleMu5_noalgo_v* # CMSHLT-1941
HLT_BTagMu_AK8Jet300_Mu5_noalgo_v* # CMSHLT-1941
HLT_Mu12_IP6_ToCSCS_v* # CMSHLT-1951
HLT_Mu7_IP4_ToCSCS_v* # CMSHLT-1951
HLT_Mu8_IP3_ToCSCS_v* # CMSHLT-1951
HLT_Mu8_IP5_ToCSCS_v* # CMSHLT-1951
HLT_Mu8_IP6_ToCSCS_v* # CMSHLT-1951
HLT_Mu9_IP4_ToCSCS_v* # CMSHLT-1951
HLT_Mu9_IP5_ToCSCS_v* # CMSHLT-1951
HLT_Mu9_IP6_ToCSCS_v* # CMSHLT-1951
HLT_CDC_L2cosmic_10_er1p0_v* # CMSHLT-1967
HLT_Mu9_IP0_part0_v* # CMSHLT-1979
HLT_Mu9_IP3_part0_v* # CMSHLT1979
HLT_PFHT400_FivePFJet_100_100_60_30_30_v* # CMSHLT-1978
HLT_PFHT400_FivePFJet_100_100_60_30_30_DoublePFBTagDeepCSV_4p5_v* # CMSHLT-1978
HLT_PFHT400_FivePFJet_120_120_60_30_30_DoublePFBTagDeepCSV_4p5_v* # CMSHLT-1978

## EndPath ##

Expand Down

0 comments on commit 64135c9

Please sign in to comment.