Skip to content

Commit

Permalink
Update up to /frozen/2015/25ns14e33/v4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
perrotta committed Sep 2, 2015
1 parent ce95911 commit 9d08a66
Show file tree
Hide file tree
Showing 12 changed files with 5,585 additions and 2,848 deletions.
4 changes: 2 additions & 2 deletions Configuration/HLT/python/autoCondHLT.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

l1Menus= {
'Fake' : 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc',
'FULL' : 'L1Menu_Collisions2015_25nsStage1_v4',
'GRun' : 'L1Menu_Collisions2015_25nsStage1_v4',
'FULL' : 'L1Menu_Collisions2015_25nsStage1_v5_L1T_Scales_20141121',
'GRun' : 'L1Menu_Collisions2015_25nsStage1_v5_L1T_Scales_20141121',
'25ns14e33_v1' : 'L1Menu_Collisions2015_25ns_v2_L1T_Scales_20141121_Imp0_0x1030',
'25ns14e33_v3' : 'L1Menu_Collisions2015_25nsStage1_v4',
'25ns14e33_v4' : 'L1Menu_Collisions2015_25nsStage1_v5_L1T_Scales_20141121',
Expand Down
2,404 changes: 1,604 additions & 800 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

1,642 changes: 1,056 additions & 586 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_4_0/HIon/V137 (CMSSW_7_4_10_patch1)
# /dev/CMSSW_7_4_0/HIon/V138 (CMSSW_7_4_10_patch1)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_4_0/HIon/V137')
tableName = cms.string('/dev/CMSSW_7_4_0/HIon/V138')
)

fragment.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_4_0/PIon/V137 (CMSSW_7_4_10_patch1)
# /dev/CMSSW_7_4_0/PIon/V138 (CMSSW_7_4_10_patch1)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_4_0/PIon/V137')
tableName = cms.string('/dev/CMSSW_7_4_0/PIon/V138')
)

fragment.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
10 changes: 6 additions & 4 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,14 @@
'HLT_Ele15_IsoVVVL_PFHT350_PFMET50_v1',
'HLT_Ele15_IsoVVVL_PFHT350_v1',
'HLT_Ele15_IsoVVVL_PFHT600_v2',
'HLT_Ele22_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_SingleL1_v1',
'HLT_Ele22_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v1',
'HLT_Ele22_eta2p1_WPLoose_Gsf_v1',
'HLT_Ele22_eta2p1_WPTight_Gsf_v1',
'HLT_Ele23_WPLoose_Gsf_v1',
'HLT_Ele27_WPLoose_Gsf_WHbbBoost_v1',
'HLT_Ele27_eta2p1_WPLoose_Gsf_CentralPFJet30_BTagCSV07_v1',
'HLT_Ele27_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau35_Trk1_eta2p1_Reg_v1',
'HLT_Ele27_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1',
'HLT_Ele27_eta2p1_WPLoose_Gsf_HT200_v1',
'HLT_Ele27_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v1',
Expand All @@ -190,8 +192,6 @@
'HLT_Ele27_eta2p1_WPLoose_Gsf_v1',
'HLT_Ele27_eta2p1_WPTight_Gsf_v1',
'HLT_Ele32_eta2p1_WPLoose_Gsf_CentralPFJet30_BTagCSV07_v1',
'HLT_Ele32_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1',
'HLT_Ele32_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v1',
'HLT_Ele32_eta2p1_WPLoose_Gsf_TriCentralPFJet30_v1',
'HLT_Ele32_eta2p1_WPLoose_Gsf_TriCentralPFJet50_40_30_v1',
'HLT_Ele32_eta2p1_WPLoose_Gsf_v1',
Expand Down Expand Up @@ -426,7 +426,8 @@
streamA_datasetTau_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamA_datasetTau_selector.l1tResults = cms.InputTag('')
streamA_datasetTau_selector.throw = cms.bool(False)
streamA_datasetTau_selector.triggerConditions = cms.vstring('HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v2',
streamA_datasetTau_selector.triggerConditions = cms.vstring('HLT_DoubleMediumIsoPFTau35_Trk1_eta2p1_Reg_v1',
'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v2',
'HLT_LooseIsoPFTau50_Trk30_eta2p1_MET120_JetIdCleaned_v1',
'HLT_LooseIsoPFTau50_Trk30_eta2p1_MET80_JetIdCleaned_v1',
'HLT_LooseIsoPFTau50_Trk30_eta2p1_v2')
Expand Down Expand Up @@ -552,15 +553,16 @@
'HLT_IsoMu16_eta2p1_MET30_JetIdCleaned_v1',
'HLT_IsoMu17_eta2p1_LooseIsoPFTau20_SingleL1_v2',
'HLT_IsoMu17_eta2p1_LooseIsoPFTau20_v2',
'HLT_IsoMu17_eta2p1_MediumIsoPFTau35_Trk1_eta2p1_Reg_v1',
'HLT_IsoMu17_eta2p1_MediumIsoPFTau40_Trk1_eta2p1_Reg_v2',
'HLT_IsoMu17_eta2p1_v2',
'HLT_IsoMu20_eta2p1_CentralPFJet30_BTagCSV07_v2',
'HLT_IsoMu20_eta2p1_LooseIsoPFTau20_v1',
'HLT_IsoMu20_eta2p1_TriCentralPFJet30_v2',
'HLT_IsoMu20_eta2p1_TriCentralPFJet50_40_30_v2',
'HLT_IsoMu20_eta2p1_v2',
'HLT_IsoMu20_v2',
'HLT_IsoMu24_eta2p1_CentralPFJet30_BTagCSV07_v2',
'HLT_IsoMu24_eta2p1_LooseIsoPFTau20_v2',
'HLT_IsoMu24_eta2p1_TriCentralPFJet30_v2',
'HLT_IsoMu24_eta2p1_TriCentralPFJet50_40_30_v2',
'HLT_IsoMu24_eta2p1_v2',
Expand Down
24 changes: 21 additions & 3 deletions HLTrigger/Configuration/tables/GRun.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ HLT_PFJet500_v* # JIRA: CMSHLT-123, CMSHLT-543
#HLT_IterativeTracking_v* # JIRA: CMSHLT-68 -> TEMPLATE PATH, not for GRun
MC_ReducedIterativeTracking_v* # JIRA: CMSHLT-68, updated by CMSHLT-107 -> TEMPLATE PATH, in GRun but prescaled to 0

HLT_IsoMu24_eta2p1_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu20_eta2p1_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335, CMSHLT-555
HLT_IsoMu17_eta2p1_MediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu17_eta2p1_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335
HLT_DoubleIsoMu17_eta2p1_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu16_eta2p1_MET30_JetIdCleaned_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335, CMSHLT-482
HLT_Mu16_eta2p1_MET30_JetIdCleaned_v* # JIRA: CMSHLT-160, CMSHLT-482
HLT_Ele22_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-110, mod. CMSHLT-160, CMSHLT-232, CMSHLT-330
HLT_Ele32_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330
HLT_Ele32_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330
#HLT_Ele32_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330, removed by CMSHLT-555
#HLT_Ele32_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330, removed by CMSHLT-555
HLT_Ele22_eta2p1_WPLoose_Gsf_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330
HLT_DoubleEle24_22_eta2p1_WPLoose_Gsf_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330
HLT_LooseIsoPFTau50_Trk30_eta2p1_v* # JIRA: CMSHLT-160 prescale to 1.5Hz
Expand All @@ -80,6 +80,11 @@ HLT_IsoMu17_eta2p1_LooseIsoPFTau20_SingleL1_v* # JIRA: CMSHLT-160, mod. CM
HLT_Ele27_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330 (only for 7e33)
HLT_Ele27_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330 (only for 7e33)

HLT_DoubleMediumIsoPFTau35_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-555
HLT_IsoMu17_eta2p1_MediumIsoPFTau35_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-555
HLT_Ele27_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau35_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-555
HLT_Ele22_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_SingleL1_v1 # JIRA: CMSHLT-555

HLT_IsoMu20_eta2p1_TriCentralPFJet50_40_30_v* # JIRA: CMSHLT-193, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu20_eta2p1_TriCentralPFJet30_v* # JIRA: CMSHLT-193, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu20_eta2p1_CentralPFJet30_BTagCSV07_v* # JIRA: CMSHLT-193, mod. CMSHLT-272, CMSHLT-335, CMSHLT-405
Expand Down Expand Up @@ -516,6 +521,19 @@ HLT_L2Mu10_v* # JIRA: CMSHLT-500
#HLT_HIL2DoubleMu0BPTX_v* # JIRA: CMSHLT-496
#HLT_HIL3Mu3BPTX_v* # JIRA: CMSHLT-496

#HLT_DoublePhoton60_v* # JIRA: CMSHLT-563

#HLT_DoublePhoton40_v* # JIRA: CMSHLT-564 (for 0T menu)
#HLT_DoublePhoton50_v* # JIRA: CMSHLT-564 (for 0T menu)
#HLT_Photon150_v* # JIRA: CMSHLT-564 (for 0T menu)

#HLT_Photon90_CaloIdL_HT300_v* # JIRA: CMSHLT-565 (for 0T menu)
#HLT_HT250_CaloMET70_JetIdCleaned_v* # JIRA: CMSHLT-565 (for 0T menu)

#HLT_Photon125_v* # JIRA: CMSHLT-540 (for 0T menu)
#HLT_MET100_JetIdCleaned_v* # JIRA: CMSHLT-540 (for 0T menu)
#HLT_MET150_JetIdCleaned_v* # JIRA: CMSHLT-540 (for 0T menu)

HLT_ZeroBias_v* # JIRA: CMSHLT-117

HLT_Activity_Ecal_SC7_v* # JIRA: CMSHLT-252
Expand Down
24 changes: 21 additions & 3 deletions HLTrigger/Configuration/tables/online_grun.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ HLT_PFJet500_v* # JIRA: CMSHLT-123, CMSHLT-543
#HLT_IterativeTracking_v* # JIRA: CMSHLT-68 -> TEMPLATE PATH, not for GRun
#MC_ReducedIterativeTracking_v* # JIRA: CMSHLT-68, updated by CMSHLT-107 -> MC path, not for online

HLT_IsoMu24_eta2p1_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu20_eta2p1_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335, CMSHLT-555
HLT_IsoMu17_eta2p1_MediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu17_eta2p1_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335
HLT_DoubleIsoMu17_eta2p1_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu16_eta2p1_MET30_JetIdCleaned_v* # JIRA: CMSHLT-160, mod. CMSHLT-272, CMSHLT-335, CMSHLT-482
HLT_Mu16_eta2p1_MET30_JetIdCleaned_v* # JIRA: CMSHLT-160, CMSHLT-482
HLT_Ele22_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-110, mod. CMSHLT-160, CMSHLT-232, CMSHLT-330
HLT_Ele32_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330
HLT_Ele32_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330
#HLT_Ele32_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330, removed by CMSHLT-555
#HLT_Ele32_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330, removed by CMSHLT-555
HLT_Ele22_eta2p1_WPLoose_Gsf_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330
HLT_DoubleEle24_22_eta2p1_WPLoose_Gsf_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330
HLT_LooseIsoPFTau50_Trk30_eta2p1_v* # JIRA: CMSHLT-160 prescale to 1.5Hz
Expand All @@ -80,6 +80,11 @@ HLT_IsoMu17_eta2p1_LooseIsoPFTau20_SingleL1_v* # JIRA: CMSHLT-160, mod. CM
HLT_Ele27_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330 (only for 7e33)
HLT_Ele27_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v* # JIRA: CMSHLT-160, mod. CMSHLT-232, CMSHLT-330 (only for 7e33)

HLT_DoubleMediumIsoPFTau35_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-555
HLT_IsoMu17_eta2p1_MediumIsoPFTau35_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-555
HLT_Ele27_eta2p1_WPLoose_Gsf_DoubleMediumIsoPFTau35_Trk1_eta2p1_Reg_v* # JIRA: CMSHLT-555
HLT_Ele22_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_SingleL1_v1 # JIRA: CMSHLT-555

HLT_IsoMu20_eta2p1_TriCentralPFJet50_40_30_v* # JIRA: CMSHLT-193, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu20_eta2p1_TriCentralPFJet30_v* # JIRA: CMSHLT-193, mod. CMSHLT-272, CMSHLT-335
HLT_IsoMu20_eta2p1_CentralPFJet30_BTagCSV07_v* # JIRA: CMSHLT-193, mod. CMSHLT-272, CMSHLT-335, CMSHLT-405
Expand Down Expand Up @@ -516,6 +521,19 @@ HLT_L2Mu10_v* # JIRA: CMSHLT-500
#HLT_HIL2DoubleMu0BPTX_v* # JIRA: CMSHLT-496
#HLT_HIL3Mu3BPTX_v* # JIRA: CMSHLT-496

#HLT_DoublePhoton60_v* # JIRA: CMSHLT-563

#HLT_DoublePhoton40_v* # JIRA: CMSHLT-564 (for 0T menu)
#HLT_DoublePhoton50_v* # JIRA: CMSHLT-564 (for 0T menu)
#HLT_Photon150_v* # JIRA: CMSHLT-564 (for 0T menu)

#HLT_Photon90_CaloIdL_HT300_v* # JIRA: CMSHLT-565 (for 0T menu)
#HLT_HT250_CaloMET70_JetIdCleaned_v* # JIRA: CMSHLT-565 (for 0T menu)

#HLT_Photon125_v* # JIRA: CMSHLT-540 (for 0T menu)
#HLT_MET100_JetIdCleaned_v* # JIRA: CMSHLT-540 (for 0T menu)
#HLT_MET150_JetIdCleaned_v* # JIRA: CMSHLT-540 (for 0T menu)

HLT_ZeroBias_v* # JIRA: CMSHLT-117

HLT_Activity_Ecal_SC7_v* # JIRA: CMSHLT-252
Expand Down
Loading

0 comments on commit 9d08a66

Please sign in to comment.