Skip to content

Commit

Permalink
Merge pull request #22824 from cms-tsg-storm/MigrationTo1010Template_…
Browse files Browse the repository at this point in the history 
…101X

Migration of HLT to 1010 template (101X)
  • Loading branch information
@cmsbuild
cmsbuild authored Apr 6, 2018
2 parents 30732df + e39bf16 commit 2b38df8
Show file tree
Hide file tree
Showing 27 changed files with 767 additions and 408 deletions.
111 changes: 67 additions & 44 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/HLT --type FULL
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/HLT --type FULL

# /dev/CMSSW_10_0_0/HLT/V140 (CMSSW_10_0_4)
# /dev/CMSSW_10_1_0/HLT/V3 (CMSSW_10_1_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_0_0/HLT/V140')
tableName = cms.string('/dev/CMSSW_10_1_0/HLT/V3')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -4377,13 +4377,13 @@
'HcalCellDead' )
)
fragment.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer",
charmCut = cms.double( 1.5 ),
recordLabel = cms.string( "HLT" ),
categoryVariableName = cms.string( "vertexCategory" ),
useTrackWeights = cms.bool( True ),
useCategories = cms.bool( True ),
pseudoMultiplicityMin = cms.uint32( 2 ),
correctVertexMass = cms.bool( True ),
trackSelection = cms.PSet(
categoryVariableName = cms.string( "vertexCategory" ),
trackPseudoSelection = cms.PSet(
maxDistToAxis = cms.double( 0.07 ),
totalHitsMin = cms.uint32( 0 ),
ptMin = cms.double( 0.0 ),
Expand All @@ -4396,7 +4396,7 @@
jetDeltaRMax = cms.double( 0.3 ),
normChi2Max = cms.double( 99999.9 ),
pixelHitsMin = cms.uint32( 0 ),
sip2dSigMin = cms.double( -99999.9 ),
sip2dSigMin = cms.double( 2.0 ),
sip2dValMin = cms.double( -99999.9 ),
sip3dSigMin = cms.double( -99999.9 ),
sip3dValMin = cms.double( -99999.9 )
Expand All @@ -4405,12 +4405,12 @@
'CombinedSVPseudoVertex',
'CombinedSVNoVertex' ),
trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ),
charmCut = cms.double( 1.5 ),
correctVertexMass = cms.bool( True ),
vertexFlip = cms.bool( False ),
minimumTrackWeight = cms.double( 0.5 ),
pseudoVertexV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.05 ) ),
trackMultiplicityMin = cms.uint32( 3 ),
trackPseudoSelection = cms.PSet(
trackSelection = cms.PSet(
maxDistToAxis = cms.double( 0.07 ),
totalHitsMin = cms.uint32( 0 ),
ptMin = cms.double( 0.0 ),
Expand All @@ -4423,7 +4423,7 @@
jetDeltaRMax = cms.double( 0.3 ),
normChi2Max = cms.double( 99999.9 ),
pixelHitsMin = cms.uint32( 0 ),
sip2dSigMin = cms.double( 2.0 ),
sip2dSigMin = cms.double( -99999.9 ),
sip2dValMin = cms.double( -99999.9 ),
sip3dSigMin = cms.double( -99999.9 ),
sip3dValMin = cms.double( -99999.9 )
Expand All @@ -4433,13 +4433,13 @@
trackFlip = cms.bool( False )
)
fragment.hltCombinedSecondaryVertexV2 = cms.ESProducer( "CombinedSecondaryVertexESProducer",
charmCut = cms.double( 1.5 ),
recordLabel = cms.string( "HLT" ),
categoryVariableName = cms.string( "vertexCategory" ),
useTrackWeights = cms.bool( True ),
useCategories = cms.bool( True ),
pseudoMultiplicityMin = cms.uint32( 2 ),
correctVertexMass = cms.bool( True ),
trackSelection = cms.PSet(
categoryVariableName = cms.string( "vertexCategory" ),
trackPseudoSelection = cms.PSet(
max_pT_dRcut = cms.double( 0.1 ),
b_dR = cms.double( 0.6263 ),
min_pT = cms.double( 120.0 ),
Expand All @@ -4465,18 +4465,18 @@
jetDeltaRMax = cms.double( 0.3 ),
pixelHitsMin = cms.uint32( 0 ),
sip3dSigMin = cms.double( -99999.9 ),
sip2dSigMin = cms.double( -99999.9 )
sip2dSigMin = cms.double( 2.0 )
),
calibrationRecords = cms.vstring( 'CombinedSVIVFV2RecoVertex',
'CombinedSVIVFV2PseudoVertex',
'CombinedSVIVFV2NoVertex' ),
trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ),
charmCut = cms.double( 1.5 ),
correctVertexMass = cms.bool( True ),
vertexFlip = cms.bool( False ),
minimumTrackWeight = cms.double( 0.5 ),
pseudoVertexV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.05 ) ),
trackMultiplicityMin = cms.uint32( 3 ),
trackPseudoSelection = cms.PSet(
trackSelection = cms.PSet(
max_pT_dRcut = cms.double( 0.1 ),
b_dR = cms.double( 0.6263 ),
min_pT = cms.double( 120.0 ),
Expand All @@ -4502,7 +4502,7 @@
jetDeltaRMax = cms.double( 0.3 ),
pixelHitsMin = cms.uint32( 0 ),
sip3dSigMin = cms.double( -99999.9 ),
sip2dSigMin = cms.double( 2.0 )
sip2dSigMin = cms.double( -99999.9 )
),
trackSort = cms.string( "sip2dSig" ),
SoftLeptonFlip = cms.bool( False ),
Expand Down Expand Up @@ -5952,20 +5952,24 @@
logWarningEtThreshold_EE_FE = cms.double( 50.0 )
)
fragment.hltHcalDigis = cms.EDProducer( "HcalRawToDigi",
saveQIE10DataNSamples = cms.untracked.vint32( ),
ExpectedOrbitMessageTime = cms.untracked.int32( -1 ),
FilterDataQuality = cms.bool( True ),
silent = cms.untracked.bool( True ),
saveQIE11DataNSamples = cms.untracked.vint32( ),
HcalFirstFED = cms.untracked.int32( 700 ),
InputLabel = cms.InputTag( "rawDataCollector" ),
ComplainEmptyData = cms.untracked.bool( False ),
ElectronicsMap = cms.string( "" ),
UnpackCalib = cms.untracked.bool( True ),
UnpackUMNio = cms.untracked.bool( True ),
FEDs = cms.untracked.vint32( ),
UnpackerMode = cms.untracked.int32( 0 ),
saveQIE11DataTags = cms.untracked.vstring( ),
UnpackTTP = cms.untracked.bool( False ),
lastSample = cms.int32( 9 ),
UnpackZDC = cms.untracked.bool( True ),
saveQIE10DataTags = cms.untracked.vstring( ),
lastSample = cms.int32( 9 ),
UnpackerMode = cms.untracked.int32( 0 ),
firstSample = cms.int32( 0 )
)
fragment.hltHbhePhase1Reco = cms.EDProducer( "HBHEPhase1Reconstructor",
Expand Down Expand Up @@ -12752,11 +12756,13 @@
GsfTrackProducer = cms.InputTag( "hltEgammaGsfTracks" )
)
fragment.hltEgammaGsfTrackVars = cms.EDProducer( "EgammaHLTGsfTrackVarProducer",
recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ),
beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ),
upperTrackNrToRemoveCut = cms.int32( 9999 ),
useDefaultValuesForEndcap = cms.bool( False ),
lowerTrackNrToRemoveCut = cms.int32( -1 ),
inputCollection = cms.InputTag( "hltEgammaGsfTracks" )
inputCollection = cms.InputTag( "hltEgammaGsfTracks" ),
recoEcalCandidateProducer = cms.InputTag( "hltEgammaCandidates" ),
beamSpotProducer = cms.InputTag( "hltOnlineBeamSpot" ),
useDefaultValuesForBarrel = cms.bool( False )
)
fragment.hltDiMu5Ele3CaloIdLTrackIdLElectronlegOneOEMinusOneOPFilter = cms.EDFilter( "HLTEgammaGenericFilter",
thrOverE2EE = cms.vdouble( -1.0 ),
Expand Down Expand Up @@ -38605,6 +38611,7 @@
lMinHighEHitTime = cms.double( -9999.0 ),
fillLaserMonitor = cms.bool( True ),
tMinHPDHits = cms.int32( 16 ),
tRBXRecHitR45Cuts = cms.vdouble( 0.0, 1.0, 0.0, -0.2, 0.0, 0.0, 1.0, -0.2 ),
minRecHitE = cms.double( 1.5 ),
pMaxHighEHitTime = cms.double( 5.0 ),
lRBXRecHitR45Cuts = cms.vdouble( 0.0, 1.0, 0.0, -0.5, 0.0, 0.0, 1.0, -0.5 ),
Expand All @@ -38618,12 +38625,13 @@
maxNHF = cms.double( 0.9 ),
minHighHitE = cms.double( 25.0 ),
minR45HitE = cms.double( 5.0 ),
tRBXRecHitR45Cuts = cms.vdouble( 0.0, 1.0, 0.0, -0.2, 0.0, 0.0, 1.0, -0.2 ),
lasermonDigis = cms.InputTag( 'hltHcalDigis','LASERMON' ),
lMinZeros = cms.int32( 10 ),
lMinRBXHits = cms.int32( 999 ),
fillRecHits = cms.bool( True ),
minERatio = cms.double( 50.0 ),
TS4TS5LowerThreshold = cms.vdouble( 100.0, 120.0, 150.0, 200.0, 300.0, 400.0, 500.0 ),
hlMaxRBXEMF = cms.double( 0.01 ),
lMinHPDNoOtherHits = cms.int32( 10 ),
pMinRBXRechitR45EnergyFraction = cms.double( 0.1 ),
hlMaxHPDEMF = cms.double( -9999.0 ),
Expand All @@ -38633,7 +38641,6 @@
laserMonIEtaList = cms.vint32( 0, 0, 0, 0, 0, 0, 0, 0 ),
laserMonIPhiList = cms.vint32( 23, 17, 11, 5, 29, 35, 41, 47 ),
pMinRatio = cms.double( 0.75 ),
tMinLowEHitTime = cms.double( -9999.0 ),
HcalAcceptSeverityLevel = cms.uint32( 9 ),
pMaxRBXEMF = cms.double( 0.02 ),
tMaxRatio = cms.double( 0.92 ),
Expand Down Expand Up @@ -38666,7 +38673,7 @@
tMinHPDNoOtherHits = cms.int32( 9 ),
pMaxHPDEMF = cms.double( 0.02 ),
jetCollName = cms.string( "" ),
hlMaxRBXEMF = cms.double( 0.01 ),
tMinLowEHitTime = cms.double( -9999.0 ),
tMaxHighEHitTime = cms.double( 6.0 ),
pMaxLowEHitTime = cms.double( 6.0 ),
lMinHPDHits = cms.int32( 17 ),
Expand Down Expand Up @@ -55189,6 +55196,7 @@
MinPt = cms.double( 110.0 )
)
fragment.hltL1TPFJetsMatching = cms.EDProducer( "L1TPFJetsMatching",
pt3Min = cms.double( 110.0 ),
matchingR = cms.double( 0.5 ),
pt2Min = cms.double( 35.0 ),
mjjMin = cms.double( 650.0 ),
Expand Down Expand Up @@ -56783,6 +56791,7 @@
MinPt = cms.double( 20.0 )
)
fragment.hltVBFL1TLooseIDPFJetsMatching = cms.EDProducer( "L1TPFJetsMatching",
pt3Min = cms.double( 110.0 ),
matchingR = cms.double( 0.5 ),
pt2Min = cms.double( 40.0 ),
mjjMin = cms.double( 650.0 ),
Expand Down Expand Up @@ -65973,13 +65982,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 @@ -77619,15 +77628,15 @@
)
fragment.hltSiPixelClustersAfterSplittingForRefPP = cms.EDProducer( "JetCoreClusterSplitter",
verbose = cms.bool( False ),
deltaRmax = cms.double( 0.05 ),
chargeFractionMin = cms.double( 2.0 ),
forceXError = cms.double( 100.0 ),
vertices = cms.InputTag( "hltFullIter0PrimaryVerticesPreSplittingForRefPP" ),
chargePerUnit = cms.double( 2000.0 ),
forceYError = cms.double( 150.0 ),
centralMIPCharge = cms.double( 26000.0 ),
forceYError = cms.double( 150.0 ),
pixelClusters = cms.InputTag( "hltSiPixelClustersForRefPP" ),
ptMin = cms.double( 200.0 ),
chargeFractionMin = cms.double( 2.0 ),
deltaRmax = cms.double( 0.05 ),
cores = cms.InputTag( "hltJetsForCoreTracking" ),
fractionalWidth = cms.double( 0.4 ),
pixelCPE = cms.string( "hltESPPixelCPEGeneric" )
Expand Down Expand Up @@ -85913,20 +85922,27 @@
filterTrackEnergy = cms.bool( True )
)
fragment.hltIsolEcalPixelTrackProdHB = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer",
ECHitEnergyThreshold = cms.double( 0.05 ),
filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ),
EEHitEnergyThreshold3 = cms.double( 3.52151 ),
EEHitEnergyThreshold2 = cms.double( -19.0741 ),
EEHitEnergyThreshold1 = cms.double( 34.3975 ),
EEHitEnergyThreshold0 = cms.double( -20.5332 ),
EBHitCountEnergyThreshold = cms.double( 0.5 ),
EBHitEnergyThreshold = cms.double( 0.1 ),
EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ),
ECHitCountEnergyThreshold = cms.double( 0.5 ),
filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHB" ),
EcalConeSizeEta1 = cms.double( 0.14 ),
EcalConeSizeEta0 = cms.double( 0.09 ),
EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ),
EcalConeSizeEta1 = cms.double( 0.14 )
EEFacHitCountEnergyThreshold = cms.double( 10.0 )
)
fragment.hltEcalIsolPixelTrackL2FilterHB = cms.EDFilter( "HLTEcalPixelIsolTrackFilter",
saveTags = cms.bool( True ),
DropMultiL2Event = cms.bool( False ),
MaxEnergyIn = cms.double( 1.2 ),
MaxEnergyOut = cms.double( 1.2 ),
MaxEnergyInEB = cms.double( 2.0 ),
MaxEnergyInEE = cms.double( 2.0 ),
MaxEnergyOutEB = cms.double( 1.2 ),
NMaxTrackCandidates = cms.int32( 10 ),
MaxEnergyOutEE = cms.double( 1.2 ),
candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHB" )
)
fragment.hltHcalITIPTCorrectorHB = cms.EDProducer( "IPTCorrector",
Expand Down Expand Up @@ -85983,20 +85999,27 @@
filterTrackEnergy = cms.bool( True )
)
fragment.hltIsolEcalPixelTrackProdHE = cms.EDProducer( "IsolatedEcalPixelTrackCandidateProducer",
ECHitEnergyThreshold = cms.double( 0.05 ),
filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ),
EEHitEnergyThreshold3 = cms.double( 3.52151 ),
EEHitEnergyThreshold2 = cms.double( -19.0741 ),
EEHitEnergyThreshold1 = cms.double( 34.3975 ),
EEHitEnergyThreshold0 = cms.double( -20.5332 ),
EBHitCountEnergyThreshold = cms.double( 0.5 ),
EBHitEnergyThreshold = cms.double( 0.1 ),
EBRecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEB' ),
ECHitCountEnergyThreshold = cms.double( 0.5 ),
filterLabel = cms.InputTag( "hltIsolPixelTrackL2FilterHE" ),
EcalConeSizeEta1 = cms.double( 0.14 ),
EcalConeSizeEta0 = cms.double( 0.09 ),
EERecHitSource = cms.InputTag( 'hltEcalRecHit','EcalRecHitsEE' ),
EcalConeSizeEta1 = cms.double( 0.14 )
EEFacHitCountEnergyThreshold = cms.double( 10.0 )
)
fragment.hltEcalIsolPixelTrackL2FilterHE = cms.EDFilter( "HLTEcalPixelIsolTrackFilter",
saveTags = cms.bool( True ),
DropMultiL2Event = cms.bool( False ),
MaxEnergyIn = cms.double( 1.2 ),
MaxEnergyOut = cms.double( 1.2 ),
MaxEnergyInEB = cms.double( 2.0 ),
MaxEnergyInEE = cms.double( 2.0 ),
MaxEnergyOutEB = cms.double( 1.2 ),
NMaxTrackCandidates = cms.int32( 10 ),
MaxEnergyOutEE = cms.double( 1.2 ),
candTag = cms.InputTag( "hltIsolEcalPixelTrackProdHE" )
)
fragment.hltHcalITIPTCorrectorHE = cms.EDProducer( "IPTCorrector",
Expand Down Expand Up @@ -100666,13 +100689,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
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_Fake1_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/Fake1 --type Fake1
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/Fake1 --type Fake1

# /dev/CMSSW_10_0_0/Fake1/V7 (CMSSW_10_0_4)
# /dev/CMSSW_10_1_0/Fake1/V2 (CMSSW_10_1_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_0_0/Fake1/V7')
tableName = cms.string('/dev/CMSSW_10_1_0/Fake1/V2')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_Fake2_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/Fake2 --type Fake2
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/Fake2 --type Fake2

# /dev/CMSSW_10_0_0/Fake2/V8 (CMSSW_10_0_4)
# /dev/CMSSW_10_1_0/Fake2/V2 (CMSSW_10_1_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_0_0/Fake2/V8')
tableName = cms.string('/dev/CMSSW_10_1_0/Fake2/V2')
)

fragment.streams = cms.PSet( A = cms.vstring( 'InitialPD' ) )
Expand Down
6 changes: 3 additions & 3 deletions HLTrigger/Configuration/python/HLT_Fake_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# hltGetConfiguration --cff --data /dev/CMSSW_10_0_0/Fake --type Fake
# hltGetConfiguration --cff --data /dev/CMSSW_10_1_0/Fake --type Fake

# /dev/CMSSW_10_0_0/Fake/V7 (CMSSW_10_0_4)
# /dev/CMSSW_10_1_0/Fake/V2 (CMSSW_10_1_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_10_0_0/Fake/V7')
tableName = cms.string('/dev/CMSSW_10_1_0/Fake/V2')
)

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

0 comments on commit 2b38df8

Please sign in to comment.