Skip to content

Commit

Permalink
Merge pull request #37152 from cms-tsg-storm/HLTdevelopment123X
Browse files Browse the repository at this point in the history 
HLT menu development for `12_3_X`
  • Loading branch information
@cmsbuild
cmsbuild committed Mar 7, 2022
2 parents 61464c5 + 6cb4ba7 commit f841373
Show file tree
Hide file tree
Showing 13 changed files with 22,836 additions and 9,567 deletions.
10,308 changes: 6,686 additions & 3,622 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py
View file

Large diffs are not rendered by default.

5,578 changes: 4,496 additions & 1,082 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py
View file

Large diffs are not rendered by default.

49 changes: 41 additions & 8 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
View file
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/HIon --type HIon

# /dev/CMSSW_12_3_0/HIon/V42 (CMSSW_12_3_0_pre5)
# /dev/CMSSW_12_3_0/HIon/V51 (CMSSW_12_3_0_pre5)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V42')
tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V51')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -3956,6 +3956,19 @@
trackQualityClass = cms.string( "any" ),
nthTrack = cms.int32( -1 )
)
fragment.hltESPDisplacedDijethltPromptTrackCountingESProducerShortSig5 = cms.ESProducer( "PromptTrackCountingESProducer",
impactParameterType = cms.int32( 1 ),
minimumImpactParameter = cms.double( -1.0 ),
useSignedImpactParameterSig = cms.bool( False ),
maximumDistanceToJetAxis = cms.double( 999999.0 ),
deltaR = cms.double( -1.0 ),
deltaRmin = cms.double( 0.0 ),
maximumDecayLength = cms.double( 999999.0 ),
maxImpactParameter = cms.double( 0.05 ),
maxImpactParameterSig = cms.double( 5.0 ),
trackQualityClass = cms.string( "any" ),
nthTrack = cms.int32( -1 )
)
fragment.hltESPDisplacedDijethltTrackCounting2D1st = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
Expand All @@ -3976,6 +3989,26 @@
trackQualityClass = cms.string( "any" ),
useVariableJTA = cms.bool( False )
)
fragment.hltESPDisplacedDijethltTrackCounting2D1stLoose = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
a_pT = cms.double( 0.005263 ),
b_pT = cms.double( 0.3684 ),
min_pT = cms.double( 120.0 ),
max_pT = cms.double( 500.0 ),
min_pT_dRcut = cms.double( 0.5 ),
max_pT_dRcut = cms.double( 0.1 ),
max_pT_trackPTcut = cms.double( 3.0 ),
minimumImpactParameter = cms.double( 0.03 ),
useSignedImpactParameterSig = cms.bool( False ),
impactParameterType = cms.int32( 1 ),
maximumDistanceToJetAxis = cms.double( 9999999.0 ),
deltaR = cms.double( -1.0 ),
maximumDecayLength = cms.double( 999999.0 ),
nthTrack = cms.int32( 1 ),
trackQualityClass = cms.string( "any" ),
useVariableJTA = cms.bool( False )
)
fragment.hltESPDisplacedDijethltTrackCounting2D2ndLong = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
Expand Down Expand Up @@ -31046,10 +31079,10 @@
algoPSet = cms.PSet(
EBtimeFitLimits_Upper = cms.double( 1.4 ),
EEtimeFitLimits_Lower = cms.double( 0.2 ),
timealgo = cms.string( "None" ),
timealgo = cms.string( "RatioMethod" ),
EBtimeNconst = cms.double( 28.5 ),
prefitMaxChiSqEE = cms.double( 10.0 ),
outOfTimeThresholdGain12mEB = cms.double( 5.0 ),
outOfTimeThresholdGain12mEB = cms.double( 1000.0 ),
outOfTimeThresholdGain12mEE = cms.double( 1000.0 ),
EEtimeFitParameters = cms.vdouble( -2.390548, 3.553628, -17.62341, 67.67538, -133.213, 140.7432, -75.41106, 16.20277 ),
prefitMaxChiSqEB = cms.double( 25.0 ),
Expand All @@ -31063,15 +31096,15 @@
dynamicPedestalsEE = cms.bool( False ),
selectiveBadSampleCriteriaEE = cms.bool( False ),
outOfTimeThresholdGain61pEE = cms.double( 1000.0 ),
outOfTimeThresholdGain61pEB = cms.double( 5.0 ),
outOfTimeThresholdGain61pEB = cms.double( 1000.0 ),
activeBXs = cms.vint32( -5, -4, -3, -2, -1, 0, 1, 2, 3, 4 ),
doPrefitEB = cms.bool( False ),
addPedestalUncertaintyEE = cms.double( 0.0 ),
addPedestalUncertaintyEB = cms.double( 0.0 ),
gainSwitchUseMaxSampleEB = cms.bool( True ),
EEtimeNconst = cms.double( 31.8 ),
EEamplitudeFitParameters = cms.vdouble( 1.89, 1.4 ),
outOfTimeThresholdGain12pEB = cms.double( 5.0 ),
outOfTimeThresholdGain12pEB = cms.double( 1000.0 ),
gainSwitchUseMaxSampleEE = cms.bool( False ),
mitigateBadSamplesEB = cms.bool( False ),
outOfTimeThresholdGain12pEE = cms.double( 1000.0 ),
Expand All @@ -31084,7 +31117,7 @@
outOfTimeThresholdGain61mEE = cms.double( 1000.0 ),
EEtimeConstantTerm = cms.double( 1.0 ),
EBtimeConstantTerm = cms.double( 0.6 ),
outOfTimeThresholdGain61mEB = cms.double( 5.0 )
outOfTimeThresholdGain61mEB = cms.double( 1000.0 )
)
),
)
Expand Down Expand Up @@ -31154,7 +31187,7 @@
EELaserMAX = cms.double( 8.0 ),
logWarningEtThreshold_EB_FE = cms.double( 50.0 ),
recoverEEIsolatedChannels = cms.bool( False ),
skipTimeCalib = cms.bool( True )
skipTimeCalib = cms.bool( False )
),
)
fragment.hltHbhereco = SwitchProducerCUDA(
Expand Down
37 changes: 35 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
View file
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/PIon --type PIon

# /dev/CMSSW_12_3_0/PIon/V42 (CMSSW_12_3_0_pre5)
# /dev/CMSSW_12_3_0/PIon/V51 (CMSSW_12_3_0_pre5)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V42')
tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V51')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -3428,6 +3428,19 @@
trackQualityClass = cms.string( "any" ),
nthTrack = cms.int32( -1 )
)
fragment.hltESPDisplacedDijethltPromptTrackCountingESProducerShortSig5 = cms.ESProducer( "PromptTrackCountingESProducer",
impactParameterType = cms.int32( 1 ),
minimumImpactParameter = cms.double( -1.0 ),
useSignedImpactParameterSig = cms.bool( False ),
maximumDistanceToJetAxis = cms.double( 999999.0 ),
deltaR = cms.double( -1.0 ),
deltaRmin = cms.double( 0.0 ),
maximumDecayLength = cms.double( 999999.0 ),
maxImpactParameter = cms.double( 0.05 ),
maxImpactParameterSig = cms.double( 5.0 ),
trackQualityClass = cms.string( "any" ),
nthTrack = cms.int32( -1 )
)
fragment.hltESPDisplacedDijethltTrackCounting2D1st = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
Expand All @@ -3448,6 +3461,26 @@
trackQualityClass = cms.string( "any" ),
useVariableJTA = cms.bool( False )
)
fragment.hltESPDisplacedDijethltTrackCounting2D1stLoose = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
a_pT = cms.double( 0.005263 ),
b_pT = cms.double( 0.3684 ),
min_pT = cms.double( 120.0 ),
max_pT = cms.double( 500.0 ),
min_pT_dRcut = cms.double( 0.5 ),
max_pT_dRcut = cms.double( 0.1 ),
max_pT_trackPTcut = cms.double( 3.0 ),
minimumImpactParameter = cms.double( 0.03 ),
useSignedImpactParameterSig = cms.bool( False ),
impactParameterType = cms.int32( 1 ),
maximumDistanceToJetAxis = cms.double( 9999999.0 ),
deltaR = cms.double( -1.0 ),
maximumDecayLength = cms.double( 999999.0 ),
nthTrack = cms.int32( 1 ),
trackQualityClass = cms.string( "any" ),
useVariableJTA = cms.bool( False )
)
fragment.hltESPDisplacedDijethltTrackCounting2D2ndLong = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
Expand Down
49 changes: 41 additions & 8 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
View file
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/PRef --type PRef

