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

HLT menu development for 12_3_X [12_4_X] #37594

Merged
merged 1 commit into from Apr 16, 2022
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
326 changes: 171 additions & 155 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

314 changes: 165 additions & 149 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/HIon --type HIon

# /dev/CMSSW_12_3_0/HIon/V67 (CMSSW_12_3_0)
# /dev/CMSSW_12_3_0/HIon/V72 (CMSSW_12_3_0)

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/V67')
tableName = cms.string('/dev/CMSSW_12_3_0/HIon/V72')
)

fragment.transferSystem = cms.PSet(
Expand Down
4 changes: 2 additions & 2 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/PIon --type PIon

# /dev/CMSSW_12_3_0/PIon/V67 (CMSSW_12_3_0)
# /dev/CMSSW_12_3_0/PIon/V72 (CMSSW_12_3_0)

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/V67')
tableName = cms.string('/dev/CMSSW_12_3_0/PIon/V72')
)

fragment.transferSystem = cms.PSet(
Expand Down
76 changes: 31 additions & 45 deletions HLTrigger/Configuration/python/HLT_PRef_cff.py
@@ -1,6 +1,6 @@
# hltGetConfiguration --cff --data /dev/CMSSW_12_3_0/PRef --type PRef

# /dev/CMSSW_12_3_0/PRef/V67 (CMSSW_12_3_0)
# /dev/CMSSW_12_3_0/PRef/V72 (CMSSW_12_3_0)

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/V67')
tableName = cms.string('/dev/CMSSW_12_3_0/PRef/V72')
)

