Merge pull request #21680 from cms-tsg-storm/MigrationTo100X

Migration of HLT to CMSSW_10 code base
cms-sw · Dec 12, 2017 · 6a35e9d · 6a35e9d
2 parents cb5b6af + bc78f53
commit 6a35e9d
Show file tree

Hide file tree

Showing 33 changed files with 2,126 additions and 3,159 deletions.
diff --git a/Configuration/HLT/python/autoHLT.py b/Configuration/HLT/python/autoHLT.py
@@ -9,5 +9,6 @@
   'relval25ns' : 'Fake1',
   'relval2016' : 'Fake2',
   'relval2017' : '2e34v40',
+  'relval2018' : 'GRun',
   'test'       : 'GRun',
 }
diff --git a/HLTrigger/Configuration/python/HLT_2e34v22_cff.py b/HLTrigger/Configuration/python/HLT_2e34v22_cff.py
@@ -4757,6 +4757,14 @@
   MissingHitPenalty = cms.double( 0.0 ),
   allowSharedFirstHit = cms.bool( False )
 )
+fragment.hltESPTrajectoryCleanerBySharedSeeds = cms.ESProducer( "TrajectoryCleanerESProducer",
+  ComponentName = cms.string( "hltESPTrajectoryCleanerBySharedSeeds" ),
+  fractionShared = cms.double( 0.5 ),
+  ValidHitBonus = cms.double( 100.0 ),
+  ComponentType = cms.string( "TrajectoryCleanerBySharedSeeds" ),
+  MissingHitPenalty = cms.double( 0.0 ),
+  allowSharedFirstHit = cms.bool( True )
+)
 fragment.hltESPTrajectoryFitterRK = cms.ESProducer( "KFTrajectoryFitterESProducer",
   appendToDataLabel = cms.string( "" ),
   minHits = cms.int32( 3 ),

diff --git a/HLTrigger/Configuration/python/HLT_2e34v31_cff.py b/HLTrigger/Configuration/python/HLT_2e34v31_cff.py
@@ -4821,6 +4821,14 @@
   MissingHitPenalty = cms.double( 0.0 ),
   allowSharedFirstHit = cms.bool( False )
 )
+fragment.hltESPTrajectoryCleanerBySharedSeeds = cms.ESProducer( "TrajectoryCleanerESProducer",
+  ComponentName = cms.string( "hltESPTrajectoryCleanerBySharedSeeds" ),
+  fractionShared = cms.double( 0.5 ),
+  ValidHitBonus = cms.double( 100.0 ),
+  ComponentType = cms.string( "TrajectoryCleanerBySharedSeeds" ),
+  MissingHitPenalty = cms.double( 0.0 ),
+  allowSharedFirstHit = cms.bool( True )
+)
 fragment.hltESPTrajectoryFitterRK = cms.ESProducer( "KFTrajectoryFitterESProducer",
   appendToDataLabel = cms.string( "" ),
   minHits = cms.int32( 3 ),

diff --git a/HLTrigger/Configuration/python/HLT_2e34v40_cff.py b/HLTrigger/Configuration/python/HLT_2e34v40_cff.py
@@ -4904,6 +4904,14 @@
   MissingHitPenalty = cms.double( 0.0 ),
   allowSharedFirstHit = cms.bool( False )
 )
+fragment.hltESPTrajectoryCleanerBySharedSeeds = cms.ESProducer( "TrajectoryCleanerESProducer",
+  ComponentName = cms.string( "hltESPTrajectoryCleanerBySharedSeeds" ),
+  fractionShared = cms.double( 0.5 ),
+  ValidHitBonus = cms.double( 100.0 ),
+  ComponentType = cms.string( "TrajectoryCleanerBySharedSeeds" ),
+  MissingHitPenalty = cms.double( 0.0 ),
+  allowSharedFirstHit = cms.bool( True )
+)
 fragment.hltESPTrajectoryFitterRK = cms.ESProducer( "KFTrajectoryFitterESProducer",
   appendToDataLabel = cms.string( "" ),
   minHits = cms.int32( 3 ),

diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py
@@ -1,13 +1,13 @@
-# hltGetConfiguration --cff --data /dev/CMSSW_9_2_0/Fake1 --type Fake1
+# hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/Fake1 --type Fake1
 
-# /dev/CMSSW_9_2_0/Fake1/V9 (CMSSW_9_2_14)
+# /dev/CMSSW_10_0_0/Fake1/V2 (CMSSW_10_0_0_pre2)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_9_2_0/Fake1/V9')
+  tableName = cms.string('/dev/CMSSW_10_0_0/Fake1/V2')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )

diff --git a/HLTrigger/Configuration/python/HLT_Fake2_cff.py b/HLTrigger/Configuration/python/HLT_Fake2_cff.py
@@ -1,13 +1,13 @@
-# hltGetConfiguration --cff --data /dev/CMSSW_9_2_0/Fake2 --type Fake2
+# hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/Fake2 --type Fake2
 
-# /dev/CMSSW_9_2_0/Fake2/V9 (CMSSW_9_2_14)
+# /dev/CMSSW_10_0_0/Fake2/V3 (CMSSW_10_0_0_pre2)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_9_2_0/Fake2/V9')
+  tableName = cms.string('/dev/CMSSW_10_0_0/Fake2/V3')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )
@@ -20,13 +20,8 @@
     recordName = cms.string( "L1TGlobalParametersRcd" ),
     firstValid = cms.vuint32( 1 )
 )
-fragment.StableParametersRcdSource = cms.ESSource( "EmptyESSource",
-    iovIsRunNotTime = cms.bool( True ),
-    recordName = cms.string( "L1TGlobalStableParametersRcd" ),
-    firstValid = cms.vuint32( 1 )
-)
 
-fragment.StableParameters = cms.ESProducer( "StableParametersTrivialProducer",
+fragment.GlobalParameters = cms.ESProducer( "StableParametersTrivialProducer",
   NumberL1JetCounts = cms.uint32( 12 ),
   NumberL1NoIsoEG = cms.uint32( 4 ),
   NumberL1CenJet = cms.uint32( 4 ),

diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py
@@ -1,13 +1,13 @@
-# hltGetConfiguration --cff --data /dev/CMSSW_9_2_0/Fake --type Fake
+# hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/Fake --type Fake
 
-# /dev/CMSSW_9_2_0/Fake/V9 (CMSSW_9_2_14)
+# /dev/CMSSW_10_0_0/Fake/V2 (CMSSW_10_0_0_pre2)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_9_2_0/Fake/V9')
+  tableName = cms.string('/dev/CMSSW_10_0_0/Fake/V2')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )