Skip to content

Commit

Permalink
Merge pull request #5993 from Martin-Grunewald/HLTfix72X
Browse files Browse the repository at this point in the history 
HLT saveTags fix in filter config - 72X
  • Loading branch information
@davidlange6
davidlange6 committed Oct 30, 2014
2 parents fdc2e2d + 458a9f2 commit 4a42835
Show file tree
Hide file tree
Showing 22 changed files with 646 additions and 56 deletions.
102 changes: 100 additions & 2 deletions HLTrigger/Configuration/python/HLT_2014_Famos_cff.py
View file

Large diffs are not rendered by default.

102 changes: 100 additions & 2 deletions HLTrigger/Configuration/python/HLT_2014_cff.py
View file

Large diffs are not rendered by default.

20 changes: 17 additions & 3 deletions HLTrigger/Configuration/python/HLT_FULL_Famos_cff.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_2_0/HLT/V50 (CMSSW_7_2_0)
# /dev/CMSSW_7_2_0/HLT/V52 (CMSSW_7_2_1)

import FWCore.ParameterSet.Config as cms
from FastSimulation.HighLevelTrigger.HLTSetup_cff import *


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_2_0/HLT/V50')
tableName = cms.string('/dev/CMSSW_7_2_0/HLT/V52')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -2602,6 +2602,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3NoFiltersMuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 17.0 )
Expand Down Expand Up @@ -3100,6 +3101,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 40.0 )
Expand Down Expand Up @@ -3167,6 +3169,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 20.0 )
Expand Down Expand Up @@ -3980,6 +3983,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 24.0 )
Expand Down Expand Up @@ -4048,6 +4052,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 24.0 )
Expand Down Expand Up @@ -4179,6 +4184,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 8.0 )
Expand All @@ -4199,6 +4205,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 17.0 )
Expand Down Expand Up @@ -4267,6 +4274,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 17.0 )
Expand Down Expand Up @@ -4640,6 +4648,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 30.0 )
Expand Down Expand Up @@ -5222,6 +5231,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 25.0 )
Expand Down Expand Up @@ -10121,6 +10131,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 17.0 )
Expand Down Expand Up @@ -13900,6 +13911,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 40.0 )
Expand Down Expand Up @@ -14479,7 +14491,7 @@
hltEGL1EG12EG7EG5Filter = cms.EDFilter( "HLTEgammaL1MatchFilterRegional",
doIsolated = cms.bool( False ),
endcap_end = cms.double( 2.65 ),
saveTags = cms.bool( True ),
saveTags = cms.bool( False ),
region_eta_size_ecap = cms.double( 1.0 ),
barrel_end = cms.double( 1.4791 ),
l1IsolatedTag = cms.InputTag( 'l1extraParticles','Isolated' ),
Expand Down Expand Up @@ -14929,6 +14941,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 23.0 )
Expand Down Expand Up @@ -15180,6 +15193,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "offlineBeamSpot" ),
MinPt = cms.double( 8.0 )
Expand Down
24 changes: 21 additions & 3 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_2_0/HLT/V50 (CMSSW_7_2_0)
# /dev/CMSSW_7_2_0/HLT/V52 (CMSSW_7_2_1)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_2_0/HLT/V50')
tableName = cms.string('/dev/CMSSW_7_2_0/HLT/V52')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -3274,6 +3274,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3NoFiltersMuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 17.0 )
Expand Down Expand Up @@ -4021,6 +4022,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 40.0 )
Expand Down Expand Up @@ -4088,6 +4090,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 20.0 )
Expand Down Expand Up @@ -6677,6 +6680,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 24.0 )
Expand Down Expand Up @@ -6745,6 +6749,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 24.0 )
Expand Down Expand Up @@ -6876,6 +6881,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 8.0 )
Expand All @@ -6896,6 +6902,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 17.0 )
Expand Down Expand Up @@ -6964,6 +6971,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 17.0 )
Expand Down Expand Up @@ -7421,6 +7429,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 30.0 )
Expand Down Expand Up @@ -8625,6 +8634,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 25.0 )
Expand Down Expand Up @@ -11486,6 +11496,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 9999.0 ),
CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 33.0 )
Expand Down Expand Up @@ -11530,6 +11541,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 9999.0 ),
CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 38.0 )
Expand Down Expand Up @@ -11597,6 +11609,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 9999.0 ),
CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 38.0 )
Expand Down Expand Up @@ -11886,6 +11899,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 9999.0 ),
CandTag = cms.InputTag( "hltL3NoFiltersNoVtxMuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 42.0 )
Expand Down Expand Up @@ -18639,6 +18653,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 17.0 )
Expand Down Expand Up @@ -24787,6 +24802,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 40.0 )
Expand Down Expand Up @@ -25366,7 +25382,7 @@
hltEGL1EG12EG7EG5Filter = cms.EDFilter( "HLTEgammaL1MatchFilterRegional",
doIsolated = cms.bool( False ),
endcap_end = cms.double( 2.65 ),
saveTags = cms.bool( True ),
saveTags = cms.bool( False ),
region_eta_size_ecap = cms.double( 1.0 ),
barrel_end = cms.double( 1.4791 ),
l1IsolatedTag = cms.InputTag( 'hltL1extraParticles','Isolated' ),
Expand Down Expand Up @@ -25816,6 +25832,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 23.0 )
Expand Down Expand Up @@ -26067,6 +26084,7 @@
MaxPtDifference = cms.double( 9999.0 ),
MaxDr = cms.double( 2.0 ),
CandTag = cms.InputTag( "hltL3MuonCandidates" ),
MinDXYBeamSpot = cms.double( -1.0 ),
MinDr = cms.double( -1.0 ),
BeamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
MinPt = cms.double( 8.0 )
Expand Down

0 comments on commit 4a42835

Please sign in to comment.