Skip to content

Commit 79fda4b

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#34075 from cms-tsg-storm/HLTmigrationTo1200pre2
HLT menu migration to 12_0_0_pre2
2 parents ee8ff60 + a8e7c5f commit 79fda4b

16 files changed

+410
-284
lines changed

‎HLTrigger/Configuration/python/HLT_FULL_cff.py‎

Lines changed: 47 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/HLT --type FULL
22

3-
# /dev/CMSSW_12_0_0/HLT/V2 (CMSSW_12_0_0_pre1)
3+
# /dev/CMSSW_12_0_0/HLT/V3 (CMSSW_12_0_0_pre2)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99
fragment.HLTConfigVersion = cms.PSet(
10-
tableName = cms.string('/dev/CMSSW_12_0_0/HLT/V2')
10+
tableName = cms.string('/dev/CMSSW_12_0_0/HLT/V3')
1111
)
1212

1313
fragment.transferSystem = cms.PSet(
@@ -6714,13 +6714,13 @@
67146714
useAdaBoost = cms.bool( False )
67156715
)
67166716
fragment.hltCombinedSecondaryVertex = cms.ESProducer( "CombinedSecondaryVertexESProducer",
6717+
charmCut = cms.double( 1.5 ),
67176718
recordLabel = cms.string( "HLT" ),
6718-
categoryVariableName = cms.string( "vertexCategory" ),
67196719
useTrackWeights = cms.bool( True ),
67206720
useCategories = cms.bool( True ),
67216721
pseudoMultiplicityMin = cms.uint32( 2 ),
6722-
correctVertexMass = cms.bool( True ),
6723-
trackSelection = cms.PSet(
6722+
categoryVariableName = cms.string( "vertexCategory" ),
6723+
trackPseudoSelection = cms.PSet(
67246724
maxDistToAxis = cms.double( 0.07 ),
67256725
totalHitsMin = cms.uint32( 0 ),
67266726
ptMin = cms.double( 0.0 ),
@@ -6733,7 +6733,7 @@
67336733
jetDeltaRMax = cms.double( 0.3 ),
67346734
normChi2Max = cms.double( 99999.9 ),
67356735
pixelHitsMin = cms.uint32( 0 ),
6736-
sip2dSigMin = cms.double( -99999.9 ),
6736+
sip2dSigMin = cms.double( 2.0 ),
67376737
sip2dValMin = cms.double( -99999.9 ),
67386738
sip3dSigMin = cms.double( -99999.9 ),
67396739
sip3dValMin = cms.double( -99999.9 )
@@ -6742,12 +6742,12 @@
67426742
'CombinedSVPseudoVertex',
67436743
'CombinedSVNoVertex' ),
67446744
trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ),
6745-
charmCut = cms.double( 1.5 ),
6745+
correctVertexMass = cms.bool( True ),
67466746
vertexFlip = cms.bool( False ),
67476747
minimumTrackWeight = cms.double( 0.5 ),
67486748
pseudoVertexV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.05 ) ),
67496749
trackMultiplicityMin = cms.uint32( 3 ),
6750-
trackPseudoSelection = cms.PSet(
6750+
trackSelection = cms.PSet(
67516751
maxDistToAxis = cms.double( 0.07 ),
67526752
totalHitsMin = cms.uint32( 0 ),
67536753
ptMin = cms.double( 0.0 ),
@@ -6760,7 +6760,7 @@
67606760
jetDeltaRMax = cms.double( 0.3 ),
67616761
normChi2Max = cms.double( 99999.9 ),
67626762
pixelHitsMin = cms.uint32( 0 ),
6763-
sip2dSigMin = cms.double( 2.0 ),
6763+
sip2dSigMin = cms.double( -99999.9 ),
67646764
sip2dValMin = cms.double( -99999.9 ),
67656765
sip3dSigMin = cms.double( -99999.9 ),
67666766
sip3dValMin = cms.double( -99999.9 )
@@ -6770,13 +6770,13 @@
67706770
trackFlip = cms.bool( False )
67716771
)
67726772
fragment.hltCombinedSecondaryVertexV2 = cms.ESProducer( "CombinedSecondaryVertexESProducer",
6773+
charmCut = cms.double( 1.5 ),
67736774
recordLabel = cms.string( "HLT" ),
6774-
categoryVariableName = cms.string( "vertexCategory" ),
67756775
useTrackWeights = cms.bool( True ),
67766776
useCategories = cms.bool( True ),
67776777
pseudoMultiplicityMin = cms.uint32( 2 ),
6778-
correctVertexMass = cms.bool( True ),
6779-
trackSelection = cms.PSet(
6778+
categoryVariableName = cms.string( "vertexCategory" ),
6779+
trackPseudoSelection = cms.PSet(
67806780
max_pT_dRcut = cms.double( 0.1 ),
67816781
b_dR = cms.double( 0.6263 ),
67826782
min_pT = cms.double( 120.0 ),
@@ -6802,18 +6802,18 @@
68026802
jetDeltaRMax = cms.double( 0.3 ),
68036803
pixelHitsMin = cms.uint32( 0 ),
68046804
sip3dSigMin = cms.double( -99999.9 ),
6805-
sip2dSigMin = cms.double( -99999.9 )
6805+
sip2dSigMin = cms.double( 2.0 )
68066806
),
68076807
calibrationRecords = cms.vstring( 'CombinedSVIVFV2RecoVertex',
68086808
'CombinedSVIVFV2PseudoVertex',
68096809
'CombinedSVIVFV2NoVertex' ),
68106810
trackPairV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.03 ) ),
6811-
charmCut = cms.double( 1.5 ),
6811+
correctVertexMass = cms.bool( True ),
68126812
vertexFlip = cms.bool( False ),
68136813
minimumTrackWeight = cms.double( 0.5 ),
68146814
pseudoVertexV0Filter = cms.PSet( k0sMassWindow = cms.double( 0.05 ) ),
68156815
trackMultiplicityMin = cms.uint32( 3 ),
6816-
trackPseudoSelection = cms.PSet(
6816+
trackSelection = cms.PSet(
68176817
max_pT_dRcut = cms.double( 0.1 ),
68186818
b_dR = cms.double( 0.6263 ),
68196819
min_pT = cms.double( 120.0 ),
@@ -6839,7 +6839,7 @@
68396839
jetDeltaRMax = cms.double( 0.3 ),
68406840
pixelHitsMin = cms.uint32( 0 ),
68416841
sip3dSigMin = cms.double( -99999.9 ),
6842-
sip2dSigMin = cms.double( 2.0 )
6842+
sip2dSigMin = cms.double( -99999.9 )
68436843
),
68446844
trackSort = cms.string( "sip2dSig" ),
68456845
SoftLeptonFlip = cms.bool( False ),
@@ -7577,33 +7577,45 @@
75777577
ComponentName = cms.string( "hltESPMuonTransientTrackingRecHitBuilder" )
75787578
)
75797579
fragment.hltESPPixelCPEGeneric = cms.ESProducer( "PixelCPEGenericESProducer",
7580+
xerr_barrel_l1 = cms.vdouble( 0.00115, 0.0012, 8.8E-4 ),
75807581
DoCosmics = cms.bool( False ),
75817582
Upgrade = cms.bool( False ),
7583+
yerr_barrel_l1 = cms.vdouble( 0.00375, 0.0023, 0.0025, 0.0025, 0.0023, 0.0023, 0.0021, 0.0021, 0.0024 ),
75827584
eff_charge_cut_highX = cms.double( 1.0 ),
75837585
eff_charge_cut_highY = cms.double( 1.0 ),
75847586
inflate_all_errors_no_trk_angle = cms.bool( False ),
7587+
xerr_barrel_ln = cms.vdouble( 0.00115, 0.0012, 8.8E-4 ),
75857588
eff_charge_cut_lowY = cms.double( 0.0 ),
75867589
eff_charge_cut_lowX = cms.double( 0.0 ),
7590+
yerr_barrel_l1_def = cms.double( 0.0021 ),
75877591
UseErrorsFromTemplates = cms.bool( True ),
75887592
TruncatePixelCharge = cms.bool( True ),
75897593
size_cutY = cms.double( 3.0 ),
75907594
size_cutX = cms.double( 3.0 ),
75917595
useLAWidthFromDB = cms.bool( False ),
7596+
xerr_barrel_l1_def = cms.double( 0.0103 ),
75927597
inflate_errors = cms.bool( False ),
75937598
lAWidthBPix = cms.double( 0.0 ),
7599+
xerr_endcap_def = cms.double( 0.002 ),
75947600
ClusterProbComputationFlag = cms.int32( 0 ),
7601+
xerr_barrel_ln_def = cms.double( 0.0103 ),
75957602
Alpha2Order = cms.bool( True ),
7603+
yerr_barrel_ln_def = cms.double( 0.0021 ),
75967604
appendToDataLabel = cms.string( "" ),
75977605
useLAFromDB = cms.bool( True ),
7606+
xerr_endcap = cms.vdouble( 0.002, 0.002 ),
75987607
SmallPitch = cms.bool( False ),
75997608
lAWidthFPix = cms.double( 0.0 ),
7609+
yerr_endcap = cms.vdouble( 0.0021 ),
7610+
yerr_barrel_ln = cms.vdouble( 0.00375, 0.0023, 0.0025, 0.0025, 0.0023, 0.0023, 0.0021, 0.0021, 0.0024 ),
76007611
LoadTemplatesFromDB = cms.bool( True ),
76017612
NoTemplateErrorsWhenNoTrkAngles = cms.bool( False ),
76027613
EdgeClusterErrorX = cms.double( 50.0 ),
76037614
EdgeClusterErrorY = cms.double( 85.0 ),
76047615
lAOffset = cms.double( 0.0 ),
76057616
doLorentzFromAlignment = cms.bool( False ),
76067617
ComponentName = cms.string( "hltESPPixelCPEGeneric" ),
7618+
yerr_endcap_def = cms.double( 7.5E-4 ),
76077619
MagneticFieldRecord = cms.ESInputTag( "" ),
76087620
IrradiationBiasCorrection = cms.bool( True )
76097621
)
@@ -9216,9 +9228,19 @@
92169228
maskSource = cms.string( "File" )
92179229
)
92189230
fragment.hltL2OfflineMuonSeeds = cms.EDProducer( "MuonSeedGenerator",
9231+
beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
9232+
crackWindow = cms.double( 0.04 ),
9233+
deltaPhiSearchWindow = cms.double( 0.25 ),
9234+
crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ),
9235+
deltaEtaCrackSearchWindow = cms.double( 0.25 ),
9236+
CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
9237+
scaleDT = cms.bool( True ),
92199238
EnableDTMeasurement = cms.bool( True ),
9220-
EnableCSCMeasurement = cms.bool( True ),
9239+
ME0RecSegmentLabel = cms.InputTag( "me0Segments" ),
9240+
deltaEtaSearchWindow = cms.double( 0.2 ),
92219241
EnableME0Measurement = cms.bool( False ),
9242+
DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ),
9243+
EnableCSCMeasurement = cms.bool( True ),
92229244
SMB_21 = cms.vdouble( 1.043, -0.124, 0.0, 0.183, 0.0, 0.0 ),
92239245
SMB_20 = cms.vdouble( 1.011, -0.052, 0.0, 0.188, 0.0, 0.0 ),
92249246
SMB_22 = cms.vdouble( 1.474, -0.758, 0.0, 0.185, 0.0, 0.0 ),
@@ -9253,11 +9275,9 @@
92539275
SMB_22_0_scale = cms.vdouble( 1.346681, 0.0 ),
92549276
CSC_12_1_scale = cms.vdouble( -6.434242, 0.0 ),
92559277
DT_34 = cms.vdouble( 0.044, 0.004, -0.013, 0.029, 0.003, 0.0 ),
9256-
ME0RecSegmentLabel = cms.InputTag( "me0Segments" ),
92579278
SME_32 = cms.vdouble( -0.901, 1.333, -0.47, 0.41, 0.073, 0.0 ),
92589279
SME_31 = cms.vdouble( -1.594, 1.482, -0.317, 0.487, 0.097, 0.0 ),
92599280
SMB_32_0_scale = cms.vdouble( -3.054156, 0.0 ),
9260-
crackEtas = cms.vdouble( 0.2, 1.6, 1.7 ),
92619281
SME_11_0_scale = cms.vdouble( 1.325085, 0.0 ),
92629282
SMB_20_0_scale = cms.vdouble( 1.486168, 0.0 ),
92639283
DT_13_1_scale = cms.vdouble( -4.520923, 0.0 ),
@@ -9266,25 +9286,19 @@
92669286
DT_23 = cms.vdouble( 0.13, 0.023, -0.057, 0.028, 0.004, 0.0 ),
92679287
DT_24 = cms.vdouble( 0.176, 0.014, -0.051, 0.051, 0.003, 0.0 ),
92689288
SMB_12_0_scale = cms.vdouble( 2.283221, 0.0 ),
9269-
deltaPhiSearchWindow = cms.double( 0.25 ),
92709289
SMB_30_0_scale = cms.vdouble( -3.629838, 0.0 ),
92719290
SME_42 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ),
92729291
SME_41 = cms.vdouble( -0.003, 0.005, 0.005, 0.608, 0.076, 0.0 ),
9273-
deltaEtaSearchWindow = cms.double( 0.2 ),
92749292
CSC_12_2_scale = cms.vdouble( -1.63622, 0.0 ),
92759293
DT_34_1_scale = cms.vdouble( -13.783765, 0.0 ),
92769294
CSC_34_1_scale = cms.vdouble( -11.520507, 0.0 ),
92779295
OL_2213_0_scale = cms.vdouble( -7.239789, 0.0 ),
92789296
CSC_13_2_scale = cms.vdouble( -6.077936, 0.0 ),
92799297
CSC_12_3_scale = cms.vdouble( -1.63622, 0.0 ),
9280-
deltaEtaCrackSearchWindow = cms.double( 0.25 ),
92819298
SME_21_0_scale = cms.vdouble( -0.040862, 0.0 ),
92829299
OL_1232 = cms.vdouble( 0.184, 0.0, 0.0, 0.066, 0.0, 0.0 ),
9283-
DTRecSegmentLabel = cms.InputTag( "hltDt4DSegments" ),
92849300
SMB_10_0_scale = cms.vdouble( 2.448566, 0.0 ),
9285-
CSCRecSegmentLabel = cms.InputTag( "hltCscSegments" ),
92869301
CSC_23_2_scale = cms.vdouble( -6.079917, 0.0 ),
9287-
scaleDT = cms.bool( True ),
92889302
DT_12_2_scale = cms.vdouble( -3.518165, 0.0 ),
92899303
OL_1222 = cms.vdouble( 0.848, -0.591, 0.0, 0.062, 0.0, 0.0 ),
92909304
CSC_23_1_scale = cms.vdouble( -19.084285, 0.0 ),
@@ -9295,15 +9309,13 @@
92959309
DT_23_1_scale = cms.vdouble( -5.320346, 0.0 ),
92969310
SMB_30 = cms.vdouble( 0.505, -0.022, 0.0, 0.215, 0.0, 0.0 ),
92979311
SMB_31 = cms.vdouble( 0.549, -0.145, 0.0, 0.207, 0.0, 0.0 ),
9298-
crackWindow = cms.double( 0.04 ),
92999312
CSC_14_3_scale = cms.vdouble( -1.969563, 0.0 ),
93009313
SMB_31_0_scale = cms.vdouble( -3.323768, 0.0 ),
93019314
DT_12_1_scale = cms.vdouble( -3.692398, 0.0 ),
93029315
SMB_21_0_scale = cms.vdouble( 1.58384, 0.0 ),
93039316
DT_23_2_scale = cms.vdouble( -5.117625, 0.0 ),
93049317
SME_12_0_scale = cms.vdouble( 2.279181, 0.0 ),
93059318
DT_14_1_scale = cms.vdouble( -5.644816, 0.0 ),
9306-
beamSpotTag = cms.InputTag( "hltOnlineBeamSpot" ),
93079319
SMB_11_0_scale = cms.vdouble( 2.56363, 0.0 ),
93089320
CSC_13 = cms.vdouble( 0.901, -1.302, 0.533, 0.045, 0.005, 0.0 ),
93099321
CSC_14 = cms.vdouble( 0.606, -0.181, -0.002, 0.111, -0.003, 0.0 ),
@@ -54988,13 +55000,13 @@
5498855000
minimumTransverseMomentum = cms.double( 1.0 ),
5498955001
primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
5499055002
maximumLongitudinalImpactParameter = cms.double( 17.0 ),
54991-
computeGhostTrack = cms.bool( True ),
55003+
jets = cms.InputTag( "hltPFJetForBtag" ),
5499255004
maxDeltaR = cms.double( 0.4 ),
5499355005
candidates = cms.InputTag( "hltParticleFlow" ),
5499455006
jetDirectionUsingGhostTrack = cms.bool( False ),
5499555007
minimumNumberOfPixelHits = cms.int32( 2 ),
5499655008
jetDirectionUsingTracks = cms.bool( False ),
54997-
jets = cms.InputTag( "hltPFJetForBtag" ),
55009+
computeGhostTrack = cms.bool( True ),
5499855010
useTrackQuality = cms.bool( False ),
5499955011
ghostTrackPriorDeltaR = cms.double( 0.03 ),
5500055012
maximumChiSquared = cms.double( 5.0 ),
@@ -86095,6 +86107,7 @@
8609586107
offset = cms.uint32( 0 )
8609686108
)
8609786109
fragment.hltPAJetsForCoreTracking = cms.EDFilter( "CandPtrSelector",
86110+
filter = cms.bool( False ),
8609886111
src = cms.InputTag( "hltAK4CaloJetsCorrectedIDPassed" ),
8609986112
cut = cms.string( "pt > 100 && abs(eta) < 2.5" )
8610086113
)
@@ -98798,13 +98811,13 @@
9879898811
minimumTransverseMomentum = cms.double( 1.0 ),
9879998812
primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
9880098813
maximumLongitudinalImpactParameter = cms.double( 17.0 ),
98801-
computeGhostTrack = cms.bool( True ),
98814+
jets = cms.InputTag( "hltPFJetForBtagAK8" ),
9880298815
maxDeltaR = cms.double( 0.4 ),
9880398816
candidates = cms.InputTag( "hltParticleFlow" ),
9880498817
jetDirectionUsingGhostTrack = cms.bool( False ),
9880598818
minimumNumberOfPixelHits = cms.int32( 2 ),
9880698819
jetDirectionUsingTracks = cms.bool( False ),
98807-
jets = cms.InputTag( "hltPFJetForBtagAK8" ),
98820+
computeGhostTrack = cms.bool( True ),
9880898821
useTrackQuality = cms.bool( False ),
9880998822
ghostTrackPriorDeltaR = cms.double( 0.03 ),
9881098823
maximumChiSquared = cms.double( 5.0 ),
@@ -99021,13 +99034,13 @@
9902199034
minimumTransverseMomentum = cms.double( 1.0 ),
9902299035
primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
9902399036
maximumLongitudinalImpactParameter = cms.double( 17.0 ),
99024-
computeGhostTrack = cms.bool( True ),
99037+
jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
9902599038
maxDeltaR = cms.double( 0.4 ),
9902699039
candidates = cms.InputTag( "hltParticleFlow" ),
9902799040
jetDirectionUsingGhostTrack = cms.bool( False ),
9902899041
minimumNumberOfPixelHits = cms.int32( 2 ),
9902999042
jetDirectionUsingTracks = cms.bool( False ),
99030-
jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
99043+
computeGhostTrack = cms.bool( True ),
9903199044
useTrackQuality = cms.bool( False ),
9903299045
ghostTrackPriorDeltaR = cms.double( 0.03 ),
9903399046
maximumChiSquared = cms.double( 5.0 ),
@@ -104093,6 +104106,7 @@
104093104106
InputObjects = cms.InputTag( "hltIterL3MuonsPPOnAA" )
104094104107
)
104095104108
fragment.hltJetsForCoreTracking = cms.EDFilter( "CandPtrSelector",
104109+
filter = cms.bool( False ),
104096104110
src = cms.InputTag( "hltPuAK4CaloJetsCorrectedIDPassed" ),
104097104111
cut = cms.string( "pt > 100 && abs(eta) < 2.5" )
104098104112
)

