Skip to content

Commit

Permalink
Merged HLTinApril81X from repository cms-tsg-storm
Browse files Browse the repository at this point in the history
  • Loading branch information
@Martin-Grunewald
Martin-Grunewald committed Apr 15, 2016
2 parents 1898a91 + e58c790 commit d939808
Show file tree
Hide file tree
Showing 17 changed files with 11,885 additions and 11,355 deletions.
7,119 changes: 3,893 additions & 3,226 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file

Large diffs are not rendered by default.

915 changes: 819 additions & 96 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file

Large diffs are not rendered by default.

403 changes: 357 additions & 46 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file

Large diffs are not rendered by default.

403 changes: 357 additions & 46 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file

Large diffs are not rendered by default.

2,658 changes: 462 additions & 2,196 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_PRef_cff.py
View file
Expand Up @@ -88,18 +88,6 @@
'HLT_AK4PFBJetBSSV60_Eta2p1ForPPRef_v1',
'HLT_AK4PFBJetBSSV80_Eta2p1ForPPRef_v1')

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamA_datasetHeavyFlavor_selector
streamA_datasetHeavyFlavor_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamA_datasetHeavyFlavor_selector.l1tResults = cms.InputTag('')
streamA_datasetHeavyFlavor_selector.throw = cms.bool(False)
streamA_datasetHeavyFlavor_selector.triggerConditions = cms.vstring('HLT_DmesonPPTrackingGlobal_Dpt15ForPPRef_v1',
'HLT_DmesonPPTrackingGlobal_Dpt20ForPPRef_v1',
'HLT_DmesonPPTrackingGlobal_Dpt30ForPPRef_v1',
'HLT_DmesonPPTrackingGlobal_Dpt40ForPPRef_v1',
'HLT_DmesonPPTrackingGlobal_Dpt50ForPPRef_v1',
'HLT_DmesonPPTrackingGlobal_Dpt60ForPPRef_v1',
'HLT_DmesonPPTrackingGlobal_Dpt8ForPPRef_v1')

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamA_datasetHighPtJet80_selector
streamA_datasetHighPtJet80_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamA_datasetHighPtJet80_selector.l1tResults = cms.InputTag('')
Expand Down
2 changes: 2 additions & 0 deletions HLTrigger/Configuration/python/customizeHLTforMC.py
View file
Expand Up @@ -289,6 +289,7 @@ def customizeHLTforMC(process,_fastSim=False):
"HLTIterativeTrackingTau3Mu",
"HLTIterativeTrackingReg",
"HLTIterativeTrackingForPA",
"HLTPAIterativeTracking",
"HLTIterativeTrackingForElectronIter02",
"HLTIterativeTrackingForPhotonsIter02",
"HLTIterativeTrackingL3MuonIter02",
Expand Down Expand Up @@ -449,6 +450,7 @@ def customizeHLTforMC(process,_fastSim=False):
('hltIter0PFlowTrackSelectionHighPurityForBTag', 'generalTracks'),
('hltIter4HighPtMerged', 'generalTracks'),
('hltIterativeTrackingForPAMerged', 'generalTracks'),
('hltPAIterativeTrackingMerged', 'generalTracks'),

('hltFastPVPixelTracks','hltPixelTracks'),
('hltFastPVPixelTracksRecover','hltPixelTracks'),
Expand Down
10 changes: 9 additions & 1 deletion HLTrigger/Configuration/tables/GRun.txt
View file
Expand Up @@ -559,6 +559,11 @@ HLT_PixelTracks_Multiplicity110ForEndOfFill_v* # JIRA: CMSHLT-486
HLT_PixelTracks_Multiplicity135ForEndOfFill_v* # JIRA: CMSHLT-486
HLT_PixelTracks_Multiplicity160ForEndOfFill_v* # JIRA: CMSHLT-486

#HLT_FullTracks_Multiplicity80_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity100_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity130_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity150_v* # JIRA: CMSHLT-716

