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.

Sign up for GitHub

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

HLT development updates for 80X #13037

Merged
merged 8 commits into from
Jan 25, 2016
Merged

HLT development updates for 80X #13037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
37331db
Update HLT menus up to /dev/CMSSW_7_6_0/HLT/V27
perrotta Jan 13, 2016
922840a
Rebase to 800pre5 and new test input files
Martin-Grunewald Jan 22, 2016
3da74a0
Fix HIon
Martin-Grunewald Jan 22, 2016
3fdc5c7
Accumulated HLT update
Martin-Grunewald Jan 22, 2016
bc21673
Move to 800 area in ConfDB
Martin-Grunewald Jan 22, 2016
cef93b5
Merged HltUpdatesFor80X from repository cms-tsg-storm
Martin-Grunewald Jan 25, 2016
66d2069
Cleanup
Martin-Grunewald Jan 25, 2016
d259aa7
HLT updates
Martin-Grunewald Jan 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
790 changes: 404 additions & 386 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_6_0/Fake/V3 (CMSSW_7_6_3)
# /dev/CMSSW_8_0_0/Fake/V2 (CMSSW_8_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_6_0/Fake/V3')
tableName = cms.string('/dev/CMSSW_8_0_0/Fake/V2')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
739 changes: 376 additions & 363 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

265 changes: 145 additions & 120 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

266 changes: 143 additions & 123 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

