Merged HLT_V3_102X from repository cms-tsg-storm with cms-merge-topic

Configuration/HLT/python/autoCondHLT.py

@@ -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"] ), ),
-    '2018v22'      : ( ','.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"] ), ),
+    '2018v22'      : ( ','.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"] ), ),

HLTrigger/Configuration/python/HLT_HIon_cff.py

@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/HIon --type HIon
 
-# /dev/CMSSW_10_1_0/HIon/V52 (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/V52')
+  tableName = cms.string('/dev/CMSSW_10_1_0/HIon/V56')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -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 ),
@@ -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' )

HLTrigger/Configuration/python/HLT_PIon_cff.py

@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/PIon --type PIon
 
-# /dev/CMSSW_10_1_0/PIon/V52 (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/V52')
+  tableName = cms.string('/dev/CMSSW_10_1_0/PIon/V56')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -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 ),
@@ -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' )

HLTrigger/Configuration/python/HLT_PRef_cff.py

@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/PRef --type PRef
 
-# /dev/CMSSW_10_1_0/PRef/V52 (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/V52')
+  tableName = cms.string('/dev/CMSSW_10_1_0/PRef/V56')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -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 ),
@@ -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' )
@@ -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' ),
@@ -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" ),
@@ -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" )
@@ -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 )

HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py

@@ -261,8 +261,10 @@
     'HLT_Ele27_Ele37_CaloIdL_MW_v4', 
     'HLT_Ele27_WPTight_Gsf_v16', 
     'HLT_Ele28_HighEta_SC20_Mass55_v13', 
+    'HLT_Ele28_WPTight_Gsf_v1', 
     'HLT_Ele28_eta2p1_WPTight_Gsf_HT150_v13', 
     'HLT_Ele300_CaloIdVT_GsfTrkIdT_v13', 
+    'HLT_Ele30_WPTight_Gsf_v1', 
     'HLT_Ele30_eta2p1_WPTight_Gsf_CentralPFJet35_EleCleaned_v13', 
     'HLT_Ele32_WPTight_Gsf_L1DoubleEG_v9', 
     'HLT_Ele32_WPTight_Gsf_v15', 
