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

HLT v2.1 update (81X). #14811

Merged
merged 21 commits into from Jun 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
3 changes: 3 additions & 0 deletions HLTrigger/Configuration/python/CustomConfigs.py
Expand Up @@ -19,6 +19,9 @@ def Base(process):
# default modifications

process.options.wantSummary = cms.untracked.bool(True)
process.options.numberOfThreads = cms.untracked.uint32( 4 )
process.options.numberOfStreams = cms.untracked.uint32( 0 )
process.options.sizeOfStackForThreadsInKB = cms.untracked.uint32( 10*1024 )

process.MessageLogger.categories.append('TriggerSummaryProducerAOD')
process.MessageLogger.categories.append('L1GtTrigReport')
Expand Down
802 changes: 379 additions & 423 deletions HLTrigger/Configuration/python/HLT_25ns10e33_v2_cff.py

Large diffs are not rendered by default.

1,163 changes: 518 additions & 645 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake1_cff.py
@@ -1,11 +1,11 @@
# /dev/CMSSW_8_0_0/Fake1/V15 (CMSSW_8_0_9_HLT1)
# /dev/CMSSW_8_0_0/Fake1/V16 (CMSSW_8_0_10)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_8_0_0/Fake1/V15')
tableName = cms.string('/dev/CMSSW_8_0_0/Fake1/V16')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake_cff.py
@@ -1,11 +1,11 @@
# /dev/CMSSW_8_0_0/Fake/V19 (CMSSW_8_0_9_HLT1)
# /dev/CMSSW_8_0_0/Fake/V20 (CMSSW_8_0_10)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_8_0_0/Fake/V19')
tableName = cms.string('/dev/CMSSW_8_0_0/Fake/V20')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
802 changes: 379 additions & 423 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

218 changes: 109 additions & 109 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py

Large diffs are not rendered by default.

41 changes: 22 additions & 19 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,11 +1,11 @@
# /dev/CMSSW_8_0_0/PIon/V112 (CMSSW_8_0_9_HLT1)
# /dev/CMSSW_8_0_0/PIon/V119 (CMSSW_8_0_10)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_8_0_0/PIon/V112')
tableName = cms.string('/dev/CMSSW_8_0_0/PIon/V119')
)