HLT_HISinglePhoton10_v* # JIRA: CMSHLT-493, CMSHLT-748
HLT_HISinglePhoton15_v* # JIRA: CMSHLT-493, CMSHLT-748
HLT_HISinglePhoton20_v* # JIRA: CMSHLT-493, CMSHLT-748
Expand Down Expand Up @@ -621,7 +626,10 @@ HLT_ZeroBias_IsolatedBunches_v* # JIRA: CMSHLT-595
#HLT_Activity_Ecal_SC7_v* # JIRA: CMSHLT-252, removed by CMSHLT-698
HLT_EcalCalibration_v* # JIRA: CMSHLT-281
AlCa_EcalPhiSym_v* # JIRA: CMSHLT-276
AlCa_Ele23_WPVeryLoose_Gsf_v* # JIRA: CMSHLT-366, CMSHLT-556, CMSHLT-711

AlCa_SingleEle_WPVeryLoose_Gsf_v* # JIRA: CMSHLT-366, CMSHLT-556, CMSHLT-711, CMSHLT-713
AlCa_DoubleEle_CaloIdL_TrackIdL_IsoVL_DZ_v* # JIRA: CMSHLT-713
AlCa_DoubleEle_CaloIdL_TrackIdL_IsoVL_v* # JIRA: CMSHLT-713

AlCa_EcalPi0EBonly_v* # JIRA: CMSHLT-514
AlCa_EcalPi0EEonly_v* # JIRA: CMSHLT-514
Expand Down
5 changes: 5 additions & 0 deletions HLTrigger/Configuration/tables/PIon.txt
View file
Expand Up @@ -14,6 +14,11 @@ HLT_HIL3Mu3BPTX_v* # JIRA: CMSHLT-715
HLT_FullTrack12ForEndOfFill_v* # JIRA: CMSHLT-733
HLT_FullTrack50_v* # JIRA: CMSHLT-733

#HLT_FullTracks_Multiplicity80_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity100_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity130_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity150_v* # JIRA: CMSHLT-716

HLT_Physics_v*

HLTriggerFirstPath
Expand Down
24 changes: 12 additions & 12 deletions HLTrigger/Configuration/tables/PRef.txt
View file
Expand Up @@ -64,11 +64,11 @@ HLT_HIL3Mu15ForPPRef_v* # CMSHLT-684
HLT_HIL2Mu20ForPPRef_v* # CMSHLT-684
HLT_HIL3Mu20ForPPRef_v* # CMSHLT-684

HLT_FullTrack18ForPPRef_v* # CMSHLT-684
HLT_FullTrack24ForPPRef_v* # CMSHLT-684
HLT_FullTrack34ForPPRef_v* # CMSHLT-684
HLT_FullTrack45ForPPRef_v* # CMSHLT-684
HLT_FullTrack53ForPPRef_v* # CMSHLT-684
#HLT_FullTrack18ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_FullTrack24ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_FullTrack34ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_FullTrack45ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_FullTrack53ForPPRef_v* # CMSHLT-684, CMSHLT-716

HLT_HIUPCL1DoubleMuOpenNotHF2ForPPRef_v* # CMSHLT-684
HLT_HIUPCDoubleMuNotHF2Pixel_SingleTrackForPPRef_v* # CMSHLT-684
Expand All @@ -86,13 +86,13 @@ HLT_HIUPCNotZdcOR_BptxANDPixel_SingleTrackForPPRef_v* # CMSHLT-684
HLT_HIL1CastorMediumJetForPPRef_v* # CMSHLT-684
HLT_HICastorMediumJetPixel_SingleTrackForPPRef_v* # CMSHLT-684