253 changes: 137 additions & 116 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
'HLT_DoublePhoton60_v1',
'HLT_DoublePhoton85_v2',
'HLT_ECALHT800_v2',
'HLT_Ele10_CaloIdM_TrackIdM_CentralPFJet30_BTagCSV0p54PF_v3',
'HLT_Ele10_CaloIdM_TrackIdM_CentralPFJet30_BTagCSV_p13_v1',
'HLT_Ele12_CaloIdL_TrackIdL_IsoVL_PFJet30_v3',
'HLT_Ele12_CaloIdL_TrackIdL_IsoVL_v3',
'HLT_Ele12_CaloIdM_TrackIdM_PFJet30_v3',
Expand Down Expand Up @@ -121,19 +121,19 @@
streamA_datasetSingleElectron_selector.throw = cms.bool(False)
streamA_datasetSingleElectron_selector.triggerConditions = cms.vstring('HLT_Ele105_CaloIdVT_GsfTrkIdT_v3',
'HLT_Ele115_CaloIdVT_GsfTrkIdT_v2',
'HLT_Ele15_IsoVVVL_BTagCSV0p72_PFHT400_v3',
'HLT_Ele15_IsoVVVL_BTagCSV_p067_PFHT400_v1',
'HLT_Ele15_IsoVVVL_PFHT350_PFMET50_v2',
'HLT_Ele15_IsoVVVL_PFHT350_v2',
'HLT_Ele15_IsoVVVL_PFHT600_v3',
'HLT_Ele22_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_SingleL1_v2',
'HLT_Ele22_eta2p1_WPLoose_Gsf_LooseIsoPFTau20_v3',
'HLT_Ele22_eta2p1_WPLoose_Gsf_v3',
'HLT_Ele22_eta2p1_WPTight_Gsf_v3',
'HLT_Ele23_WPLoose_Gsf_CentralPFJet30_BTagCSV07_v2',
'HLT_Ele23_WPLoose_Gsf_CentralPFJet30_BTagCSV_p063_v1',
'HLT_Ele23_WPLoose_Gsf_TriCentralPFJet50_40_30_v2',
'HLT_Ele23_WPLoose_Gsf_WHbbBoost_v2',
'HLT_Ele23_WPLoose_Gsf_v3',
'HLT_Ele27_WPLoose_Gsf_CentralPFJet30_BTagCSV07_v1',
'HLT_Ele27_WPLoose_Gsf_CentralPFJet30_BTagCSV_p063_v1',
'HLT_Ele27_WPLoose_Gsf_TriCentralPFJet50_40_30_v1',
'HLT_Ele27_WPLoose_Gsf_WHbbBoost_v2',
'HLT_Ele27_WPLoose_Gsf_v1',
Expand Down Expand Up @@ -203,20 +203,20 @@
streamA_datasetBTagCSV_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamA_datasetBTagCSV_selector.l1tResults = cms.InputTag('')
streamA_datasetBTagCSV_selector.throw = cms.bool(False)
streamA_datasetBTagCSV_selector.triggerConditions = cms.vstring('HLT_DoubleJet90_Double30_DoubleBTagCSV0p67_v3',
'HLT_DoubleJet90_Double30_TripleBTagCSV0p67_v3',
'HLT_DoubleJetsC100_DoubleBTagCSV0p85_DoublePFJetsC160_v2',
'HLT_DoubleJetsC100_DoubleBTagCSV0p9_DoublePFJetsC100MaxDeta1p6_v2',
'HLT_DoubleJetsC112_DoubleBTagCSV0p85_DoublePFJetsC172_v2',
'HLT_DoubleJetsC112_DoubleBTagCSV0p9_DoublePFJetsC112MaxDeta1p6_v2',
'HLT_QuadJet45_DoubleBTagCSV0p67_v3',
'HLT_QuadJet45_TripleBTagCSV0p67_v3',
'HLT_QuadPFJet_DoubleBTagCSV_VBF_Mqq200_v4',
'HLT_QuadPFJet_DoubleBTagCSV_VBF_Mqq240_v4',
'HLT_QuadPFJet_SingleBTagCSV_VBF_Mqq460_v4',
'HLT_QuadPFJet_SingleBTagCSV_VBF_Mqq500_v4',
'HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoublePFBTagCSV0p7_0p4_Mbb60_200_v1',
'HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoublePFBTagCSV0p7_Mbb60_200_v1')
streamA_datasetBTagCSV_selector.triggerConditions = cms.vstring('HLT_DoubleJet90_Double30_DoubleBTagCSV_p087_v1',
'HLT_DoubleJet90_Double30_TripleBTagCSV_p087_v1',
'HLT_DoubleJetsC100_DoubleBTagCSV_p014_DoublePFJetsC100MaxDeta1p6_v1',
'HLT_DoubleJetsC100_DoubleBTagCSV_p026_DoublePFJetsC160_v1',
'HLT_DoubleJetsC112_DoubleBTagCSV_p014_DoublePFJetsC112MaxDeta1p6_v1',
'HLT_DoubleJetsC112_DoubleBTagCSV_p026_DoublePFJetsC172_v1',
'HLT_QuadJet45_DoubleBTagCSV_p087_v1',
'HLT_QuadJet45_TripleBTagCSV_p087_v1',
'HLT_QuadPFJet_BTagCSV_p037_VBF_Mqq460_v1',
'HLT_QuadPFJet_BTagCSV_p037_VBF_Mqq500_v1',
'HLT_QuadPFJet_BTagCSV_p037_p11_VBF_Mqq200_v1',
'HLT_QuadPFJet_BTagCSV_p037_p11_VBF_Mqq240_v1',
'HLT_Rsq0p02_MR300_TriPFJet80_60_40_BTagCSV_p063_p20_Mbb60_200_v1',
'HLT_Rsq0p02_MR300_TriPFJet80_60_40_DoubleBTagCSV_p063_Mbb60_200_v1')

from HLTrigger.HLTfilters.triggerResultsFilter_cfi import triggerResultsFilter as streamA_datasetBTagMu_selector
streamA_datasetBTagMu_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
Expand Down Expand Up @@ -282,9 +282,9 @@
streamA_datasetJetHT_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamA_datasetJetHT_selector.l1tResults = cms.InputTag('')
streamA_datasetJetHT_selector.throw = cms.bool(False)
streamA_datasetJetHT_selector.triggerConditions = cms.vstring('HLT_AK8DiPFJet250_200_TrimMass30_BTagCSV0p45_v2',
'HLT_AK8DiPFJet280_200_TrimMass30_BTagCSV0p45_v3',
'HLT_AK8PFHT600_TrimR0p1PT0p03Mass50_BTagCSV0p45_v2',
streamA_datasetJetHT_selector.triggerConditions = cms.vstring('HLT_AK8DiPFJet250_200_TrimMass30_BTagCSV_p20_v1',
'HLT_AK8DiPFJet280_200_TrimMass30_BTagCSV_p20_v1',
'HLT_AK8PFHT600_TrimR0p1PT0p03Mass50_BTagCSV_p20_v1',
'HLT_AK8PFHT650_TrimR0p1PT0p03Mass50_v2',
'HLT_AK8PFHT700_TrimR0p1PT0p03Mass50_v3',
'HLT_AK8PFJet360_TrimMass30_v3',
Expand Down Expand Up @@ -316,10 +316,10 @@
'HLT_PFHT250_v2',
'HLT_PFHT300_v2',
'HLT_PFHT350_v3',
'HLT_PFHT400_SixJet30_BTagCSV0p55_2PFBTagCSV0p72_v3',
'HLT_PFHT400_SixJet30_DoubleBTagCSV_p056_v1',
'HLT_PFHT400_SixJet30_v3',
'HLT_PFHT400_v2',
'HLT_PFHT450_SixJet40_PFBTagCSV0p72_v3',
'HLT_PFHT450_SixJet40_BTagCSV_p056_v1',
'HLT_PFHT450_SixJet40_v3',
'HLT_PFHT475_v2',
'HLT_PFHT550_4JetPt50_v1',
Expand All @@ -346,7 +346,7 @@
streamA_datasetMET_selector.hltResults = cms.InputTag('TriggerResults', '', 'HLT')
streamA_datasetMET_selector.l1tResults = cms.InputTag('')
streamA_datasetMET_selector.throw = cms.bool(False)
streamA_datasetMET_selector.triggerConditions = cms.vstring('HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_BTagCSV0p72_v2',
streamA_datasetMET_selector.triggerConditions = cms.vstring('HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_BTagCSV_p067_v1',
'HLT_CaloMHTNoPU90_PFMET90_PFMHT90_IDTight_v2',
'HLT_MET200_v1',
'HLT_MET250_v1',
Expand All @@ -361,10 +361,10 @@
'HLT_Mu14er_PFMET100_v1',
'HLT_Mu3er_PFHT140_PFMET125_v1',
'HLT_Mu6_PFHT200_PFMET100_v1',
'HLT_Mu6_PFHT200_PFMET80_BTagCSV0p72_v1',
'HLT_Mu6_PFHT200_PFMET80_BTagCSV_p067_v1',
'HLT_PFMET100_PFMHT100_IDTight_v2',
'HLT_PFMET110_PFMHT110_IDTight_v2',
'HLT_PFMET120_BTagCSV0p72_v1',
'HLT_PFMET120_BTagCSV_p067_v1',
'HLT_PFMET120_Mu5_v1',
'HLT_PFMET120_PFMHT120_IDTight_v2',
'HLT_PFMET170_HBHECleaned_v2',
Expand Down Expand Up @@ -429,7 +429,7 @@
'HLT_L2DoubleMu23_NoVertex_v2',
'HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v2',
'HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v2',
'HLT_Mu10_CentralPFJet30_BTagCSV0p54PF_v3',
'HLT_Mu10_CentralPFJet30_BTagCSV_p13_v1',
'HLT_Mu17_Mu8_DZ_v2',
'HLT_Mu17_Mu8_SameSign_DZ_v1',
'HLT_Mu17_Mu8_v1',
Expand Down Expand Up @@ -512,12 +512,12 @@
'HLT_IsoMu17_eta2p1_MediumIsoPFTau35_Trk1_eta2p1_Reg_v3',
'HLT_IsoMu17_eta2p1_MediumIsoPFTau40_Trk1_eta2p1_Reg_v5',
'HLT_IsoMu17_eta2p1_v3',
'HLT_IsoMu18_CentralPFJet30_BTagCSV07_v2',
'HLT_IsoMu18_CentralPFJet30_BTagCSV_p063_v1',
'HLT_IsoMu18_TriCentralPFJet50_40_30_v2',
'HLT_IsoMu18_v2',
'HLT_IsoMu20_eta2p1_LooseIsoPFTau20_v3',
'HLT_IsoMu20_v3',
'HLT_IsoMu22_CentralPFJet30_BTagCSV07_v2',
'HLT_IsoMu22_CentralPFJet30_BTagCSV_p063_v1',
'HLT_IsoMu22_TriCentralPFJet50_40_30_v2',
'HLT_IsoMu22_v2',
'HLT_IsoMu27_v3',
Expand All @@ -529,7 +529,7 @@
'HLT_L1SingleMuOpen_v2',
'HLT_L2Mu10_v1',
'HLT_Mu10_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT350_PFMETNoMu60_v1',
'HLT_Mu15_IsoVVVL_BTagCSV0p72_PFHT400_v3',
'HLT_Mu15_IsoVVVL_BTagCSV_p067_PFHT400_v1',
'HLT_Mu15_IsoVVVL_PFHT350_PFMET50_v2',
'HLT_Mu15_IsoVVVL_PFHT350_v2',
'HLT_Mu15_IsoVVVL_PFHT600_v3',
Expand Down
28 changes: 0 additions & 28 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,6 @@ def esproducers_by_type(process, *types):
#
# one action function per PR - put the PR number into the name of the function

# Remove hcalTopologyConstants
def customiseFor11920(process):
if hasattr(process,'HcalGeometryFromDBEP'):
if hasattr(process.HcalGeometryFromDBEP,'hcalTopologyConstants'):
delattr(process.HcalGeometryFromDBEP,'hcalTopologyConstants')
if hasattr(process,'HcalTopologyIdealEP'):
if hasattr(process.HcalTopologyIdealEP,'hcalTopologyConstants'):
delattr(process.HcalTopologyIdealEP,'hcalTopologyConstants')
if hasattr(process,'CaloTowerGeometryFromDBEP'):
if hasattr(process.CaloTowerGeometryFromDBEP,'hcalTopologyConstants'):
delattr(process.CaloTowerGeometryFromDBEP,'hcalTopologyConstants')
return process

def customiseFor12346(process):
if hasattr(process, 'hltMetCleanUsingJetID'):
if hasattr(process.hltMetCleanUsingJetID, 'usePt'):
delattr(process.hltMetCleanUsingJetID, 'usePt')
return process

def customiseFor12718(process):
for pset in process._Process__psets.values():
if hasattr(pset,'ComponentType'):
Expand All @@ -38,22 +19,13 @@ def customiseFor12718(process):
pset.minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('HLTSiStripClusterChargeCutNone'))
return process

def customiseFor12387(process):
for producer in producers_by_type(process, 'SiStripRawToDigiModule'):
if not hasattr(producer,'LegacyUnpacker'):
setattr(producer,'LegacyUnpacker',cms.bool(False))
return process

#
# CMSSW version specific customizations
def customiseHLTforCMSSW(process, menuType="GRun", fastSim=False):
import os
cmsswVersion = os.environ['CMSSW_VERSION']

if cmsswVersion >= "CMSSW_8_0":
process = customiseFor12346(process)
process = customiseFor11920(process)
process = customiseFor12718(process)
process = customiseFor12387(process)

return process
123 changes: 0 additions & 123 deletions HLTrigger/Configuration/python/customizeHLTforNewJetCorrectors.py
View file
Open in desktop

This file was deleted.

Loading