Skip to content

Commit

Permalink
Moving to /dev/CMSSW_8_1_0/HLT/V26
Browse files Browse the repository at this point in the history
  • Loading branch information
@Martin-Grunewald
Martin-Grunewald committed Jan 4, 2017
1 parent e6c0418 commit bc1fb4b
Show file tree
Hide file tree
Showing 10 changed files with 1,030 additions and 1,370 deletions.
544 changes: 255 additions & 289 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file

Large diffs are not rendered by default.

480 changes: 223 additions & 257 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file

Large diffs are not rendered by default.

40 changes: 3 additions & 37 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# /dev/CMSSW_8_1_0/HIon/V5 (CMSSW_8_1_0_HLT1)
# /dev/CMSSW_8_1_0/HIon/V6 (CMSSW_8_1_0_HLT1)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_8_1_0/HIon/V5')
tableName = cms.string('/dev/CMSSW_8_1_0/HIon/V6')
)

fragment.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -3401,40 +3401,6 @@
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltCaloStage2Digis = cms.EDProducer( "L1TRawToDigi",
lenSlinkTrailer = cms.untracked.int32( 8 ),
lenAMC13Header = cms.untracked.int32( 8 ),
CTP7 = cms.untracked.bool( False ),
lenAMC13Trailer = cms.untracked.int32( 8 ),
Setup = cms.string( "stage2::CaloSetup" ),
MinFeds = cms.uint32( 0 ),
InputLabel = cms.InputTag( "rawDataCollector" ),
lenSlinkHeader = cms.untracked.int32( 8 ),
MTF7 = cms.untracked.bool( False ),
FWId = cms.uint32( 0 ),
debug = cms.untracked.bool( False ),
FedIds = cms.vint32( 1360, 1366 ),
lenAMCHeader = cms.untracked.int32( 8 ),
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltGmtStage2Digis = cms.EDProducer( "L1TRawToDigi",
lenSlinkTrailer = cms.untracked.int32( 8 ),
lenAMC13Header = cms.untracked.int32( 8 ),
CTP7 = cms.untracked.bool( False ),
lenAMC13Trailer = cms.untracked.int32( 8 ),
Setup = cms.string( "stage2::GMTSetup" ),
MinFeds = cms.uint32( 0 ),
InputLabel = cms.InputTag( "rawDataCollector" ),
lenSlinkHeader = cms.untracked.int32( 8 ),
MTF7 = cms.untracked.bool( False ),
FWId = cms.uint32( 0 ),
debug = cms.untracked.bool( False ),
FedIds = cms.vint32( 1402 ),
lenAMCHeader = cms.untracked.int32( 8 ),
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltGtStage2ObjectMap = cms.EDProducer( "L1TGlobalProducer",
L1DataBxInEvent = cms.int32( 5 ),
JetInputTag = cms.InputTag( 'hltGtStage2Digis','Jet' ),
Expand Down Expand Up @@ -12325,7 +12291,7 @@
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)

fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltCaloStage2Digis + fragment.hltGmtStage2Digis + fragment.hltGtStage2ObjectMap )
fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltGtStage2ObjectMap )
fragment.HLTBeamSpot = cms.Sequence( fragment.hltScalersRawToDigi + fragment.hltOnlineBeamSpot )
fragment.HLTBeginSequence = cms.Sequence( fragment.hltTriggerType + fragment.HLTL1UnpackerSequence + fragment.HLTBeamSpot )
fragment.HLTEndSequence = cms.Sequence( fragment.hltBoolEnd )
Expand Down
96 changes: 31 additions & 65 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# /dev/CMSSW_8_1_0/PIon/V5 (CMSSW_8_1_0_HLT1)
# /dev/CMSSW_8_1_0/PIon/V6 (CMSSW_8_1_0_HLT1)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_8_1_0/PIon/V5')
tableName = cms.string('/dev/CMSSW_8_1_0/PIon/V6')
)