# /dev/CMSSW_12_3_0/PRef/V42 (CMSSW_12_3_0_pre5)
# /dev/CMSSW_12_3_0/PRef/V51 (CMSSW_12_3_0_pre5)

import FWCore.ParameterSet.Config as cms

Expand All @@ -9,7 +9,7 @@
fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V42')
tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V51')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -3506,6 +3506,19 @@
trackQualityClass = cms.string( "any" ),
nthTrack = cms.int32( -1 )
)
fragment.hltESPDisplacedDijethltPromptTrackCountingESProducerShortSig5 = cms.ESProducer( "PromptTrackCountingESProducer",
impactParameterType = cms.int32( 1 ),
minimumImpactParameter = cms.double( -1.0 ),
useSignedImpactParameterSig = cms.bool( False ),
maximumDistanceToJetAxis = cms.double( 999999.0 ),
deltaR = cms.double( -1.0 ),
deltaRmin = cms.double( 0.0 ),
maximumDecayLength = cms.double( 999999.0 ),
maxImpactParameter = cms.double( 0.05 ),
maxImpactParameterSig = cms.double( 5.0 ),
trackQualityClass = cms.string( "any" ),
nthTrack = cms.int32( -1 )
)
fragment.hltESPDisplacedDijethltTrackCounting2D1st = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
Expand All @@ -3526,6 +3539,26 @@
trackQualityClass = cms.string( "any" ),
useVariableJTA = cms.bool( False )
)
fragment.hltESPDisplacedDijethltTrackCounting2D1stLoose = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
a_pT = cms.double( 0.005263 ),
b_pT = cms.double( 0.3684 ),
min_pT = cms.double( 120.0 ),
max_pT = cms.double( 500.0 ),
min_pT_dRcut = cms.double( 0.5 ),
max_pT_dRcut = cms.double( 0.1 ),
max_pT_trackPTcut = cms.double( 3.0 ),
minimumImpactParameter = cms.double( 0.03 ),
useSignedImpactParameterSig = cms.bool( False ),
impactParameterType = cms.int32( 1 ),
maximumDistanceToJetAxis = cms.double( 9999999.0 ),
deltaR = cms.double( -1.0 ),
maximumDecayLength = cms.double( 999999.0 ),
nthTrack = cms.int32( 1 ),
trackQualityClass = cms.string( "any" ),
useVariableJTA = cms.bool( False )
)
fragment.hltESPDisplacedDijethltTrackCounting2D2ndLong = cms.ESProducer( "TrackCountingESProducer",
a_dR = cms.double( -0.001053 ),
b_dR = cms.double( 0.6263 ),
Expand Down Expand Up @@ -7905,10 +7938,10 @@
algoPSet = cms.PSet(
EBtimeFitLimits_Upper = cms.double( 1.4 ),
EEtimeFitLimits_Lower = cms.double( 0.2 ),
timealgo = cms.string( "None" ),
timealgo = cms.string( "RatioMethod" ),
EBtimeNconst = cms.double( 28.5 ),
prefitMaxChiSqEE = cms.double( 10.0 ),
outOfTimeThresholdGain12mEB = cms.double( 5.0 ),
outOfTimeThresholdGain12mEB = cms.double( 1000.0 ),
outOfTimeThresholdGain12mEE = cms.double( 1000.0 ),
EEtimeFitParameters = cms.vdouble( -2.390548, 3.553628, -17.62341, 67.67538, -133.213, 140.7432, -75.41106, 16.20277 ),
prefitMaxChiSqEB = cms.double( 25.0 ),
Expand All @@ -7922,15 +7955,15 @@
dynamicPedestalsEE = cms.bool( False ),
selectiveBadSampleCriteriaEE = cms.bool( False ),
outOfTimeThresholdGain61pEE = cms.double( 1000.0 ),
outOfTimeThresholdGain61pEB = cms.double( 5.0 ),
outOfTimeThresholdGain61pEB = cms.double( 1000.0 ),
activeBXs = cms.vint32( -5, -4, -3, -2, -1, 0, 1, 2, 3, 4 ),
doPrefitEB = cms.bool( False ),
addPedestalUncertaintyEE = cms.double( 0.0 ),
addPedestalUncertaintyEB = cms.double( 0.0 ),
gainSwitchUseMaxSampleEB = cms.bool( True ),
EEtimeNconst = cms.double( 31.8 ),
EEamplitudeFitParameters = cms.vdouble( 1.89, 1.4 ),
outOfTimeThresholdGain12pEB = cms.double( 5.0 ),
outOfTimeThresholdGain12pEB = cms.double( 1000.0 ),
gainSwitchUseMaxSampleEE = cms.bool( False ),
mitigateBadSamplesEB = cms.bool( False ),
outOfTimeThresholdGain12pEE = cms.double( 1000.0 ),
Expand All @@ -7943,7 +7976,7 @@
outOfTimeThresholdGain61mEE = cms.double( 1000.0 ),
EEtimeConstantTerm = cms.double( 1.0 ),
EBtimeConstantTerm = cms.double( 0.6 ),
outOfTimeThresholdGain61mEB = cms.double( 5.0 )
outOfTimeThresholdGain61mEB = cms.double( 1000.0 )
)
),
)
Expand Down Expand Up @@ -8013,7 +8046,7 @@
EELaserMAX = cms.double( 8.0 ),
logWarningEtThreshold_EB_FE = cms.double( 50.0 ),
recoverEEIsolatedChannels = cms.bool( False ),
skipTimeCalib = cms.bool( True )
skipTimeCalib = cms.bool( False )
),
)
fragment.hltHbhereco = SwitchProducerCUDA(
Expand Down

0 comments on commit f841373

Please sign in to comment.