@@ -687,7 +689,7 @@
 streamPhysicsMuons_datasetCharmonium_selector.l1tResults = cms.InputTag('')
 streamPhysicsMuons_datasetCharmonium_selector.throw      = cms.bool(False)
 streamPhysicsMuons_datasetCharmonium_selector.triggerConditions = cms.vstring(
-    'HLT_Dimuon0_Jpsi3p5_Muon2_v6', 
+    'HLT_Dimuon0_Jpsi3p5_Muon2_v5', 
     'HLT_Dimuon0_Jpsi_L1_4R_0er1p5R_v7', 
     'HLT_Dimuon0_Jpsi_L1_NoOS_v7', 
     'HLT_Dimuon0_Jpsi_NoVertexing_L1_4R_0er1p5R_v7', 
@@ -726,11 +728,15 @@
 streamPhysicsMuons_datasetDoubleMuon_selector.l1tResults = cms.InputTag('')
 streamPhysicsMuons_datasetDoubleMuon_selector.throw      = cms.bool(False)
 streamPhysicsMuons_datasetDoubleMuon_selector.triggerConditions = cms.vstring(
+    'HLT_DoubleL2Mu23NoVtx_2Cha_CosmicSeed_NoL2Matched_v2', 
     'HLT_DoubleL2Mu23NoVtx_2Cha_CosmicSeed_v2', 
+    'HLT_DoubleL2Mu23NoVtx_2Cha_NoL2Matched_v2', 
     'HLT_DoubleL2Mu23NoVtx_2Cha_v2', 
     'HLT_DoubleL2Mu25NoVtx_2Cha_CosmicSeed_Eta2p4_v2', 
+    'HLT_DoubleL2Mu25NoVtx_2Cha_CosmicSeed_NoL2Matched_v2', 
     'HLT_DoubleL2Mu25NoVtx_2Cha_CosmicSeed_v2', 
     'HLT_DoubleL2Mu25NoVtx_2Cha_Eta2p4_v2', 
+    'HLT_DoubleL2Mu25NoVtx_2Cha_NoL2Matched_v2', 
     'HLT_DoubleL2Mu25NoVtx_2Cha_v2', 
     'HLT_DoubleL2Mu30NoVtx_2Cha_CosmicSeed_Eta2p4_v2', 
     'HLT_DoubleL2Mu30NoVtx_2Cha_Eta2p4_v2', 

HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py

@@ -322,6 +322,7 @@
         'keep *_hltSelector8CentralJetsL1FastJet_*_*',
         'keep *_hltSelectorJets20L1FastJet_*_*',
         'keep *_hltSiPixelCluster_*_*',
+        'keep *_hltSiPixelClustersCache_*_*',
         'keep *_hltSiPixelClusters_*_*',
         'keep *_hltSiStripClusters_*_*',
         'keep *_hltSiStripRawToClustersFacility_*_*',
@@ -653,6 +654,7 @@
         'keep *_hltSelector8CentralJetsL1FastJet_*_*',
         'keep *_hltSelectorJets20L1FastJet_*_*',
         'keep *_hltSiPixelCluster_*_*',
+        'keep *_hltSiPixelClustersCache_*_*',
         'keep *_hltSiPixelClusters_*_*',
         'keep *_hltSiStripClusters_*_*',
         'keep *_hltSiStripRawToClustersFacility_*_*',

HLTrigger/Configuration/tables/GRun.txt

@@ -672,6 +672,13 @@ HLT_Mu8_IP6_part4_v*	#	CMSHLT-1886
 HLT_ZeroBias_Alignment_v*	#	CMSHLT-1892
 HLT_CDC_L2cosmic_5_er1p0_v*	#	CMSHLT-1896
 HLT_CDC_L2cosmic_5p5_er1p0_v*	#	CMSHLT-1896
+HLT_DoubleL2Mu23NoVtx_2Cha_CosmicSeed_NoL2Matched_v*	#	CMSHLT-1907
+HLT_DoubleL2Mu25NoVtx_2Cha_CosmicSeed_NoL2Matched_v*	#	CMSHLT-1907
+HLT_DoubleL2Mu23NoVtx_2Cha_NoL2Matched_v*	#	CMSHLT-1907
+HLT_DoubleL2Mu25NoVtx_2Cha_NoL2Matched_v*	#	CMSHLT-1907
+HLT_DoubleTrkMu_16_6_NoFiltersNoVtx_v*	#	CMSHLT-1919
+HLT_Ele28_WPTight_Gsf_v*	#	CMSHLT-1921
+HLT_Ele30_WPTight_Gsf_v*	#	CMSHLT-1921
 
 ## EndPath ##
 

HLTrigger/Configuration/tables/makeOnlineGRun

@@ -4,7 +4,7 @@
 #
 
 MASTER="/dev/CMSSW_10_1_0/HLT"                 # no version, take the latest one
-TARGET="/online/collisions/2018/2e34/v2.2/HLT" # where to store the online-compliant menu
+TARGET="/online/collisions/2018/2e34/v3.0/HLT" # where to store the online-compliant menu
 TABLES="online_grun"
 
 source subtables.sh

HLTrigger/Configuration/tables/online_grun.txt

@@ -671,6 +671,13 @@ HLT_Mu8_IP6_part4_v*	#	CMSHLT-1886
 HLT_ZeroBias_Alignment_v*	#	CMSHLT-1892
 HLT_CDC_L2cosmic_5_er1p0_v*	#	CMSHLT-1896
 HLT_CDC_L2cosmic_5p5_er1p0_v*	#	CMSHLT-1896
+HLT_DoubleL2Mu23NoVtx_2Cha_CosmicSeed_NoL2Matched_v*	#	CMSHLT-1907
+HLT_DoubleL2Mu25NoVtx_2Cha_CosmicSeed_NoL2Matched_v*	#	CMSHLT-1907
+HLT_DoubleL2Mu23NoVtx_2Cha_NoL2Matched_v*	#	CMSHLT-1907
+HLT_DoubleL2Mu25NoVtx_2Cha_NoL2Matched_v*	#	CMSHLT-1907
+HLT_DoubleTrkMu_16_6_NoFiltersNoVtx_v*	#	CMSHLT-1919
+HLT_Ele28_WPTight_Gsf_v*	#	CMSHLT-1921
+HLT_Ele30_WPTight_Gsf_v*	#	CMSHLT-1921
 
 ## EndPath ##