fragment.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -3338,40 +3338,6 @@
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltCaloStage2Digis = cms.EDProducer( "L1TRawToDigi",
lenSlinkTrailer = cms.untracked.int32( 8 ),
lenAMC13Header = cms.untracked.int32( 8 ),
CTP7 = cms.untracked.bool( False ),
lenAMC13Trailer = cms.untracked.int32( 8 ),
Setup = cms.string( "stage2::CaloSetup" ),
MinFeds = cms.uint32( 0 ),
InputLabel = cms.InputTag( "rawDataCollector" ),
lenSlinkHeader = cms.untracked.int32( 8 ),
MTF7 = cms.untracked.bool( False ),
FWId = cms.uint32( 0 ),
debug = cms.untracked.bool( False ),
FedIds = cms.vint32( 1360, 1366 ),
lenAMCHeader = cms.untracked.int32( 8 ),
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltGmtStage2Digis = cms.EDProducer( "L1TRawToDigi",
lenSlinkTrailer = cms.untracked.int32( 8 ),
lenAMC13Header = cms.untracked.int32( 8 ),
CTP7 = cms.untracked.bool( False ),
lenAMC13Trailer = cms.untracked.int32( 8 ),
Setup = cms.string( "stage2::GMTSetup" ),
MinFeds = cms.uint32( 0 ),
InputLabel = cms.InputTag( "rawDataCollector" ),
lenSlinkHeader = cms.untracked.int32( 8 ),
MTF7 = cms.untracked.bool( False ),
FWId = cms.uint32( 0 ),
debug = cms.untracked.bool( False ),
FedIds = cms.vint32( 1402 ),
lenAMCHeader = cms.untracked.int32( 8 ),
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltGtStage2ObjectMap = cms.EDProducer( "L1TGlobalProducer",
L1DataBxInEvent = cms.int32( 5 ),
JetInputTag = cms.InputTag( 'hltGtStage2Digis','Jet' ),
Expand Down Expand Up @@ -12973,21 +12939,21 @@
regionEtaMargin = cms.double( 0.9 ),
minEt = cms.double( 5.0 ),
regionPhiMargin = cms.double( 1.2 ),
inputColl = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
inputColl = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
type = cms.string( "EGamma" )
),
cms.PSet( maxEt = cms.double( 999999.0 ),
regionEtaMargin = cms.double( 0.9 ),
minEt = cms.double( 170.0 ),
regionPhiMargin = cms.double( 1.2 ),
inputColl = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
inputColl = cms.InputTag( 'hltGtStage2Digis','Jet' ),
type = cms.string( "Jet" )
),
cms.PSet( maxEt = cms.double( 999999.0 ),
regionEtaMargin = cms.double( 0.9 ),
minEt = cms.double( 100.0 ),
regionPhiMargin = cms.double( 1.2 ),
inputColl = cms.InputTag( 'hltCaloStage2Digis','Tau' ),
inputColl = cms.InputTag( 'hltGtStage2Digis','Tau' ),
type = cms.string( "Tau" )
)
),
Expand Down Expand Up @@ -13026,21 +12992,21 @@
regionEtaMargin = cms.double( 0.9 ),
minEt = cms.double( 5.0 ),
regionPhiMargin = cms.double( 1.2 ),
inputColl = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
inputColl = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
type = cms.string( "EGamma" )
),
cms.PSet( maxEt = cms.double( 999999.0 ),
regionEtaMargin = cms.double( 0.9 ),
minEt = cms.double( 170.0 ),
regionPhiMargin = cms.double( 1.2 ),
inputColl = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
inputColl = cms.InputTag( 'hltGtStage2Digis','Jet' ),
type = cms.string( "Jet" )
),
cms.PSet( maxEt = cms.double( 999999.0 ),
regionEtaMargin = cms.double( 0.9 ),
minEt = cms.double( 100.0 ),
regionPhiMargin = cms.double( 1.2 ),
inputColl = cms.InputTag( 'hltCaloStage2Digis','Tau' ),
inputColl = cms.InputTag( 'hltGtStage2Digis','Tau' ),
type = cms.string( "Tau" )
)
),
Expand Down Expand Up @@ -13361,15 +13327,15 @@
saveTags = cms.bool( True ),
region_eta_size_ecap = cms.double( 1.0 ),
barrel_end = cms.double( 1.4791 ),
l1IsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1IsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
candIsolatedTag = cms.InputTag( "hltEgammaCandidates" ),
l1CenJetsTag = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
l1CenJetsTag = cms.InputTag( 'hltGtStage2Digis','Jet' ),
region_eta_size = cms.double( 0.522 ),
L1SeedFilterTag = cms.InputTag( "hltL1sSingleEG5BptxAND" ),
candNonIsolatedTag = cms.InputTag( "" ),
l1NonIsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1NonIsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
ncandcut = cms.int32( 1 ),
l1TausTag = cms.InputTag( 'hltCaloStage2Digis','Tau' )
l1TausTag = cms.InputTag( 'hltGtStage2Digis','Tau' )
)
fragment.hltEGBptxAND10EtFilter = cms.EDFilter( "HLTEgammaEtFilter",
saveTags = cms.bool( True ),
Expand Down Expand Up @@ -13725,15 +13691,15 @@
saveTags = cms.bool( True ),
region_eta_size_ecap = cms.double( 1.0 ),
barrel_end = cms.double( 1.4791 ),
l1IsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1IsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
candIsolatedTag = cms.InputTag( "hltEgammaCandidates" ),
l1CenJetsTag = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
l1CenJetsTag = cms.InputTag( 'hltGtStage2Digis','Jet' ),
region_eta_size = cms.double( 0.522 ),
L1SeedFilterTag = cms.InputTag( "hltL1sSingleEG18BptxAND" ),
candNonIsolatedTag = cms.InputTag( "" ),
l1NonIsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1NonIsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
ncandcut = cms.int32( 1 ),
l1TausTag = cms.InputTag( 'hltCaloStage2Digis','Tau' )
l1TausTag = cms.InputTag( 'hltGtStage2Digis','Tau' )
)
fragment.hltEGBptxAND30EtFilter = cms.EDFilter( "HLTEgammaEtFilter",
saveTags = cms.bool( True ),
Expand Down Expand Up @@ -13796,15 +13762,15 @@
saveTags = cms.bool( True ),
region_eta_size_ecap = cms.double( 1.0 ),
barrel_end = cms.double( 1.4791 ),
l1IsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1IsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
candIsolatedTag = cms.InputTag( "hltEgammaCandidates" ),
l1CenJetsTag = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
l1CenJetsTag = cms.InputTag( 'hltGtStage2Digis','Jet' ),
region_eta_size = cms.double( 0.522 ),
L1SeedFilterTag = cms.InputTag( "hltL1sSingleEG14BptxAND" ),
candNonIsolatedTag = cms.InputTag( "" ),
l1NonIsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1NonIsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
ncandcut = cms.int32( 1 ),
l1TausTag = cms.InputTag( 'hltCaloStage2Digis','Tau' )
l1TausTag = cms.InputTag( 'hltGtStage2Digis','Tau' )
)
fragment.hltIsoEGBptxAND20EtFilter = cms.EDFilter( "HLTEgammaEtFilter",
saveTags = cms.bool( True ),
Expand Down Expand Up @@ -13883,10 +13849,10 @@
candTag = cms.InputTag( "hltIsoEGBptxAND20HEFilter" )
)
fragment.hltRegionalTowerForEgamma = cms.EDProducer( "EgammaHLTCaloTowerProducer",
L1NonIsoCand = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
L1NonIsoCand = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
EMin = cms.double( 0.8 ),
EtMin = cms.double( 0.5 ),
L1IsoCand = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
L1IsoCand = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
useTowersInCone = cms.double( 0.8 ),
towerCollection = cms.InputTag( "hltTowerMakerForAll" )
)
Expand Down Expand Up @@ -14112,15 +14078,15 @@
saveTags = cms.bool( True ),
region_eta_size_ecap = cms.double( 1.0 ),
barrel_end = cms.double( 1.4791 ),
l1IsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1IsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
candIsolatedTag = cms.InputTag( "hltEgammaCandidates" ),
l1CenJetsTag = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
l1CenJetsTag = cms.InputTag( 'hltGtStage2Digis','Jet' ),
region_eta_size = cms.double( 0.522 ),
L1SeedFilterTag = cms.InputTag( "hltL1sSingleEG18BptxAND" ),
candNonIsolatedTag = cms.InputTag( "" ),
l1NonIsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1NonIsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
ncandcut = cms.int32( 1 ),
l1TausTag = cms.InputTag( 'hltCaloStage2Digis','Tau' )
l1TausTag = cms.InputTag( 'hltGtStage2Digis','Tau' )
)
fragment.hltPAEG20L1SingleEGOrEtFilter = cms.EDFilter( "HLTEgammaEtFilter",
saveTags = cms.bool( True ),
Expand Down Expand Up @@ -17108,15 +17074,15 @@
saveTags = cms.bool( True ),
region_eta_size_ecap = cms.double( 1.0 ),
barrel_end = cms.double( 1.4791 ),
l1IsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1IsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
candIsolatedTag = cms.InputTag( "hltEgammaCandidates" ),
l1CenJetsTag = cms.InputTag( 'hltCaloStage2Digis','Jet' ),
l1CenJetsTag = cms.InputTag( 'hltGtStage2Digis','Jet' ),
region_eta_size = cms.double( 0.522 ),
L1SeedFilterTag = cms.InputTag( "hltL1sSingleEG5BptxANDObjectMap" ),
candNonIsolatedTag = cms.InputTag( "" ),
l1NonIsolatedTag = cms.InputTag( 'hltCaloStage2Digis','EGamma' ),
l1NonIsolatedTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
ncandcut = cms.int32( 1 ),
l1TausTag = cms.InputTag( 'hltCaloStage2Digis','Tau' )
l1TausTag = cms.InputTag( 'hltGtStage2Digis','Tau' )
)
fragment.hltEGBptxANDObjectMap10EtFilter = cms.EDFilter( "HLTEgammaEtFilter",
saveTags = cms.bool( True ),
Expand Down Expand Up @@ -17915,7 +17881,7 @@
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)

fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltCaloStage2Digis + fragment.hltGmtStage2Digis + fragment.hltGtStage2ObjectMap )
fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltGtStage2ObjectMap )
fragment.HLTBeamSpot = cms.Sequence( fragment.hltScalersRawToDigi + fragment.hltOnlineBeamSpot )
fragment.HLTBeginSequence = cms.Sequence( fragment.hltTriggerType + fragment.HLTL1UnpackerSequence + fragment.HLTBeamSpot )
fragment.HLTEndSequence = cms.Sequence( fragment.hltBoolEnd )
Expand Down
40 changes: 3 additions & 37 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# /dev/CMSSW_8_1_0/PRef/V5 (CMSSW_8_1_0_HLT1)
# /dev/CMSSW_8_1_0/PRef/V6 (CMSSW_8_1_0_HLT1)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_8_1_0/PRef/V5')
tableName = cms.string('/dev/CMSSW_8_1_0/PRef/V6')
)

fragment.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -3178,40 +3178,6 @@
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltCaloStage2Digis = cms.EDProducer( "L1TRawToDigi",
lenSlinkTrailer = cms.untracked.int32( 8 ),
lenAMC13Header = cms.untracked.int32( 8 ),
CTP7 = cms.untracked.bool( False ),
lenAMC13Trailer = cms.untracked.int32( 8 ),
Setup = cms.string( "stage2::CaloSetup" ),
MinFeds = cms.uint32( 0 ),
InputLabel = cms.InputTag( "rawDataCollector" ),
lenSlinkHeader = cms.untracked.int32( 8 ),
MTF7 = cms.untracked.bool( False ),
FWId = cms.uint32( 0 ),
debug = cms.untracked.bool( False ),
FedIds = cms.vint32( 1360, 1366 ),
lenAMCHeader = cms.untracked.int32( 8 ),
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltGmtStage2Digis = cms.EDProducer( "L1TRawToDigi",
lenSlinkTrailer = cms.untracked.int32( 8 ),
lenAMC13Header = cms.untracked.int32( 8 ),
CTP7 = cms.untracked.bool( False ),
lenAMC13Trailer = cms.untracked.int32( 8 ),
Setup = cms.string( "stage2::GMTSetup" ),
MinFeds = cms.uint32( 0 ),
InputLabel = cms.InputTag( "rawDataCollector" ),
lenSlinkHeader = cms.untracked.int32( 8 ),
MTF7 = cms.untracked.bool( False ),
FWId = cms.uint32( 0 ),
debug = cms.untracked.bool( False ),
FedIds = cms.vint32( 1402 ),
lenAMCHeader = cms.untracked.int32( 8 ),
lenAMCTrailer = cms.untracked.int32( 0 ),
FWOverride = cms.bool( False )
)
fragment.hltGtStage2ObjectMap = cms.EDProducer( "L1TGlobalProducer",
L1DataBxInEvent = cms.int32( 5 ),
JetInputTag = cms.InputTag( 'hltGtStage2Digis','Jet' ),
Expand Down Expand Up @@ -12635,7 +12601,7 @@
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)

fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltCaloStage2Digis + fragment.hltGmtStage2Digis + fragment.hltGtStage2ObjectMap )
fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltGtStage2ObjectMap )
fragment.HLTBeamSpot = cms.Sequence( fragment.hltScalersRawToDigi + fragment.hltOnlineBeamSpot )
fragment.HLTBeginSequenceL1Fat = cms.Sequence( fragment.hltTriggerType + fragment.hltL1EventNumberL1Fat + fragment.HLTL1UnpackerSequence + fragment.HLTBeamSpot )
fragment.HLTEndSequence = cms.Sequence( fragment.hltBoolEnd )
Expand Down

0 comments on commit bc1fb4b

Please sign in to comment.