fragment.HLTPSetInitialStepTrajectoryFilterBase = cms.PSet(
Expand Down Expand Up @@ -3538,7 +3538,7 @@
fragment.hltBoolEnd = cms.EDFilter( "HLTBool",
result = cms.bool( True )
)
fragment.hltL1sSingleMu22Or25 = cms.EDFilter( "HLTL1TSeed",
fragment.hltL1sV0SingleMu22IorSingleMu25 = cms.EDFilter( "HLTL1TSeed",
L1SeedsLogicalExpression = cms.string( "L1_SingleMu22 OR L1_SingleMu25" ),
L1EGammaInputTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
L1JetInputTag = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
Expand All @@ -3555,7 +3555,7 @@
)
fragment.hltL1fL1sMu22Or25L1Filtered0 = cms.EDFilter( "HLTMuonL1TFilter",
saveTags = cms.bool( True ),
PreviousCandTag = cms.InputTag( "hltL1sSingleMu22Or25" ),
PreviousCandTag = cms.InputTag( "hltL1sV0SingleMu22IorSingleMu25" ),
MinPt = cms.double( 0.0 ),
MinN = cms.int32( 1 ),
MaxEta = cms.double( 2.5 ),
Expand Down Expand Up @@ -3866,6 +3866,7 @@
DT_12 = cms.vdouble( 0.183, 0.054, -0.087, 0.028, 0.002, 0.0 ),
DT_14 = cms.vdouble( 0.359, 0.052, -0.107, 0.072, -0.004, 0.0 ),
CSC_13_3_scale = cms.vdouble( -1.701268, 0.0 ),
DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ),
CSC_23 = cms.vdouble( -0.081, 0.113, -0.029, 0.015, 0.008, 0.0 ),
CSC_24 = cms.vdouble( 0.004, 0.021, -0.002, 0.053, 0.0, 0.0 ),
OL_2222 = cms.vdouble( 0.107, 0.0, 0.0, 0.04, 0.0, 0.0 ),
Expand All @@ -3880,14 +3881,14 @@
SME_22_0_scale = cms.vdouble( -3.457901, 0.0 ),
DT_24_1_scale = cms.vdouble( -7.490909, 0.0 ),
OL_1232_0_scale = cms.vdouble( -5.964634, 0.0 ),
SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ),
DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ),
SME_13_0_scale = cms.vdouble( 0.104905, 0.0 ),
SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ),
CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ),
DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ),
SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ),
SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ),
SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ),
CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ),
crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ),
SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ),
SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ),
Expand All @@ -3906,15 +3907,15 @@
DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ),
CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ),
OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ),
CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ),
SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ),
CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ),
deltaEtaCrackSearchWindow = cms.double( 0.25 ),
SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ),
OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ),
DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ),
SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ),
EnableDTMeasurement = cms.bool( True ),
DT_24_2_scale = cms.vdouble( -6.63094, 0.0 ),
CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ),
scaleDT = cms.bool( True ),
DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ),
Expand All @@ -3924,7 +3925,7 @@
CSC_02 = cms.vdouble( 0.612, -0.207, 0.0, 0.067, -0.001, 0.0 ),
CSC_03 = cms.vdouble( 0.787, -0.338, 0.029, 0.101, -0.008, 0.0 ),
CSC_01 = cms.vdouble( 0.166, 0.0, 0.0, 0.031, 0.0, 0.0 ),
DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ),
SMB_32 = cms.vdouble( 0.67, -0.327, 0.0, 0.22, 0.0, 0.0 ),
SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ),
SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ),
crackWindow = cms.double( 0.04 ),
Expand All @@ -3937,11 +3938,10 @@
DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ),
beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ),
CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ),
EnableCSCMeasurement = cms.bool( True ),
CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ),
OL_2222_0_scale = cms.vdouble( -7.667231, 0.0 ),
EnableCSCMeasurement = cms.bool( True ),
CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ),
CSC_12 = cms.vdouble( -0.161, 0.254, -0.047, 0.042, -0.007, 0.0 )
)
fragment.hltL2MuonSeeds = cms.EDProducer( "L2MuonSeedGeneratorFromL1T",
Expand Down Expand Up @@ -5030,7 +5030,7 @@
InputLinks = cms.InputTag( "" ),
MinPt = cms.double( 50.0 )
)
fragment.hltL1sL1ZeroBias = cms.EDFilter( "HLTL1TSeed",
fragment.hltL1sZeroBias = cms.EDFilter( "HLTL1TSeed",
L1SeedsLogicalExpression = cms.string( "L1_ZeroBias" ),
L1EGammaInputTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
L1JetInputTag = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
Expand Down Expand Up @@ -8561,10 +8561,10 @@
hcalRecHits = cms.InputTag( "hltHbhereco" ),
z2MinB = cms.double( -0.09 ),
rMinI = cms.double( -0.2 ),
hOverEConeSize = cms.double( 0.0 ),
hOverEConeSize = cms.double( 0.14 ),
hOverEHBMinE = cms.double( 999999.0 ),
beamSpot = cms.InputTag( "hltOnlineBeamSpot" ),
applyHOverECut = cms.bool( False ),
applyHOverECut = cms.bool( True ),
hOverEHFMinE = cms.double( 999999.0 ),
measurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ),
PhiMin2B = cms.double( -0.004 ),
Expand All @@ -8573,7 +8573,10 @@
PhiMax2F = cms.double( 0.004 ),
DeltaPhi2B = cms.double( 0.004 ),
DeltaPhi2F = cms.double( 0.004 ),
SeedCreatorPSet = cms.PSet( refToPSet_ = cms.string( "HLTSeedFromConsecutiveHitsCreator" ) )
SeedCreatorPSet = cms.PSet( refToPSet_ = cms.string( "HLTSeedFromConsecutiveHitsCreator" ) ),
hcalTowers = cms.InputTag( "hltTowerMakerForAll" ),
maxHOverEBarrel = cms.double( 0.2 ),
maxHOverEEndcaps = cms.double( 0.2 )
),
barrelSuperClusters = cms.InputTag( 'hltParticleFlowSuperClusterECALL1Seeded','hltParticleFlowSuperClusterECALBarrel' )
)
Expand Down Expand Up @@ -13491,8 +13494,8 @@

