Merge pull request #25268 from cms-tsg-storm/HIonV1p5HLT104X

HLT HIon menu V1.5 (104X)
cms-sw · Nov 18, 2018 · e33a0d8 · e33a0d8
2 parents 3551dd4 + 1a007c3
commit e33a0d8
Show file tree

Hide file tree

Showing 15 changed files with 977 additions and 754 deletions.
diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py
@@ -41,27 +41,27 @@
     'run2_mc_PIon'           : ('phase1_2018_realistic'   ,l1Menus['PIon']),
     'run2_mc_PRef'           : ('phase1_2018_realistic'   ,l1Menus['PRef']),
 
-    'run1_hlt_Fake'          : ('run1_hlt'             ,l1Menus['Fake']),
-    'run2_hlt_Fake'          : ('run2_hlt_relval'      ,l1Menus['Fake']),
-    'run2_hlt_Fake1'         : ('run2_hlt_relval'      ,l1Menus['Fake1']),
-    'run2_hlt_Fake2'         : ('run2_hlt_relval'      ,l1Menus['Fake2']),
-    'run2_hlt_FULL'          : ('run2_hlt_relval'      ,l1Menus['FULL']),
-    'run2_hlt_2018v36'       : ('run2_hlt_relval'      ,l1Menus['2018v36']),
-    'run2_hlt_GRun'          : ('run2_hlt_relval'      ,l1Menus['GRun']),
-    'run2_hlt_HIon'          : ('run2_hlt_relval'      ,l1Menus['HIon']),
-    'run2_hlt_PIon'          : ('run2_hlt_relval'      ,l1Menus['PIon']),
-    'run2_hlt_PRef'          : ('run2_hlt_relval'      ,l1Menus['PRef']),
+    'run1_hlt_Fake'          : ('run1_hlt'                ,l1Menus['Fake']),
+    'run2_hlt_Fake'          : ('run2_hlt_relval'         ,l1Menus['Fake']),
+    'run2_hlt_Fake1'         : ('run2_hlt_relval'         ,l1Menus['Fake1']),
+    'run2_hlt_Fake2'         : ('run2_hlt_relval'         ,l1Menus['Fake2']),
+    'run2_hlt_FULL'          : ('run2_hlt_relval'         ,l1Menus['FULL']),
+    'run2_hlt_2018v36'       : ('run2_hlt_relval'         ,l1Menus['2018v36']),
+    'run2_hlt_GRun'          : ('run2_hlt_relval'         ,l1Menus['GRun']),
+    'run2_hlt_HIon'          : ('run2_hlt_relval_hi'      ,l1Menus['HIon']),
+    'run2_hlt_PIon'          : ('run2_hlt_relval'         ,l1Menus['PIon']),
+    'run2_hlt_PRef'          : ('run2_hlt_relval'         ,l1Menus['PRef']),
 
-    'run1_data_Fake'         : ('run1_data'            ,l1Menus['Fake']),
-    'run2_data_Fake'         : ('run2_data_relval'     ,l1Menus['Fake']),
-    'run2_data_Fake1'        : ('run2_data_relval'     ,l1Menus['Fake1']),
-    'run2_data_Fake2'        : ('run2_data_relval'     ,l1Menus['Fake2']),
-    'run2_data_FULL'         : ('run2_data_promptlike' ,l1Menus['FULL']),
-    'run2_data_2018v36'      : ('run2_data_promptlike' ,l1Menus['2018v36']),
-    'run2_data_GRun'         : ('run2_data_promptlike' ,l1Menus['GRun']),
-    'run2_data_HIon'         : ('run2_data_promptlike' ,l1Menus['HIon']),
-    'run2_data_PIon'         : ('run2_data_promptlike' ,l1Menus['PIon']),
-    'run2_data_PRef'         : ('run2_data_promptlike' ,l1Menus['PRef']),
+    'run1_data_Fake'         : ('run1_data'               ,l1Menus['Fake']),
+    'run2_data_Fake'         : ('run2_data_relval'        ,l1Menus['Fake']),
+    'run2_data_Fake1'        : ('run2_data_relval'        ,l1Menus['Fake1']),
+    'run2_data_Fake2'        : ('run2_data_relval'        ,l1Menus['Fake2']),
+    'run2_data_FULL'         : ('run2_data_promptlike'    ,l1Menus['FULL']),
+    'run2_data_2018v36'      : ('run2_data_promptlike'    ,l1Menus['2018v36']),
+    'run2_data_GRun'         : ('run2_data_promptlike'    ,l1Menus['GRun']),
+    'run2_data_HIon'         : ('run2_data_promptlike_hi' ,l1Menus['HIon']),
+    'run2_data_PIon'         : ('run2_data_promptlike'    ,l1Menus['PIon']),
+    'run2_data_PRef'         : ('run2_data_promptlike'    ,l1Menus['PRef']),
 
 }
 

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_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_3_0/GRun --type GRun
 
-# /dev/CMSSW_10_3_0/GRun/V35 (CMSSW_10_3_0)
+# /dev/CMSSW_10_3_0/GRun/V40 (CMSSW_10_3_0)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_3_0/GRun/V35')
+  tableName = cms.string('/dev/CMSSW_10_3_0/GRun/V40')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -5005,12 +5005,6 @@
     firstValid = cms.vuint32( 1 )
 )
 
-fragment.hltBoostedDoubleSecondaryVertexAK8Computer = cms.ESProducer( "CandidateBoostedDoubleSecondaryVertexESProducer",
-  weightFile = cms.FileInPath( "RecoBTag/SecondaryVertex/data/BoostedDoubleSV_AK8_BDT_v4.weights.xml.gz" ),
-  useCondDB = cms.bool( False ),
-  useGBRForest = cms.bool( True ),
-  useAdaBoost = cms.bool( False )
-)
 fragment.AnyDirectionAnalyticalPropagator = cms.ESProducer( "AnalyticalPropagatorESProducer",
   MaxDPhi = cms.double( 1.6 ),
   ComponentName = cms.string( "AnyDirectionAnalyticalPropagator" ),
@@ -5319,6 +5313,12 @@
     'HcalCellOff',
     'HcalCellDead' )
 )
+fragment.hltBoostedDoubleSecondaryVertexAK8Computer = cms.ESProducer( "CandidateBoostedDoubleSecondaryVertexESProducer",
+  weightFile = cms.FileInPath( "RecoBTag/SecondaryVertex/data/BoostedDoubleSV_AK8_BDT_v4.weights.xml.gz" ),
+  useCondDB = cms.bool( False ),
+  useGBRForest = cms.bool( True ),
+  useAdaBoost = cms.bool( False )
+)
 fragment.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer",
   recordLabel = cms.string( "HLT" ),
   categoryVariableName = cms.string( "vertexCategory" ),