Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further integrations in the HLT Run2 menu #4878

Merged
merged 7 commits into from Aug 5, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6,119 changes: 4,911 additions & 1,208 deletions HLTrigger/Configuration/python/HLT_FULL_Famos_cff.py

Large diffs are not rendered by default.

1,710 changes: 1,661 additions & 49 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

2,830 changes: 2,826 additions & 4 deletions HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py

Large diffs are not rendered by default.

2,336 changes: 2,330 additions & 6 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
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_1_1/HIon/V76 (CMSSW_7_1_4_patch1)
# /dev/CMSSW_7_1_1/HIon/V79 (CMSSW_7_1_4_patch1)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_1/HIon/V76')
tableName = cms.string('/dev/CMSSW_7_1_1/HIon/V79')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_1_1/PIon/V76 (CMSSW_7_1_4_patch1)
# /dev/CMSSW_7_1_1/PIon/V79 (CMSSW_7_1_4_patch1)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_1/PIon/V76')
tableName = cms.string('/dev/CMSSW_7_1_1/PIon/V79')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down
9 changes: 9 additions & 0 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
Expand Up @@ -11,10 +11,18 @@
streamA_datasetInitialPD_selector.throw = cms.bool(False)
streamA_datasetInitialPD_selector.triggerConditions = cms.vstring('HLT_BTagCSV07_v1',
'HLT_CaloJet260_v1',
'HLT_Dimuon13_PsiPrime_v1',
'HLT_Dimuon13_Upsilon_v1',
'HLT_Dimuon20_Jpsi_v1',
'HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_v1',
'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_Reg_v1',
'HLT_DoubleMediumIsoPFTau40_Trk1_eta2p1_v1',
'HLT_DoubleMu4_3_Bs_v1',
'HLT_DoubleMu4_3_Jpsi_Displaced_v1',
'HLT_DoubleMu4_JpsiTrk_Displaced_v1',
'HLT_DoubleMu4_Jpsi_Displaced_v1',
'HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v1',
'HLT_DoubleMu4_PsiPrimeTrk_Displaced_v1',
'HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v1',
'HLT_Ele17_Ele8_Gsf_v1',
'HLT_Ele22_eta2p1_WP90Rho_Gsf_LooseIsoPFTau20_v1',
Expand All @@ -39,6 +47,7 @@
'HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1',
'HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1',
'HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v1',
'HLT_Mu25_TkMu0_dEta18_Onia_v1',
'HLT_Mu30_TkMu11_v1',
'HLT_Mu40_v1',
'HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v1',
Expand Down
4 changes: 1 addition & 3 deletions HLTrigger/Configuration/python/Tools/confdb.py
Expand Up @@ -35,9 +35,7 @@ class HLTProcess(object):
"HLT_IsoTrackHE_v*",
"HLT_L1SingleMuOpen_AntiBPTX_v*",
"HLT_JetE*_NoBPTX*_v*",
"HLT_L2Mu*_NoVertex_NoBPTX*_v*",
"HLT_L2Mu20_NoVertex_2Cha_NoBPTX3BX_NoHalo_v*",
"HLT_L2Mu30_NoVertex_2Cha_NoBPTX3BX_NoHalo_v*",
"HLT_L2Mu*_NoBPTX*_v*",
"HLT_PixelTracks_Multiplicity70_v*",
"HLT_PixelTracks_Multiplicity80_v*",
"HLT_PixelTracks_Multiplicity90_v*",
Expand Down
59 changes: 47 additions & 12 deletions HLTrigger/Configuration/tables/GRun.txt
Expand Up @@ -33,7 +33,6 @@ HLT_PFJet40_v* # JIRA: CMSHLT-67
HLT_PFJet260_v* # JIRA: CMSHLT-67
HLT_PFNoPUJet260_v* # JIRA: CMSHLT-67
HLT_CaloJet260_v* # JIRA: CMSHLT-67
HLT_JetE50_NoBPTX3BX_NoHalo_v* # JIRA: CMSHLT-67
HLT_HT650_v* # JIRA: CMSHLT-67
HLT_PFNoPUHT650_v* # JIRA: CMSHLT-67
HLT_PFHT650_v* # JIRA: CMSHLT-67
Expand All @@ -53,21 +52,57 @@ HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v* # JIRA: CMSHLT-78
HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v* # JIRA: CMSHLT-78
HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v* # JIRA: CMSHLT-78

#HLT_DoubleMu4_3_Bs_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_DoubleMu4_3_Jpsi_Displaced_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_Dimuon20_Jpsi_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_Dimuon13_PsiPrime_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_Dimuon13_Upsilon_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_Mu25_TkMu0_dEta18_Onia_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_DoubleMu4_JpsiTrk_Displaced_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_DoubleMu4_PsiPrimeTrk_Displaced_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v* # JIRA: CMSHLT-82, no DQM yet
HLT_DoubleMu4_3_Bs_v* # JIRA: CMSHLT-82
HLT_DoubleMu4_3_Jpsi_Displaced_v* # JIRA: CMSHLT-82
HLT_Dimuon20_Jpsi_v* # JIRA: CMSHLT-82
HLT_Dimuon13_PsiPrime_v* # JIRA: CMSHLT-82
HLT_Dimuon13_Upsilon_v* # JIRA: CMSHLT-82
HLT_Mu25_TkMu0_dEta18_Onia_v* # JIRA: CMSHLT-82
HLT_DoubleMu4_JpsiTrk_Displaced_v* # JIRA: CMSHLT-82
HLT_DoubleMu4_PsiPrimeTrk_Displaced_v* # JIRA: CMSHLT-82
HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v* # JIRA: CMSHLT-82

#HLT_Photon36_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon18_AND_HE10_R9Id65_Mass95_v* # JIRA: CMSHLT-81, no DQM yet
#HLT_Photon42_R9Id85_OR_CaloId24b40e_Iso50T80L_Photon22_AND_HE10_R9Id65_v* # JIRA: CMSHLT-81, no DQM yet

HLT_Mu30_TkMu11_v* # JIRA: CMSHLT-84

#HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon135_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon150_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon160_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon250_NoHE_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon300_NoHE_PFMET40_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon50_R9Id90_HE10_Iso40_EBOnly_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon75_R9Id90_HE10_Iso40_EBOnly_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon90_R9Id90_HE10_Iso40_EBOnly_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon135_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon150_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon160_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon250_NoHE_VBF_v* # JIRA: CMSHLT-83, no DQM yet
#HLT_Photon300_NoHE_VBF_v* # JIRA: CMSHLT-83, no DQM yet

HLT_Mu30_TkMu11_v* # JIRA: CMSHLT-84

#HLT_L2Mu10_NoVertex_NoBPTX_v* # JIRA: CMSHLT-87
#HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v* # JIRA: CMSHLT-87
#HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v* # JIRA: CMSHLT-87
#HLT_L2Mu30_NoVertex_3Sta_NoBPTX3BX_NoHalo_v* # JIRA: CMSHLT-87
#HLT_JetE30_NoBPTX_v* # JIRA: CMSHLT-87
#HLT_JetE30_NoBPTX3BX_NoHalo_v* # JIRA: CMSHLT-87
HLT_JetE50_NoBPTX3BX_NoHalo_v* # JIRA: CMSHLT-87 (previous version in CMSHLT-67)
#HLT_JetE70_NoBPTX3BX_NoHalo_v* # JIRA: CMSHLT-87

#HLT_DoubleEle33_CaloIdL_GsfTrkIdVL_MW_v* # JIRA: CMSHLT-88
#HLT_Ele95_CaloIdVT_GsfTrkIdT_v* # JIRA: CMSHLT-88
#HLT_DoublePho85_v* # JIRA: CMSHLT-88
#HLT_Photon155_v* # JIRA: CMSHLT-88

#HLT_PFNoPUHT750_4Jet_v* # JIRA: CMSHLT-89

HLT_Physics_v* # skim

Expand Down