‎HLTrigger/Configuration/python/HLT_Fake1_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake1 --type Fake1
22

3-
# /dev/CMSSW_12_0_0/Fake1/V1 (CMSSW_11_3_0)
3+
# /dev/CMSSW_12_0_0/Fake1/V3 (CMSSW_12_0_0_pre2)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99
fragment.HLTConfigVersion = cms.PSet(
10-
tableName = cms.string('/dev/CMSSW_12_0_0/Fake1/V1')
10+
tableName = cms.string('/dev/CMSSW_12_0_0/Fake1/V3')
1111
)
1212

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

‎HLTrigger/Configuration/python/HLT_Fake2_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake2 --type Fake2
22

3-
# /dev/CMSSW_12_0_0/Fake2/V1 (CMSSW_11_3_0)
3+
# /dev/CMSSW_12_0_0/Fake2/V3 (CMSSW_12_0_0_pre2)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99
fragment.HLTConfigVersion = cms.PSet(
10-
tableName = cms.string('/dev/CMSSW_12_0_0/Fake2/V1')
10+
tableName = cms.string('/dev/CMSSW_12_0_0/Fake2/V3')
1111
)
1212

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

‎HLTrigger/Configuration/python/HLT_Fake_cff.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# hltGetConfiguration --cff --data /dev/CMSSW_12_0_0/Fake --type Fake
22

3-
# /dev/CMSSW_12_0_0/Fake/V1 (CMSSW_11_3_0)
3+
# /dev/CMSSW_12_0_0/Fake/V3 (CMSSW_12_0_0_pre2)
44

55
import FWCore.ParameterSet.Config as cms
66

77
fragment = cms.ProcessFragment( "HLT" )
88

99
fragment.HLTConfigVersion = cms.PSet(
10-
tableName = cms.string('/dev/CMSSW_12_0_0/Fake/V1')
10+
tableName = cms.string('/dev/CMSSW_12_0_0/Fake/V3')
1111
)
1212

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

0 commit comments

Comments
 (0)