Skip to content

Commit

Permalink
Merged HLT_V3_101X from repository cms-tsg-storm with cms-merge-topic
Browse files Browse the repository at this point in the history
  • Loading branch information
@Martin-Grunewald
Martin-Grunewald committed Jul 2, 2018
2 parents 5169c9c + 22f917a commit 05e855f
Show file tree
Hide file tree
Showing 16 changed files with 189,876 additions and 182,318 deletions.
6 changes: 3 additions & 3 deletions Configuration/HLT/python/autoCondHLT.py
View file
Expand Up @@ -19,9 +19,9 @@
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake2' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2018_v1_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-04-16 09:58:43.000"] ), ),
'2018v21' : ( ','.join( [ 'L1Menu_Collisions2018_v1_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-04-16 09:58:43.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2018_v1_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-04-16 09:58:43.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2018_v2_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-06-20 15:05:19.000"] ), ),
'2018v21' : ( ','.join( [ 'L1Menu_Collisions2018_v2_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-06-20 15:05:19.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2018_v2_0_0-d1_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2018-06-20 15:05:19.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_pp502Collisions2017_v4_m6_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-11-03 18:00:00.000"] ), ),
Expand Down
73,116 changes: 37,763 additions & 35,353 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file

Large diffs are not rendered by default.

84,096 changes: 42,385 additions & 41,711 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/HIon --type HIon

# /dev/CMSSW_10_1_0/HIon/V41 (CMSSW_10_1_4)
# /dev/CMSSW_10_1_0/HIon/V56 (CMSSW_10_1_7)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_1_0/HIon/V41')
tableName = cms.string('/dev/CMSSW_10_1_0/HIon/V56')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -3843,7 +3843,9 @@
EmulateBxInEvent = cms.int32( 1 ),
AlgorithmTriggersUnprescaled = cms.bool( True ),
PrintL1Menu = cms.untracked.bool( False ),
PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ),
Verbosity = cms.untracked.int32( 0 ),
AlgoBlkInputTag = cms.InputTag( "hltGtStage2Digis" ),
EtSumInputTag = cms.InputTag( 'hltGtStage2Digis','EtSum' ),
ProduceL1GtDaqRecord = cms.bool( True ),
PrescaleSet = cms.uint32( 1 ),
Expand All @@ -3852,7 +3854,7 @@
TriggerMenuLuminosity = cms.string( "startup" ),
ProduceL1GtObjectMapRecord = cms.bool( True ),
AlternativeNrBxBoardDaq = cms.uint32( 0 ),
PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ),
GetPrescaleColumnFromData = cms.bool( False ),
TauInputTag = cms.InputTag( 'hltGtStage2Digis','Tau' ),
BstLengthBytes = cms.int32( -1 ),
MuonInputTag = cms.InputTag( 'hltGtStage2Digis','Muon' )
Expand Down
8 changes: 5 additions & 3 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/PIon --type PIon

# /dev/CMSSW_10_1_0/PIon/V41 (CMSSW_10_1_4)
# /dev/CMSSW_10_1_0/PIon/V56 (CMSSW_10_1_7)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_1_0/PIon/V41')
tableName = cms.string('/dev/CMSSW_10_1_0/PIon/V56')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -3843,7 +3843,9 @@
EmulateBxInEvent = cms.int32( 1 ),
AlgorithmTriggersUnprescaled = cms.bool( True ),
PrintL1Menu = cms.untracked.bool( False ),
PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ),
Verbosity = cms.untracked.int32( 0 ),
AlgoBlkInputTag = cms.InputTag( "hltGtStage2Digis" ),
EtSumInputTag = cms.InputTag( 'hltGtStage2Digis','EtSum' ),
ProduceL1GtDaqRecord = cms.bool( True ),
PrescaleSet = cms.uint32( 1 ),
Expand All @@ -3852,7 +3854,7 @@
TriggerMenuLuminosity = cms.string( "startup" ),
ProduceL1GtObjectMapRecord = cms.bool( True ),
AlternativeNrBxBoardDaq = cms.uint32( 0 ),
PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ),
GetPrescaleColumnFromData = cms.bool( False ),
TauInputTag = cms.InputTag( 'hltGtStage2Digis','Tau' ),
BstLengthBytes = cms.int32( -1 ),
MuonInputTag = cms.InputTag( 'hltGtStage2Digis','Muon' )
Expand Down
24 changes: 13 additions & 11 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/PRef --type PRef

# /dev/CMSSW_10_1_0/PRef/V41 (CMSSW_10_1_4)
# /dev/CMSSW_10_1_0/PRef/V56 (CMSSW_10_1_7)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_1_0/PRef/V41')
tableName = cms.string('/dev/CMSSW_10_1_0/PRef/V56')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -4183,7 +4183,9 @@
EmulateBxInEvent = cms.int32( 1 ),
AlgorithmTriggersUnprescaled = cms.bool( True ),
PrintL1Menu = cms.untracked.bool( False ),
PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ),
Verbosity = cms.untracked.int32( 0 ),
AlgoBlkInputTag = cms.InputTag( "hltGtStage2Digis" ),
EtSumInputTag = cms.InputTag( 'hltGtStage2Digis','EtSum' ),
ProduceL1GtDaqRecord = cms.bool( True ),
PrescaleSet = cms.uint32( 1 ),
Expand All @@ -4192,7 +4194,7 @@
TriggerMenuLuminosity = cms.string( "startup" ),
ProduceL1GtObjectMapRecord = cms.bool( True ),
AlternativeNrBxBoardDaq = cms.uint32( 0 ),
PrescaleCSVFile = cms.string( "prescale_L1TGlobal.csv" ),
GetPrescaleColumnFromData = cms.bool( False ),
TauInputTag = cms.InputTag( 'hltGtStage2Digis','Tau' ),
BstLengthBytes = cms.int32( -1 ),
MuonInputTag = cms.InputTag( 'hltGtStage2Digis','Muon' )
Expand All @@ -4208,10 +4210,6 @@
setSigmaZ = cms.double( 0.0 ),
maxRadius = cms.double( 2.0 )
)
fragment.hltPreZeroBiasBeamspot = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
offset = cms.uint32( 0 )
)
fragment.hltZeroBiasForBeamSpot = cms.EDFilter( "HLTL1TSeed",
L1SeedsLogicalExpression = cms.string( "L1_ZeroBias" ),
L1EGammaInputTag = cms.InputTag( 'hltGtStage2Digis','EGamma' ),
Expand All @@ -4223,6 +4221,10 @@
L1MuonInputTag = cms.InputTag( 'hltGtStage2Digis','Muon' ),
L1GlobalInputTag = cms.InputTag( "hltGtStage2Digis" )
)
fragment.hltPreZeroBiasBeamspot = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtStage2Digis" ),
offset = cms.uint32( 0 )
)
fragment.hltEcalDigis = cms.EDProducer( "EcalRawToDigi",
orderedDCCIdList = cms.vint32( 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54 ),
FedLabel = cms.InputTag( "listfeds" ),
Expand Down Expand Up @@ -12563,15 +12565,15 @@
)
fragment.hltSiPixelClustersAfterSplittingForRefPP = cms.EDProducer( "JetCoreClusterSplitter",
verbose = cms.bool( False ),
deltaRmax = cms.double( 0.05 ),
chargeFractionMin = cms.double( 2.0 ),
forceXError = cms.double( 100.0 ),
vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingForRefPP" ),
chargePerUnit = cms.double( 2000.0 ),
forceYError = cms.double( 150.0 ),
centralMIPCharge = cms.double( 26000.0 ),
forceYError = cms.double( 150.0 ),
pixelClusters = cms.InputTag( "hltSiPixelClustersForRefPP" ),
ptMin = cms.double( 200.0 ),
chargeFractionMin = cms.double( 2.0 ),
deltaRmax = cms.double( 0.05 ),
cores = cms.InputTag( "hltJetsForCoreTracking" ),
fractionalWidth = cms.double( 0.4 ),
pixelCPE = cms.string( "hltESPPixelCPEGeneric" )
Expand Down Expand Up @@ -22565,7 +22567,7 @@
fragment.HLTBeginSequenceCalibration = cms.Sequence( fragment.hltCalibrationEventsFilter + fragment.hltGtStage2Digis )

fragment.HLTriggerFirstPath = cms.Path( fragment.hltGetConditions + fragment.hltGetRaw + fragment.hltBoolFalse )
fragment.HLT_ZeroBias_Beamspot_v4 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreZeroBiasBeamspot + fragment.hltZeroBiasForBeamSpot + fragment.HLTTrackingForBeamSpot + fragment.hltVerticesPF + fragment.hltVerticesPFSelector + fragment.hltVerticesPFFilter + fragment.HLTEndSequence )
fragment.HLT_ZeroBias_Beamspot_v4 = cms.Path( fragment.HLTBeginSequence + fragment.hltZeroBiasForBeamSpot + fragment.hltPreZeroBiasBeamspot + fragment.HLTTrackingForBeamSpot + fragment.hltVerticesPF + fragment.hltVerticesPFSelector + fragment.hltVerticesPFFilter + fragment.HLTEndSequence )
fragment.HLT_Physics_v7 = cms.Path( fragment.HLTBeginSequenceL1Fat + fragment.hltPrePhysics + fragment.HLTEndSequence )
fragment.DST_Physics_v7 = cms.Path( fragment.HLTBeginSequence + fragment.hltPreDSTPhysics + fragment.HLTEndSequence )
fragment.HLT_Random_v3 = cms.Path( fragment.HLTBeginSequenceRandom + fragment.hltPreRandom + fragment.HLTEndSequence )
Expand Down

0 comments on commit 05e855f

Please sign in to comment.