Skip to content

Commit

Permalink
Merge pull request #32402 from cms-tsg-storm/HLTmigrationTo1120pre11
Browse files Browse the repository at this point in the history
HLT menu migration to 11_2_0_pre11 template
  • Loading branch information
cmsbuild committed Dec 8, 2020
2 parents e666c4d + de1e2dc commit 10f3aff
Show file tree
Hide file tree
Showing 17 changed files with 804 additions and 112 deletions.
115 changes: 96 additions & 19 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_2_0/HLT --type FULL

# /dev/CMSSW_11_2_0/HLT/V35 (CMSSW_11_2_0_pre9)
# /dev/CMSSW_11_2_0/HLT/V38 (CMSSW_11_2_0_pre11)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_2_0/HLT/V35')
tableName = cms.string('/dev/CMSSW_11_2_0/HLT/V38')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -6374,6 +6374,16 @@
),
appendToDataLabel = cms.string( "HBHE" )
)
fragment.ecalMustacheSCParamsSource = cms.ESSource( "EmptyESSource",
iovIsRunNotTime = cms.bool( True ),
recordName = cms.string( "EcalMustacheSCParametersRcd" ),
firstValid = cms.vuint32( 1 )
)
fragment.ecalSCDynamicDPhiParamsSource = cms.ESSource( "EmptyESSource",
iovIsRunNotTime = cms.bool( True ),
recordName = cms.string( "EcalSCDynamicDPhiParametersRcd" ),
firstValid = cms.vuint32( 1 )
)
fragment.hltESSBTagRecord = cms.ESSource( "EmptyESSource",
iovIsRunNotTime = cms.bool( True ),
recordName = cms.string( "JetTagComputerRecord" ),
Expand Down Expand Up @@ -6600,6 +6610,62 @@
includeME0 = cms.bool( False ),
includeGEM = cms.bool( False )
)
fragment.ecalMustacheSCParametersESProducer = cms.ESProducer( "EcalMustacheSCParametersESProducer",
sqrtLogClustETuning = cms.double( 1.1 ),
appendToDataLabel = cms.string( "" ),
parabolaParameterSets = cms.VPSet(
cms.PSet( pLow = cms.vdouble( -0.0268843, 0.147742, -0.0191235 ),
w0Up = cms.vdouble( -0.00681785, -0.00239516 ),
w1Low = cms.vdouble( 6.99995E-4, -0.00554331 ),
w0Low = cms.vdouble( -0.00681785, -0.00239516 ),
etaMin = cms.double( 0.0 ),
log10EMin = cms.double( -3.0 ),
w1Up = cms.vdouble( 6.99995E-4, -0.00554331 ),
pUp = cms.vdouble( -0.107537, 0.590969, -0.076494 )
)
)
)
fragment.ecalSCDynamicDPhiParametersESProducer = cms.ESProducer( "EcalSCDynamicDPhiParametersESProducer",
dynamicDPhiParameterSets = cms.VPSet(
cms.PSet( cutoff = cms.double( 0.3 ),
eMin = cms.double( 0.0 ),
etaMin = cms.double( 2.0 ),
saturation = cms.double( 0.12 ),
scale = cms.double( 1.22321 ),
width = cms.double( 0.345852 ),
xoffset = cms.double( -0.260256 ),
yoffset = cms.double( 0.0928887 )
),
cms.PSet( cutoff = cms.double( 0.45 ),
eMin = cms.double( 0.0 ),
etaMin = cms.double( 1.75 ),
saturation = cms.double( 0.12 ),
scale = cms.double( 1.60429 ),
width = cms.double( 0.458106 ),
xoffset = cms.double( -0.642352 ),
yoffset = cms.double( 0.05643 )
),
cms.PSet( cutoff = cms.double( 0.55 ),
eMin = cms.double( 0.0 ),
etaMin = cms.double( 1.479 ),
saturation = cms.double( 0.14 ),
scale = cms.double( 0.975707 ),
width = cms.double( 0.431729 ),
xoffset = cms.double( -0.18149 ),
yoffset = cms.double( 0.0497038 )
),
cms.PSet( cutoff = cms.double( 0.6 ),
eMin = cms.double( 0.0 ),
etaMin = cms.double( 0.0 ),
saturation = cms.double( 0.14 ),
scale = cms.double( 0.946048 ),
width = cms.double( 0.432767 ),
xoffset = cms.double( -0.101172 ),
yoffset = cms.double( 0.0280506 )
)
),
appendToDataLabel = cms.string( "" )
)
fragment.ecalSeverityLevel = cms.ESProducer( "EcalSeverityLevelESProducer",
dbstatusMask = cms.PSet(
kBad = cms.vstring( 'kNonRespondingIsolated',
Expand Down Expand Up @@ -54977,13 +55043,13 @@
minimumTransverseMomentum = cms.double( 1.0 ),
primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
maximumLongitudinalImpactParameter = cms.double( 17.0 ),
computeGhostTrack = cms.bool( True ),
jets = cms.InputTag( "hltPFJetForBtag" ),
maxDeltaR = cms.double( 0.4 ),
candidates = cms.InputTag( "hltParticleFlow" ),
jetDirectionUsingGhostTrack = cms.bool( False ),
minimumNumberOfPixelHits = cms.int32( 2 ),
jetDirectionUsingTracks = cms.bool( False ),
jets = cms.InputTag( "hltPFJetForBtag" ),
computeGhostTrack = cms.bool( True ),
useTrackQuality = cms.bool( False ),
ghostTrackPriorDeltaR = cms.double( 0.03 ),
maximumChiSquared = cms.double( 5.0 ),
Expand Down Expand Up @@ -95420,13 +95486,13 @@
minimumTransverseMomentum = cms.double( 1.0 ),
primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
maximumLongitudinalImpactParameter = cms.double( 17.0 ),
computeGhostTrack = cms.bool( True ),
jets = cms.InputTag( "hltPFJetForBtagAK8" ),
maxDeltaR = cms.double( 0.4 ),
candidates = cms.InputTag( "hltParticleFlow" ),
jetDirectionUsingGhostTrack = cms.bool( False ),
minimumNumberOfPixelHits = cms.int32( 2 ),
jetDirectionUsingTracks = cms.bool( False ),
jets = cms.InputTag( "hltPFJetForBtagAK8" ),
computeGhostTrack = cms.bool( True ),
useTrackQuality = cms.bool( False ),
ghostTrackPriorDeltaR = cms.double( 0.03 ),
maximumChiSquared = cms.double( 5.0 ),
Expand Down Expand Up @@ -95643,13 +95709,13 @@
minimumTransverseMomentum = cms.double( 1.0 ),
primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
maximumLongitudinalImpactParameter = cms.double( 17.0 ),
computeGhostTrack = cms.bool( True ),
jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
maxDeltaR = cms.double( 0.4 ),
candidates = cms.InputTag( "hltParticleFlow" ),
jetDirectionUsingGhostTrack = cms.bool( False ),
minimumNumberOfPixelHits = cms.int32( 2 ),
jetDirectionUsingTracks = cms.bool( False ),
jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
computeGhostTrack = cms.bool( True ),
useTrackQuality = cms.bool( False ),
ghostTrackPriorDeltaR = cms.double( 0.03 ),
maximumChiSquared = cms.double( 5.0 ),
Expand Down Expand Up @@ -122059,28 +122125,35 @@
HcalPFClusterIsoMap = cms.InputTag( 'hltMuonHcalPFClusterIsoForMuons','','@currentProcess' ),
EcalPFClusterIsoMap = cms.InputTag( 'hltMuonEcalPFClusterIsoForMuons','','@currentProcess' ),
ChargedCandidates = cms.InputTag( 'hltL3MuonCandidates','','@currentProcess' ),
muonPtCut = cms.double( 3.0 ),
InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ),
InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ),
TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09Map','combinedRelativeIsoDeposits','@currentProcess' ),
displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxProducerDoubleMu3NoVtx','','@currentProcess' ),
Tracks = cms.InputTag( "hltL3Muons" ),
muonEtaCut = cms.double( 2.4 ),
TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09Map','combinedRelativeIsoDeposits','@currentProcess' )
muonPtCut = cms.double( 3.0 ),
InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' )
)
fragment.hltScoutingEgammaPacker = cms.EDProducer( "HLTScoutingEgammaProducer",
egammaEtaCut = cms.double( 2.5 ),
HcalPFClusterIsoMap = cms.InputTag( 'hltEgammaHcalPFClusterIso','','@currentProcess' ),
EgammaCandidates = cms.InputTag( 'hltEgammaCandidates','','@currentProcess' ),
egammaPtCut = cms.double( 4.0 ),
EcalPFClusterIsoMap = cms.InputTag( 'hltEgammaEcalPFClusterIso','','@currentProcess' ),
SigmaIEtaIEtaMap = cms.InputTag( 'hltEgammaClusterShape','sigmaIEtaIEta5x5','@currentProcess' ),
saveRecHitTiming = cms.bool( False ),
rechitMatrixSize = cms.int32( 10 ),
MissingHitsMap = cms.InputTag( 'hltEgammaGsfTrackVars','MissingHits','@currentProcess' ),
OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ),
HoverEMap = cms.InputTag( 'hltEgammaHoverE','','@currentProcess' ),
EgammaGsfTracks = cms.InputTag( 'hltEgammaGsfTracks','','@currentProcess' ),
OneOEMinusOneOPMap = cms.InputTag( 'hltEgammaGsfTrackVars','OneOESuperMinusOneOP','@currentProcess' ),
mantissaPrecision = cms.int32( 10 ),
r9Map = cms.InputTag( 'hltEgammaR9ID','r95x5' ),
SigmaIEtaIEtaMap = cms.InputTag( 'hltEgammaClusterShape','sigmaIEtaIEta5x5','@currentProcess' ),
DetaMap = cms.InputTag( 'hltEgammaGsfTrackVars','DetaSeed','@currentProcess' ),
egammaHoverECut = cms.double( 1.0 ),
EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' ),
DphiMap = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi','@currentProcess' )
ecalRechitEB = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ),
ecalRechitEE = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ),
DphiMap = cms.InputTag( 'hltEgammaGsfTrackVars','Dphi','@currentProcess' ),
EleGsfTrackIsoMap = cms.InputTag( 'hltEgammaEleGsfTrackIso','','@currentProcess' )
)
fragment.hltScoutingPrimaryVertexPacker = cms.EDProducer( "HLTScoutingPrimaryVertexProducer",
vertexCollection = cms.InputTag( 'hltPixelVertices','','@currentProcess' )
Expand All @@ -122107,18 +122180,22 @@
HcalPFClusterIsoMap = cms.InputTag( "" ),
EcalPFClusterIsoMap = cms.InputTag( "" ),
ChargedCandidates = cms.InputTag( 'hltIterL3MuonCandidatesNoVtx','','@currentProcess' ),
muonPtCut = cms.double( 3.0 ),
InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' ),
InputMuons = cms.InputTag( "hltIterL3MuonsNoVtx" ),
TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' ),
displacedvertexCollection = cms.InputTag( 'hltDisplacedmumuVtxProducer','','@currentProcess' ),
Tracks = cms.InputTag( 'hltIterL3MuonAndMuonFromL1MergedNoVtx','','@currentProcess' ),
muonEtaCut = cms.double( 2.4 ),
TrackIsoMap = cms.InputTag( 'hltMuonTkRelIsolationCut0p09MapNoVtx','combinedRelativeIsoDeposits','@currentProcess' )
muonPtCut = cms.double( 3.0 ),
InputLinks = cms.InputTag( 'hltL3MuonsIterL3LinksNoVtx','','@currentProcess' )
)
fragment.hltScoutingPrimaryVertexPackerCaloMuon = cms.EDProducer( "HLTScoutingPrimaryVertexProducer",
vertexCollection = cms.InputTag( 'hltPixelVerticesL3MuonNoVtx','','@currentProcess' )
)
fragment.hltScoutingTrackPacker = cms.EDProducer( "HLTScoutingTrackProducer",
OtherTracks = cms.InputTag( "hltPixelTracksL3MuonNoVtx" )
vtxMinDist = cms.double( 0.01 ),
OtherTracks = cms.InputTag( "hltPixelTracksL3MuonNoVtx" ),
vertexCollection = cms.InputTag( "hltPixelVertices" ),
mantissaPrecision = cms.int32( 10 )
)

