Skip to content

Commit

Permalink
Small bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Martin-Grunewald
Martin-Grunewald committed Mar 6, 2017
1 parent cf2cf2c commit 75cd207
Show file tree
Hide file tree
Showing 12 changed files with 58 additions and 52 deletions.
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/HLT/V12 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/HLT/V13 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/HLT/V12')
tableName = cms.string('/dev/CMSSW_9_0_0/HLT/V13')
)

fragment.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -88013,7 +88013,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)
fragment.hltPrePhysicsCirculating = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
Expand Down
25 changes: 14 additions & 11 deletions HLTrigger/Configuration/python/HLT_Fake2_cff.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/Fake2/V1 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/Fake2/V3 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/Fake2/V1')
tableName = cms.string('/dev/CMSSW_9_0_0/Fake2/V3')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down Expand Up @@ -131,7 +131,7 @@
)
fragment.hltFEDSelector = cms.EDProducer( "EvFFEDSelector",
inputTag = cms.InputTag( "rawDataCollector" ),
fedList = cms.vuint32( 1023 )
fedList = cms.vuint32( 1023, 1024 )
)
fragment.hltTriggerSummaryAOD = cms.EDProducer( "TriggerSummaryProducerAOD",
moduleLabelPatternsToSkip = cms.vstring( ),
Expand All @@ -142,14 +142,17 @@
processName = cms.string( "@" )
)
fragment.hltPreHLTAnalyzerEndpath = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ),
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
offset = cms.uint32( 0 )
)
fragment.hltL1GtTrigReport = cms.EDAnalyzer( "L1GtTrigReport",
PrintVerbosity = cms.untracked.int32( 10 ),
UseL1GlobalTriggerRecord = cms.bool( False ),
PrintOutput = cms.untracked.int32( 3 ),
L1GtRecordInputTag = cms.InputTag( "hltGtDigis" )
fragment.hltL1TGlobalSummary = cms.EDAnalyzer( "L1TGlobalSummary",
ExtInputTag = cms.InputTag( "hltGtStage2Digis" ),
MaxBx = cms.int32( 0 ),
DumpRecord = cms.bool( False ),
AlgInputTag = cms.InputTag( "hltGtStage2Digis" ),
MinBx = cms.int32( 0 ),
DumpTrigResults = cms.bool( False ),
DumpTrigSummary = cms.bool( True )
)
fragment.hltTrigReport = cms.EDAnalyzer( "HLTrigReport",
ReferencePath = cms.untracked.string( "HLTriggerFinalPath" ),
Expand All @@ -169,8 +172,8 @@
fragment.HLT_Physics_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltPrePhysics + fragment.HLTEndSequence )
fragment.HLT_Random_v1 = cms.Path( fragment.hltRandomEventsFilter + fragment.hltGtDigis + fragment.hltPreRandom + fragment.HLTEndSequence )
fragment.HLT_ZeroBias_v1 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1ZeroBias + fragment.hltPreZeroBias + fragment.HLTEndSequence )
fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtDigis + fragment.hltScalersRawToDigi + fragment.hltFEDSelector + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltGtDigis + fragment.hltPreHLTAnalyzerEndpath + fragment.hltL1GtTrigReport + fragment.hltTrigReport )
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 )


fragment.HLTSchedule = cms.Schedule( *(fragment.HLTriggerFirstPath, fragment.HLT_Physics_v1, fragment.HLT_Random_v1, fragment.HLT_ZeroBias_v1, fragment.HLTriggerFinalPath, fragment.HLTAnalyzerEndpath ))
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/GRun/V8 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/GRun/V9 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/GRun/V8')
tableName = cms.string('/dev/CMSSW_9_0_0/GRun/V9')
)

fragment.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -64712,7 +64712,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)

fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltGtStage2ObjectMap )
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/HIon/V8 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/HIon/V9 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/HIon/V8')
tableName = cms.string('/dev/CMSSW_9_0_0/HIon/V9')
)

fragment.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -12321,7 +12321,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)

fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltGtStage2ObjectMap )
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/PIon/V8 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/PIon/V9 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/PIon/V8')
tableName = cms.string('/dev/CMSSW_9_0_0/PIon/V9')
)

fragment.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -17995,7 +17995,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)

fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltGtStage2ObjectMap )
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/PRef/V8 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/PRef/V9 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/PRef/V8')
tableName = cms.string('/dev/CMSSW_9_0_0/PRef/V9')
)

fragment.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -12661,7 +12661,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)

fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltGtStage2ObjectMap )
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/test/OnLine_HLT_FULL.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/HLT/V12 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/HLT/V13 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTFULL" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/HLT/V12')
tableName = cms.string('/dev/CMSSW_9_0_0/HLT/V13')
)

process.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -88315,7 +88315,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)
process.hltPreRatesMonitoring = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
Expand Down
25 changes: 14 additions & 11 deletions HLTrigger/Configuration/test/OnLine_HLT_Fake2.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/Fake2/V1 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/Fake2/V3 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTFake2" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/Fake2/V1')
tableName = cms.string('/dev/CMSSW_9_0_0/Fake2/V3')
)

