Merge pull request #22158 from cms-tsg-storm/HLTmenu102_11X

Update of HLT menu: move from M2 to MAHI (101X)
cms-sw · Feb 8, 2018 · 2de6fd4 · 2de6fd4
2 parents bf01e69 + 39f04e3
commit 2de6fd4
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 68 deletions.
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/HLT --type FULL
 
-# /dev/CMSSW_10_0_0/HLT/V25 (CMSSW_10_0_0_HLT1)
+# /dev/CMSSW_10_0_0/HLT/V26 (CMSSW_10_0_0_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_0_0/HLT/V25')
+  tableName = cms.string('/dev/CMSSW_10_0_0/HLT/V26')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -12224,7 +12224,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -12234,7 +12234,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -15421,7 +15421,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -15431,7 +15431,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -28519,7 +28519,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -28529,7 +28529,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -71651,7 +71651,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -71661,7 +71661,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -89912,7 +89912,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -89922,7 +89922,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),

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_0_0/GRun --type GRun
 
-# /dev/CMSSW_10_0_0/GRun/V9 (CMSSW_10_0_0_HLT1)
+# /dev/CMSSW_10_0_0/GRun/V10 (CMSSW_10_0_0_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_0_0/GRun/V9')
+  tableName = cms.string('/dev/CMSSW_10_0_0/GRun/V10')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -11692,7 +11692,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -11702,7 +11702,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -14889,7 +14889,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -14899,7 +14899,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -27987,7 +27987,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -27997,7 +27997,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -70703,7 +70703,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -70713,7 +70713,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),

diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/HIon --type HIon
 
-# /dev/CMSSW_10_0_0/HIon/V9 (CMSSW_10_0_0_HLT1)
+# /dev/CMSSW_10_0_0/HIon/V10 (CMSSW_10_0_0_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_0_0/HIon/V9')
+  tableName = cms.string('/dev/CMSSW_10_0_0/HIon/V10')
 )
 
 fragment.transferSystem = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/PIon --type PIon
 
-# /dev/CMSSW_10_0_0/PIon/V9 (CMSSW_10_0_0_HLT1)
+# /dev/CMSSW_10_0_0/PIon/V10 (CMSSW_10_0_0_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_0_0/PIon/V9')
+  tableName = cms.string('/dev/CMSSW_10_0_0/PIon/V10')
 )
 
 fragment.transferSystem = cms.PSet( 

diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/PRef --type PRef
 
-# /dev/CMSSW_10_0_0/PRef/V9 (CMSSW_10_0_0_HLT1)
+# /dev/CMSSW_10_0_0/PRef/V10 (CMSSW_10_0_0_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_0_0/PRef/V9')
+  tableName = cms.string('/dev/CMSSW_10_0_0/PRef/V10')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -16232,7 +16232,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -16242,7 +16242,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),

diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py
@@ -48,14 +48,6 @@ def customiseFor21664_forMahiOn(process):
         producer.algorithm.useM3     = cms.bool(False)
     return process
 
-def customiseFor21664_forMahiOnM2only(process):
-    for producer in producers_by_type(process, "HBHEPhase1Reconstructor"):
-      if (producer.algorithm.useM2 == cms.bool(True)):
-        producer.algorithm.useMahi   = cms.bool(True)
-        producer.algorithm.useM2     = cms.bool(False)
-        producer.algorithm.useM3     = cms.bool(False)
-    return process
-
 def customiseFor2017DtUnpacking(process):
     """Adapt the HLT to run the legacy DT unpacking
     for pre2018 data/MC workflows as the default"""

diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_0_0/HLT --type FULL --unprescale --process HLTFULL --globaltag auto:run2_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root
 
-# /dev/CMSSW_10_0_0/HLT/V25 (CMSSW_10_0_0_HLT1)
+# /dev/CMSSW_10_0_0/HLT/V26 (CMSSW_10_0_0_HLT1)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTFULL" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_0_0/HLT/V25')
+  tableName = cms.string('/dev/CMSSW_10_0_0/HLT/V26')
 )
 
 process.transferSystem = cms.PSet( 
@@ -12524,7 +12524,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -12534,7 +12534,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -15721,7 +15721,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -15731,7 +15731,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -28819,7 +28819,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -28829,7 +28829,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -71951,7 +71951,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -71961,7 +71961,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),
@@ -90212,7 +90212,7 @@
       ts4Min = cms.double( 0.0 ),
       applyPulseJitter = cms.bool( False ),
       noiseHPD = cms.double( 1.0 ),
-      useM2 = cms.bool( True ),
+      useM2 = cms.bool( False ),
       timeMin = cms.double( -12.5 ),
       useM3 = cms.bool( False ),
       tdcTimeShift = cms.double( 0.0 ),
@@ -90222,7 +90222,7 @@
       ts4chi2 = cms.vdouble( 15.0, 15.0 ),
       timeMax = cms.double( 12.5 ),
       Class = cms.string( "SimpleHBHEPhase1Algo" ),
-      useMahi = cms.bool( False ),
+      useMahi = cms.bool( True ),
       dynamicPed = cms.bool( True ),
       ts4Thresh = cms.double( 0.0 ),
       chiSqSwitch = cms.double( -10.0 ),