fragment.HLTL1UnpackerSequence = cms.Sequence( fragment.hltGtStage2Digis + fragment.hltGtStage2ObjectMap )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake1_cff.py
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_2_0/Fake1 --type Fake1

# /dev/CMSSW_11_2_0/Fake1/V7 (CMSSW_11_2_0_pre9)
# /dev/CMSSW_11_2_0/Fake1/V8 (CMSSW_11_2_0_pre11)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_2_0/Fake1/V7')
tableName = cms.string('/dev/CMSSW_11_2_0/Fake1/V8')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake2_cff.py
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_2_0/Fake2 --type Fake2

# /dev/CMSSW_11_2_0/Fake2/V7 (CMSSW_11_2_0_pre9)
# /dev/CMSSW_11_2_0/Fake2/V8 (CMSSW_11_2_0_pre11)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_2_0/Fake2/V7')
tableName = cms.string('/dev/CMSSW_11_2_0/Fake2/V8')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_Fake_cff.py
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_11_2_0/Fake --type Fake

# /dev/CMSSW_11_2_0/Fake/V7 (CMSSW_11_2_0_pre9)
# /dev/CMSSW_11_2_0/Fake/V8 (CMSSW_11_2_0_pre11)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_11_2_0/Fake/V7')
tableName = cms.string('/dev/CMSSW_11_2_0/Fake/V8')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down

0 comments on commit 10f3aff

Please sign in to comment.