process.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down Expand Up @@ -295,7 +295,7 @@
)
process.hltFEDSelector = cms.EDProducer( "EvFFEDSelector",
inputTag = cms.InputTag( "rawDataCollector" ),
fedList = cms.vuint32( 1023 )
fedList = cms.vuint32( 1023, 1024 )
)
process.hltTriggerSummaryAOD = cms.EDProducer( "TriggerSummaryProducerAOD",
moduleLabelPatternsToSkip = cms.vstring( ),
Expand All @@ -306,14 +306,17 @@
processName = cms.string( "@" )
)
process.hltPreHLTAnalyzerEndpath = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ),
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
offset = cms.uint32( 0 )
)
process.hltL1GtTrigReport = cms.EDAnalyzer( "L1GtTrigReport",
PrintVerbosity = cms.untracked.int32( 10 ),
UseL1GlobalTriggerRecord = cms.bool( False ),
PrintOutput = cms.untracked.int32( 3 ),
L1GtRecordInputTag = cms.InputTag( "hltGtDigis" )
process.hltL1TGlobalSummary = cms.EDAnalyzer( "L1TGlobalSummary",
ExtInputTag = cms.InputTag( "hltGtStage2Digis" ),
MaxBx = cms.int32( 0 ),
DumpRecord = cms.bool( False ),
AlgInputTag = cms.InputTag( "hltGtStage2Digis" ),
MinBx = cms.int32( 0 ),
DumpTrigResults = cms.bool( False ),
DumpTrigSummary = cms.bool( True )
)
process.hltTrigReport = cms.EDAnalyzer( "HLTrigReport",
ReferencePath = cms.untracked.string( "HLTriggerFinalPath" ),
Expand Down Expand Up @@ -355,8 +358,8 @@
process.HLT_Physics_v1 = cms.Path( process.HLTBeginSequence + process.hltPrePhysics + process.HLTEndSequence )
process.HLT_Random_v1 = cms.Path( process.hltRandomEventsFilter + process.hltGtDigis + process.hltPreRandom + process.HLTEndSequence )
process.HLT_ZeroBias_v1 = cms.Path( process.HLTBeginSequence + process.hltL1sL1ZeroBias + process.hltPreZeroBias + process.HLTEndSequence )
process.HLTriggerFinalPath = cms.Path( process.hltGtDigis + process.hltScalersRawToDigi + process.hltFEDSelector + process.hltTriggerSummaryAOD + process.hltTriggerSummaryRAW + process.hltBoolFalse )
process.HLTAnalyzerEndpath = cms.EndPath( process.hltGtDigis + process.hltPreHLTAnalyzerEndpath + process.hltL1GtTrigReport + process.hltTrigReport )
process.HLTriggerFinalPath = cms.Path( process.hltGtStage2Digis + process.hltScalersRawToDigi + process.hltFEDSelector + process.hltTriggerSummaryAOD + process.hltTriggerSummaryRAW + process.hltBoolFalse )
process.HLTAnalyzerEndpath = cms.EndPath( process.hltGtStage2Digis + process.hltPreHLTAnalyzerEndpath + process.hltL1TGlobalSummary + process.hltTrigReport )
process.AOutput = cms.EndPath( process.hltPreAOutput + process.hltOutputA )

# load the DQMStore and DQMRootOutputModule
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/test/OnLine_HLT_GRun.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/GRun/V8 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/GRun/V9 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTGRun" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/GRun/V8')
tableName = cms.string('/dev/CMSSW_9_0_0/GRun/V9')
)

process.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -65014,7 +65014,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)
process.hltPreParkingHLTPhysicsOutput = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/test/OnLine_HLT_HIon.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/HIon/V8 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/HIon/V9 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTHIon" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/HIon/V8')
tableName = cms.string('/dev/CMSSW_9_0_0/HIon/V9')
)

process.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -12623,7 +12623,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)
process.hltPreHIPhysicsMuonsOutput = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/test/OnLine_HLT_PIon.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/PIon/V8 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/PIon/V9 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTPIon" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/PIon/V8')
tableName = cms.string('/dev/CMSSW_9_0_0/PIon/V9')
)

process.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -18297,7 +18297,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)
process.hltPrePhysicsCommissioningOutput = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/test/OnLine_HLT_PRef.py
View file
@@ -1,11 +1,11 @@
# /dev/CMSSW_9_0_0/PRef/V8 (CMSSW_9_0_0_pre5)
# /dev/CMSSW_9_0_0/PRef/V9 (CMSSW_9_0_0_pre5)

import FWCore.ParameterSet.Config as cms

process = cms.Process( "HLTPRef" )

process.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_9_0_0/PRef/V8')
tableName = cms.string('/dev/CMSSW_9_0_0/PRef/V9')
)

process.HLTPSetJetCoreStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -12963,7 +12963,7 @@
serviceBy = cms.untracked.string( "never" ),
resetBy = cms.untracked.string( "never" ),
reportBy = cms.untracked.string( "job" ),
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLTFULL' )
HLTriggerResults = cms.InputTag( 'TriggerResults','','HLT' )
)
process.hltPrePhysicsCommissioningOutput = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
Expand Down

0 comments on commit 75cd207

Please sign in to comment.