HLT_DmesonPPTrackingGlobal_Dpt8ForPPRef_v* # CMSHLT-684
HLT_DmesonPPTrackingGlobal_Dpt15ForPPRef_v* # CMSHLT-684
HLT_DmesonPPTrackingGlobal_Dpt20ForPPRef_v* # CMSHLT-684
HLT_DmesonPPTrackingGlobal_Dpt30ForPPRef_v* # CMSHLT-684
HLT_DmesonPPTrackingGlobal_Dpt40ForPPRef_v* # CMSHLT-684
HLT_DmesonPPTrackingGlobal_Dpt50ForPPRef_v* # CMSHLT-684
HLT_DmesonPPTrackingGlobal_Dpt60ForPPRef_v* # CMSHLT-684
#HLT_DmesonPPTrackingGlobal_Dpt8ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_DmesonPPTrackingGlobal_Dpt15ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_DmesonPPTrackingGlobal_Dpt20ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_DmesonPPTrackingGlobal_Dpt30ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_DmesonPPTrackingGlobal_Dpt40ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_DmesonPPTrackingGlobal_Dpt50ForPPRef_v* # CMSHLT-684, CMSHLT-716
#HLT_DmesonPPTrackingGlobal_Dpt60ForPPRef_v* # CMSHLT-684, CMSHLT-716

HLT_AK4PFBJetBCSV60_Eta2p1ForPPRef_v* # CMSHLT-684
HLT_AK4PFBJetBCSV80_Eta2p1ForPPRef_v* # CMSHLT-684
Expand Down
10 changes: 9 additions & 1 deletion HLTrigger/Configuration/tables/online_grun.txt
View file
Expand Up @@ -559,6 +559,11 @@ HLT_PixelTracks_Multiplicity110ForEndOfFill_v* # JIRA: CMSHLT-486
HLT_PixelTracks_Multiplicity135ForEndOfFill_v* # JIRA: CMSHLT-486
HLT_PixelTracks_Multiplicity160ForEndOfFill_v* # JIRA: CMSHLT-486

#HLT_FullTracks_Multiplicity80_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity100_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity130_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity150_v* # JIRA: CMSHLT-716

HLT_HISinglePhoton10_v* # JIRA: CMSHLT-493, CMSHLT-748
HLT_HISinglePhoton15_v* # JIRA: CMSHLT-493, CMSHLT-748
HLT_HISinglePhoton20_v* # JIRA: CMSHLT-493, CMSHLT-748
Expand Down Expand Up @@ -621,7 +626,10 @@ HLT_ZeroBias_IsolatedBunches_v* # JIRA: CMSHLT-595
#HLT_Activity_Ecal_SC7_v* # JIRA: CMSHLT-252, removed by CMSHLT-698
HLT_EcalCalibration_v* # JIRA: CMSHLT-281
AlCa_EcalPhiSym_v* # JIRA: CMSHLT-276
AlCa_Ele23_WPVeryLoose_Gsf_v* # JIRA: CMSHLT-366, CMSHLT-556, CMSHLT-711

AlCa_SingleEle_WPVeryLoose_Gsf_v* # JIRA: CMSHLT-366, CMSHLT-556, CMSHLT-711, CMSHLT-713
AlCa_DoubleEle_CaloIdL_TrackIdL_IsoVL_DZ_v* # JIRA: CMSHLT-713
AlCa_DoubleEle_CaloIdL_TrackIdL_IsoVL_v* # JIRA: CMSHLT-713

AlCa_EcalPi0EBonly_v* # JIRA: CMSHLT-514
AlCa_EcalPi0EEonly_v* # JIRA: CMSHLT-514
Expand Down
5 changes: 5 additions & 0 deletions HLTrigger/Configuration/tables/online_pion.txt
View file
Expand Up @@ -14,6 +14,11 @@ HLT_HIL3Mu3BPTX_v* # JIRA: CMSHLT-715
HLT_FullTrack12ForEndOfFill_v* # JIRA: CMSHLT-733
HLT_FullTrack50_v* # JIRA: CMSHLT-733

#HLT_FullTracks_Multiplicity80_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity100_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity130_v* # JIRA: CMSHLT-716
#HLT_FullTracks_Multiplicity150_v* # JIRA: CMSHLT-716

HLT_Physics_v*

HLTriggerFirstPath
Expand Down

0 comments on commit d939808

Please sign in to comment.