fragment.transferSystem = cms.PSet(
Expand Down Expand Up @@ -5611,44 +5611,26 @@
inactiveStripDetectorLabels = cms.VInputTag( 'hltSiStripExcludedFEDListProducer' ),
switchOffPixelsIfEmpty = cms.bool( True )
)
fragment.hltIterL3OISeedsFromL2Muons = cms.EDProducer( "TSGForOIFromL2",
fragment.hltIterL3OISeedsFromL2Muons = cms.EDProducer( "TSGForOIDNN",
src = cms.InputTag( 'hltL2Muons','UpdatedAtVtx' ),
layersToTry = cms.int32( 2 ),
fixedErrorRescaleFactorForHitless = cms.double( 2.0 ),
hitsToTry = cms.int32( 1 ),
adjustErrorsDynamicallyForHits = cms.bool( False ),
adjustErrorsDynamicallyForHitless = cms.bool( True ),
MeasurementTrackerEvent = cms.InputTag( "hltSiStripClusters" ),
UseHitLessSeeds = cms.bool( True ),
estimator = cms.string( "hltESPChi2MeasurementEstimator100" ),
maxEtaForTOB = cms.double( 1.8 ),
minEtaForTEC = cms.double( 0.7 ),
debug = cms.untracked.bool( False ),
fixedErrorRescaleFactorForHits = cms.double( 1.0 ),
maxSeeds = cms.uint32( 20 ),
maxHitlessSeeds = cms.uint32( 5 ),
maxHitSeeds = cms.uint32( 1 ),
numL2ValidHitsCutAllEta = cms.uint32( 20 ),
numL2ValidHitsCutAllEndcap = cms.uint32( 30 ),
pT1 = cms.double( 13.0 ),
pT2 = cms.double( 30.0 ),
pT3 = cms.double( 70.0 ),
eta1 = cms.double( 0.2 ),
eta2 = cms.double( 0.3 ),
eta3 = cms.double( 1.0 ),
eta4 = cms.double( 1.2 ),
eta5 = cms.double( 1.6 ),
eta6 = cms.double( 1.4 ),
eta7 = cms.double( 2.1 ),
SF1 = cms.double( 3.0 ),
SF2 = cms.double( 4.0 ),
SF3 = cms.double( 5.0 ),
SF4 = cms.double( 7.0 ),
SF5 = cms.double( 10.0 ),
SF6 = cms.double( 2.0 ),
tsosDiff1 = cms.double( 0.2 ),
tsosDiff2 = cms.double( 0.02 ),
propagatorName = cms.string( "PropagatorWithMaterialParabolicMf" )
propagatorName = cms.string( "PropagatorWithMaterialParabolicMf" ),
maxHitlessSeedsIP = cms.uint32( 5 ),
maxHitlessSeedsMuS = cms.uint32( 0 ),
maxHitDoubletSeeds = cms.uint32( 0 ),
getStrategyFromDNN = cms.bool( True ),
useRegressor = cms.bool( False ),
dnnMetadataPath = cms.string( "RecoMuon/TrackerSeedGenerator/data/OIseeding/DNNclassifier_Run3_metadata.json" )
)
fragment.hltIterL3OITrackCandidates = cms.EDProducer( "CkfTrackCandidateMaker",
cleanTrajectoryAfterInOut = cms.bool( False ),
Expand Down Expand Up @@ -5916,30 +5898,21 @@
minSumPt2 = cms.double( 0.0 ),
PVcomparer = cms.PSet( refToPSet_ = cms.string( "HLTPSetPvClusterComparerForIT" ) )
)
fragment.hltIterL3MuonPixelTracksTrackingRegions = cms.EDProducer( "MuonTrackingRegionEDProducer",
EtaR_UpperLimit_Par1 = cms.double( 0.25 ),
fragment.hltIterL3MuonPixelTracksTrackingRegions = cms.EDProducer( "MuonTrackingRegionByPtEDProducer",
DeltaR = cms.double( 0.025 ),
beamSpot = cms.InputTag( "hltOnlineBeamSpot" ),
OnDemand = cms.int32( -1 ),
vertexCollection = cms.InputTag( "notUsed" ),
Rescale_phi = cms.double( 3.0 ),
Eta_fixed = cms.bool( True ),
Rescale_eta = cms.double( 3.0 ),
PhiR_UpperLimit_Par2 = cms.double( 0.2 ),
Eta_min = cms.double( 0.0 ),
Phi_fixed = cms.bool( True ),
Phi_min = cms.double( 0.0 ),
PhiR_UpperLimit_Par1 = cms.double( 0.6 ),
EtaR_UpperLimit_Par2 = cms.double( 0.15 ),
MeasurementTrackerName = cms.InputTag( "" ),
UseVertex = cms.bool( False ),
Rescale_Dz = cms.double( 4.0 ),
Pt_fixed = cms.bool( True ),
Z_fixed = cms.bool( True ),
Pt_min = cms.double( 0.0 ),
DeltaZ = cms.double( 24.2 ),
DeltaEta = cms.double( 0.3 ),
DeltaPhi = cms.double( 0.225 ),
ptRanges = cms.vdouble( 0.0, 15.0, 20.0, 1.0E64 ),
deltaEtas = cms.vdouble( 0.2, 0.2, 0.2 ),
deltaPhis = cms.vdouble( 0.75, 0.45, 0.225 ),
maxRegions = cms.int32( 5 ),
precise = cms.bool( True ),
input = cms.InputTag( "hltL2SelectorForL3IO" )
Expand Down Expand Up @@ -6205,9 +6178,17 @@
L1MinQuality = cms.uint32( 7 ),
CentralBxOnly = cms.bool( True )
)
fragment.hltIterL3FromL1MuonPixelTracksTrackingRegions = cms.EDProducer( "CandidateSeededTrackingRegionsEDProducer",
fragment.hltIterL3FromL1MuonPixelTracksTrackingRegions = cms.EDProducer( "L1MuonSeededTrackingRegionsEDProducer",
Propagator = cms.string( "SteppingHelixPropagatorAny" ),
L1MinPt = cms.double( 0.0 ),
L1MaxEta = cms.double( 2.5 ),
L1MinQuality = cms.uint32( 7 ),
SetMinPtBarrelTo = cms.double( 3.5 ),
SetMinPtEndcapTo = cms.double( 1.0 ),
CentralBxOnly = cms.bool( True ),
RegionPSet = cms.PSet(
vertexCollection = cms.InputTag( "notUsed" ),
deltaEtas = cms.vdouble( 0.35, 0.35, 0.35, 0.35 ),
zErrorVetex = cms.double( 0.2 ),
beamSpot = cms.InputTag( "hltOnlineBeamSpot" ),
zErrorBeamSpot = cms.double( 24.2 ),
Expand All @@ -6218,13 +6199,18 @@
ptMin = cms.double( 0.0 ),
mode = cms.string( "BeamSpotSigma" ),
input = cms.InputTag( "hltL1MuonsPt0" ),
ptRanges = cms.vdouble( 0.0, 10.0, 15.0, 20.0, 1.0E64 ),
searchOpt = cms.bool( False ),
deltaPhis = cms.vdouble( 1.0, 0.8, 0.6, 0.3 ),
whereToUseMeasurementTracker = cms.string( "Never" ),
originRadius = cms.double( 0.2 ),
measurementTrackerName = cms.InputTag( "" ),
precise = cms.bool( True ),
deltaEta = cms.double( 0.525 ),
deltaPhi = cms.double( 0.3 )
precise = cms.bool( True )
),
ServiceParameters = cms.PSet(
RPCLayers = cms.bool( True ),
UseMuonNavigation = cms.untracked.bool( True ),
Propagators = cms.untracked.vstring( 'SteppingHelixPropagatorAny' )
)
)
fragment.hltPixelTracksInRegionL1 = cms.EDProducer( "TrackSelectorByRegion",
Expand Down
10 changes: 5 additions & 5 deletions HLTrigger/Configuration/python/HLTrigger_Datasets_GRun_cff.py
Expand Up @@ -780,7 +780,7 @@
streamPhysicsMuons_datasetDoubleMuon_selector.l1tResults = cms.InputTag('')
streamPhysicsMuons_datasetDoubleMuon_selector.throw = cms.bool(False)
streamPhysicsMuons_datasetDoubleMuon_selector.triggerConditions = cms.vstring(
'HLT_DoubleL2Mu10NoVtx_2Cha_PromptL3Mu0Veto_v1',
'HLT_DoubleL2Mu10NoVtx_2Cha_VetoL3Mu0DxyMax1cm_v1',
'HLT_DoubleL2Mu23NoVtx_2Cha_CosmicSeed_NoL2Matched_v2',
'HLT_DoubleL2Mu23NoVtx_2Cha_CosmicSeed_v2',
'HLT_DoubleL2Mu23NoVtx_2Cha_NoL2Matched_v2',
Expand All @@ -794,7 +794,7 @@
'HLT_DoubleL2Mu30NoVtx_2Cha_CosmicSeed_Eta2p4_v2',
'HLT_DoubleL2Mu30NoVtx_2Cha_Eta2p4_v2',
'HLT_DoubleL2Mu50_v2',
'HLT_DoubleL3Mu10NoVtx_Displaced_v1',
'HLT_DoubleL3Mu16_10NoVtx_DxyMin0p01cm_v1',
'HLT_DoubleMu3_DCA_PFMET50_PFMHT60_v10',
'HLT_DoubleMu3_DZ_PFMET50_PFMHT60_v10',
'HLT_DoubleMu3_DZ_PFMET70_PFMHT70_v10',
Expand Down Expand Up @@ -952,6 +952,8 @@
streamPhysicsMuons_datasetSingleMuon_selector.l1tResults = cms.InputTag('')
streamPhysicsMuons_datasetSingleMuon_selector.throw = cms.bool(False)
streamPhysicsMuons_datasetSingleMuon_selector.triggerConditions = cms.vstring(
'HLT_CascadeMu100_v3',
'HLT_HighPtTkMu100_v2',
'HLT_IsoMu20_eta2p1_LooseDeepTauPFTauHPS27_eta2p1_CrossL1_v1',
'HLT_IsoMu20_eta2p1_TightChargedIsoPFTauHPS27_eta2p1_CrossL1_v1',
'HLT_IsoMu20_eta2p1_TightChargedIsoPFTauHPS27_eta2p1_TightID_CrossL1_v1',
Expand Down Expand Up @@ -990,9 +992,7 @@
'HLT_Mu50_IsoVVVL_PFHT450_v15',
'HLT_Mu50_v13',
'HLT_Mu55_v3',
'HLT_Mu8_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT300_PFMETNoMu60_v16',
'HLT_OldMu100_v3',
'HLT_TkMu100_v2'
'HLT_Mu8_TrkIsoVVL_DiPFJet40_DEta3p5_MJJ750_HTT300_PFMETNoMu60_v16'
)


Expand Down
10 changes: 5 additions & 5 deletions HLTrigger/Configuration/tables/GRun.txt
Expand Up @@ -351,9 +351,9 @@ DST_ZeroBias_v* # CMSHLT-1404
HLT_Mu17_Photon30_IsoCaloId_v* # CMSHLT-1409
HLT_Photon90_CaloIdL_PFHT700_v* # CMSHLT-1414
HLT_DoubleL2Mu50_v* # CMSHLT-1416
HLT_L2Mu50_v* # CMSHLT-1416
HLT_OldMu100_v* # CMSHLT-1416
HLT_TkMu100_v* # CMSHLT-1416
HLT_L2Mu50_v* # CMSHLT-1416
HLT_CascadeMu100_v* # CMSHLT-1416, CMSHLT-2277
HLT_HighPtTkMu100_v* # CMSHLT-1416, CMSHLT-2277
HLT_Ele27_Ele37_CaloIdL_MW_v* # CMSHLT-1419
HLT_Mu27_Ele37_CaloIdL_MW_v* # CMSHLT-1419
HLT_Mu37_Ele27_CaloIdL_MW_v* # CMSHLT-1419
Expand Down Expand Up @@ -694,8 +694,8 @@ HLT_AK8PFJet250_SoftDropMass40_PFAK8ParticleNetTauTau0p30_v* # CMSHLT-2253
HLT_AK8PFJet275_SoftDropMass40_PFAK8ParticleNetTauTau0p30_v* # CMSHLT-2253
HLT_DoubleMediumDeepTauIsoPFTauHPS30_L2NN_eta2p1_PFJet60_v* # CMSHLT-2221
HLT_DoublePFJets40_Mass500_MediumDeepTau45_L2NN_MediumDeepTau20_eta2p1_v* # CMSHLT-2224
HLT_DoubleL2Mu10NoVtx_2Cha_PromptL3Mu0Veto_v* # CMSHLT-2211
HLT_DoubleL3Mu10NoVtx_Displaced_v* # CMSHLT-2211
HLT_DoubleL2Mu10NoVtx_2Cha_VetoL3Mu0DxyMax1cm_v* # CMSHLT-2279
HLT_DoubleL3Mu16_10NoVtx_DxyMin0p01cm_v* # CMSHLT-2279
HLT_Mu20NoFiltersNoVtxDisplaced_Photon20_CaloCustomId_v* # CMSHLT-2211
HLT_DoubleMediumChargedIsoDisplacedPFTauHPS32_Trk1_eta2p1_v* # CMSHLT-2211
HLT_HT430_DelayedJet40_DoubleDelay0p5nsTrackless_v* # CMSHLT-2211
Expand Down
10 changes: 5 additions & 5 deletions HLTrigger/Configuration/tables/online_grun.txt
Expand Up @@ -342,9 +342,9 @@ AlCa_LumiPixelsCounts_ZeroBias_v* # CMSHLT-2114
DST_ZeroBias_v* # CMSHLT-1404
HLT_Mu17_Photon30_IsoCaloId_v* # CMSHLT-1409
HLT_DoubleL2Mu50_v* # CMSHLT-1416
HLT_L2Mu50_v* # CMSHLT-1416
HLT_OldMu100_v* # CMSHLT-1416
HLT_TkMu100_v* # CMSHLT-1416
HLT_L2Mu50_v* # CMSHLT-1416
HLT_CascadeMu100_v* # CMSHLT-1416, CMSHLT-2277
HLT_HighPtTkMu100_v* # CMSHLT-1416, CMSHLT-2277
HLT_Ele27_Ele37_CaloIdL_MW_v* # CMSHLT-1419
HLT_Mu27_Ele37_CaloIdL_MW_v* # CMSHLT-1419
HLT_Mu37_Ele27_CaloIdL_MW_v* # CMSHLT-1419
Expand Down Expand Up @@ -675,8 +675,8 @@ HLT_AK8PFJet250_SoftDropMass40_PFAK8ParticleNetTauTau0p30_v* # CMSHLT-2253
HLT_AK8PFJet275_SoftDropMass40_PFAK8ParticleNetTauTau0p30_v* # CMSHLT-2253
HLT_DoubleMediumDeepTauIsoPFTauHPS30_L2NN_eta2p1_PFJet60_v* # CMSHLT-2221
HLT_DoublePFJets40_Mass500_MediumDeepTau45_L2NN_MediumDeepTau20_eta2p1_v* # CMSHLT-2224
HLT_DoubleL2Mu10NoVtx_2Cha_PromptL3Mu0Veto_v* # CMSHLT-2211
HLT_DoubleL3Mu10NoVtx_Displaced_v* # CMSHLT-2211
HLT_DoubleL2Mu10NoVtx_2Cha_VetoL3Mu0DxyMax1cm_v* # CMSHLT-2279
HLT_DoubleL3Mu16_10NoVtx_DxyMin0p01cm_v* # CMSHLT-2279
HLT_Mu20NoFiltersNoVtxDisplaced_Photon20_CaloCustomId_v* # CMSHLT-2211
HLT_DoubleMediumChargedIsoDisplacedPFTauHPS32_Trk1_eta2p1_v* # CMSHLT-2211
HLT_HT430_DelayedJet40_DoubleDelay0p5nsTrackless_v* # CMSHLT-2211
Expand Down