Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update of HLT menu: move from M2 to MAHI (101X) #22158

Merged
merged 1 commit into from Feb 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions 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(
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down
20 changes: 10 additions & 10 deletions 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(
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down
4 changes: 2 additions & 2 deletions 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(
Expand Down
4 changes: 2 additions & 2 deletions 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(
Expand Down
8 changes: 4 additions & 4 deletions 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(
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down
8 changes: 0 additions & 8 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
Expand Up @@ -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"""
Expand Down
24 changes: 12 additions & 12 deletions 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(
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down Expand Up @@ -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 ),
Expand All @@ -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 ),
Expand Down