fragment.HLTriggerFirstPath = cms.Path( fragment.hltGetConditions + fragment.hltGetRaw + fragment.hltBoolFalse )
fragment.HLT_CaloJet260_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleJet200 + fragment.hltPreCaloJet260 + fragment.HLTAK4CaloJetsSequence + fragment.hltSingleCaloJet260 + fragment.HLTEndSequence )
fragment.HLT_Mu50_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleMu22Or25 + fragment.hltPreMu50 + fragment.hltL1fL1sMu22Or25L1Filtered0 + fragment.HLTL2muonrecoSequence + fragment.hltL2fL1sMu22Or25L1f0L2Filtered10Q + fragment.HLTL3muonrecoSequence + fragment.hltL3fL1sMu22Or25L1f0L2f10QL3Filtered50Q + fragment.HLTEndSequence )
fragment.HLT_PFJet40_v5 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBias + fragment.hltPrePFJet40 + fragment.HLTAK4CaloJetsSequence + fragment.hltSingleCaloJet10 + fragment.HLTAK4PFJetsSequence + fragment.hltPFJetsCorrectedMatchedToCaloJets10 + fragment.hltSinglePFJet40 + fragment.HLTEndSequence )
fragment.HLT_Mu50_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sV0SingleMu22IorSingleMu25 + fragment.hltPreMu50 + fragment.hltL1fL1sMu22Or25L1Filtered0 + fragment.HLTL2muonrecoSequence + fragment.hltL2fL1sMu22Or25L1f0L2Filtered10Q + fragment.HLTL3muonrecoSequence + fragment.hltL3fL1sMu22Or25L1f0L2f10QL3Filtered50Q + fragment.HLTEndSequence )
fragment.HLT_PFJet40_v5 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sZeroBias + fragment.hltPrePFJet40 + fragment.HLTAK4CaloJetsSequence + fragment.hltSingleCaloJet10 + fragment.HLTAK4PFJetsSequence + fragment.hltPFJetsCorrectedMatchedToCaloJets10 + fragment.hltSinglePFJet40 + fragment.HLTEndSequence )
fragment.HLT_Photon20_CaloIdVL_IsoL_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleEG10 + fragment.hltPrePhoton20CaloIdVLIsoL + fragment.HLTPhoton20CaloIdVLIsoLSequence + fragment.HLTEndSequence )
fragment.HLT_Ele17_CaloIdL_TrackIdL_IsoVL_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleEG15 + fragment.hltPreEle17CaloIdLTrackIdLIsoVL + fragment.HLTEle17CaloIdLTrackIdLIsoVLSequence + fragment.HLTEndSequence )
fragment.HLT_FullTracks_Multiplicity80_v2 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sMinimumBiasHF0ORBptxAND + fragment.hltPreFullTracksMultiplicity80 + fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingForHighMultSequence + fragment.hltGoodPixelTracksForHighMult + fragment.hltPixelCandsForHighMult + fragment.hltHighMult40 + fragment.HLTDoLocalStripSequence + fragment.HLTPAIterativeTracking + fragment.hltPAOnlinePrimaryVertices + fragment.hltPAGoodHighPurityFullTracks + fragment.hltPAFullCandsForHighMultTrigger + fragment.hltPAFullTrackHighMult80 + fragment.HLTEndSequence )
Expand All @@ -13504,7 +13507,7 @@
fragment.HLT_HIL2Mu3BPTX_v2 = cms.Path( fragment.HLTBeginSequenceBPTX + fragment.hltL1sSingleMuOpen + fragment.hltPreHIL2Mu3BPTX + fragment.hltHIL1SingleMuOpenFiltered + fragment.HLTL2muonrecoSequence + fragment.hltHIL2Mu3BPTXL2Filtered + fragment.HLTEndSequence )
fragment.HLT_HIL2DoubleMu0BPTX_v2 = cms.Path( fragment.HLTBeginSequenceBPTX + fragment.hltL1sDoubleMuOpen + fragment.hltPreHIL2DoubleMu0BPTX + fragment.hltHIL1DoubleMuOpenFiltered + fragment.HLTL2muonrecoSequence + fragment.hltHIL2DoubleMu0BPTXL2Filtered + fragment.HLTEndSequence )
fragment.HLT_HIL3Mu3BPTX_v2 = cms.Path( fragment.HLTBeginSequenceBPTX + fragment.hltL1sSingleMuOpen + fragment.hltPreHIL3Mu3BPTX + fragment.hltHIL1SingleMuOpenFiltered + fragment.HLTL2muonrecoSequence + fragment.hltHIL2Mu3BPTXL2Filtered + fragment.HLTHIL3muonrecoSequence + fragment.hltHISingleMu3L3BPTXFiltered + fragment.HLTEndSequence )
fragment.HLT_FullTrack12ForEndOfFill_v2 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBias + fragment.hltPreFullTrack12ForEndOfFill + fragment.HLTRecoJetSequenceAK6PrePFForHighPt + fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingForHighPtSequence + fragment.HLTDoLocalStripSequence + fragment.HLTIterativeTrackingForHighPt + fragment.hltHighPtGoodFullTracks + fragment.hltHighPtFullCands + fragment.hltHighPtFullTrack12 + fragment.HLTEndSequence )
fragment.HLT_FullTrack12ForEndOfFill_v2 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sZeroBias + fragment.hltPreFullTrack12ForEndOfFill + fragment.HLTRecoJetSequenceAK6PrePFForHighPt + fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingForHighPtSequence + fragment.HLTDoLocalStripSequence + fragment.HLTIterativeTrackingForHighPt + fragment.hltHighPtGoodFullTracks + fragment.hltHighPtFullCands + fragment.hltHighPtFullTrack12 + fragment.HLTEndSequence )
fragment.HLT_FullTrack50_v3 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sSingleJet35 + fragment.hltPreFullTrack50 + fragment.HLTRecoJetSequenceAK6PrePFForHighPt + fragment.HLTDoLocalPixelSequence + fragment.HLTRecopixelvertexingForHighPtSequence + fragment.HLTDoLocalStripSequence + fragment.HLTIterativeTrackingForHighPt + fragment.hltHighPtGoodFullTracks + fragment.hltHighPtFullCands + fragment.hltHighPtFullTrack50 + fragment.HLTEndSequence )
fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtStage2Digis + fragment.hltScalersRawToDigi + fragment.hltFEDSelector + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtStage2Digis + fragment.hltPreHLTAnalyzerEndpath + fragment.hltL1TGlobalSummary + fragment.hltTrigReport )
Expand Down