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

Tracking hgh beta star 2018 #23238

Merged
merged 6 commits into from
May 23, 2018
Merged
Show file tree
Hide file tree
Changes from 5 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
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Run2_2018_highBetaStar_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018

Run2_2018_highBetaStar = cms.ModifierChain(Run2_2018, highBetaStar_2018)
4 changes: 4 additions & 0 deletions Configuration/Eras/python/Modifier_highBetaStar_2018_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

highBetaStar_2018 = cms.Modifier()

3 changes: 2 additions & 1 deletion Configuration/StandardSequences/python/Eras.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def __init__(self):
'Run2_2017_ppRef',
'Run2_2018',
'Run2_2018_pp_on_AA',
'Run2_2018_highBetaStar',
'Run3',
'Phase2',
'Phase2_timing',
Expand All @@ -43,7 +44,7 @@ def __init__(self):
'phase2_common', 'phase2_tracker',
'phase2_hgcal', 'phase2_muon', 'phase2_timing',
'phase2_timing_layer','phase2_hcal',
'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'trackingPhase2PU140',
'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'trackingPhase2PU140','highBetaStar_2018',
'tracker_apv_vfp30_2016', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X',
'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2',
'hcalHardcodeConditions', 'hcalSkipPacker']
Expand Down
7 changes: 6 additions & 1 deletion RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
)
)
)
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(detachedQuadStepTrackingRegions,RegionPSet = dict(ptMin = 0.05))


# seeding
from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer
Expand All @@ -70,6 +73,8 @@
CAThetaCut = 0.0011,
CAPhiCut = 0,
)
highBetaStar_2018.toModify(detachedQuadStepHitQuadruplets,CAThetaCut = 0.0022,CAPhiCut = 0.1)

from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer_cff import seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer as _seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer
detachedQuadStepSeeds = _seedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer.clone(
seedingHitSets = "detachedQuadStepHitQuadruplets",
Expand Down Expand Up @@ -180,7 +185,7 @@
mva = dict(GBRForestLabel = 'MVASelectorDetachedQuadStep_Phase1'),
qualityCuts = [-0.5,0.0,0.5],
)

highBetaStar_2018.toModify(detachedQuadStep,qualityCuts = [-0.7,0.0,0.5])

# For Phase2PU140
import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
)
)
)
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(detachedTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.05))


# seeding
Expand Down Expand Up @@ -112,6 +114,7 @@
CAPhiCut = 0,
CAHardPtCut = 0.2,
))
highBetaStar_2018.toModify(detachedTripletStepHitTriplets,CAThetaCut = 0.002,CAPhiCut = 0.1,CAHardPtCut = 0)

# QUALITY CUTS DURING TRACK BUILDING
import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff
Expand Down Expand Up @@ -239,6 +242,7 @@
mva = dict(GBRForestLabel = 'MVASelectorDetachedTripletStep_Phase1'),
qualityCuts = [-0.2,0.3,0.8],
))
highBetaStar_2018.toModify(detachedTripletStep,qualityCuts = [-0.5,0.0,0.5])

# For LowPU
import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
Expand Down
11 changes: 9 additions & 2 deletions RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@
)
)
)
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(highPtTripletStepTrackingRegions,RegionPSet = dict(
ptMin = 0.05,
originRadius = 0.2
))


# seeding
Expand Down Expand Up @@ -103,6 +108,7 @@
CAHardPtCut = 0.3,
)
trackingPhase2PU140.toModify(highPtTripletStepHitTriplets,CAThetaCut = 0.003,CAPhiCut = 0.06,CAHardPtCut = 0.5)
highBetaStar_2018.toModify(highPtTripletStepHitTriplets,CAThetaCut = 0.008,CAPhiCut = 0.14,CAHardPtCut = 0)

from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsEDProducer_cff import seedCreatorFromRegionConsecutiveHitsEDProducer as _seedCreatorFromRegionConsecutiveHitsEDProducer
highPtTripletStepSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone(
Expand All @@ -123,6 +129,7 @@

for e in [pp_on_XeXe_2017, pp_on_AA_2018]:
e.toModify(highPtTripletStepTrajectoryFilterBase, minPt=0.7)
highBetaStar_2018.toModify(highPtTripletStepTrajectoryFilterBase, minPt=0.05)

highPtTripletStepTrajectoryFilter = _TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone(
filters = [cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryFilterBase'))]
Expand All @@ -140,7 +147,7 @@
strictSeedExtension = False, # allow inactive
pixelSeedExtension = False,
)

highBetaStar_2018.toModify(highPtTripletStepTrajectoryFilterInOut, minPt=0.05)

import RecoTracker.MeasurementDet.Chi2ChargeMeasurementEstimator_cfi
highPtTripletStepChi2Est = RecoTracker.MeasurementDet.Chi2ChargeMeasurementEstimator_cfi.Chi2ChargeMeasurementEstimator.clone(
Expand Down Expand Up @@ -216,7 +223,7 @@
mva = dict(GBRForestLabel = 'MVASelectorHighPtTripletStep_Phase1'),
qualityCuts = [0.2,0.3,0.4],
)

highBetaStar_2018.toModify(highPtTripletStep,qualityCuts = [-0.2,0.3,0.4])

# For Phase2PU140
import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
Expand Down
11 changes: 11 additions & 0 deletions RecoTracker/IterativeTracking/python/InitialStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
))
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase1.toModify(initialStepTrackingRegions, RegionPSet = dict(ptMin = 0.5))
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(initialStepTrackingRegions,RegionPSet = dict(
ptMin = 0.05,
originRadius = 0.2
))
trackingPhase2PU140.toModify(initialStepTrackingRegions, RegionPSet = dict(ptMin = 0.6,originRadius = 0.03))

# seeding
Expand Down Expand Up @@ -66,7 +71,12 @@
CAThetaCut = 0.0012,
CAPhiCut = 0.2,
)
highBetaStar_2018.toModify(_initialStepCAHitQuadruplets,
CAThetaCut = 0.0024,
CAPhiCut = 0.4
)
initialStepHitQuadruplets = _initialStepCAHitQuadruplets.clone()

trackingPhase1.toModify(initialStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3)

trackingPhase2PU140.toModify(initialStepHitDoublets, layerPairs = [0,1,2]) # layer pairs (0,1), (1,2), (2,3)
Expand Down Expand Up @@ -121,6 +131,7 @@
from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
for e in [pp_on_XeXe_2017, pp_on_AA_2018]:
e.toModify(initialStepTrajectoryFilterBase, minPt=0.6)
highBetaStar_2018.toModify(initialStepTrajectoryFilterBase, minPt = 0.05)

initialStepTrajectoryFilterInOut = initialStepTrajectoryFilterBase.clone(
minimumNumberOfHits = 4,
Expand Down
7 changes: 7 additions & 0 deletions RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
)
)
)
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(lowPtQuadStepTrackingRegions,RegionPSet = dict(
ptMin = 0.05,
originRadius = 0.2,
))

# seeding
from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer
Expand Down Expand Up @@ -65,6 +70,7 @@
CAPhiCut = 0.3,
)
trackingPhase2PU140.toModify(lowPtQuadStepHitQuadruplets,CAThetaCut = 0.0015,CAPhiCut = 0.25)
highBetaStar_2018.toModify(lowPtQuadStepHitQuadruplets,CAThetaCut = 0.0034,CAPhiCut = 0.6)

from RecoTracker.TkSeedGenerator.seedCreatorFromRegionConsecutiveHitsEDProducer_cff import seedCreatorFromRegionConsecutiveHitsEDProducer as _seedCreatorFromRegionConsecutiveHitsEDProducer
lowPtQuadStepSeeds = _seedCreatorFromRegionConsecutiveHitsEDProducer.clone(
Expand Down Expand Up @@ -168,6 +174,7 @@
mva = dict(GBRForestLabel = 'MVASelectorLowPtQuadStep_Phase1'),
qualityCuts = [-0.7,-0.35,-0.15],
)
highBetaStar_2018.toModify(lowPtQuadStep,qualityCuts = [-0.9,-0.35,-0.15])

# For Phase2PU140
import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
Expand Down
8 changes: 8 additions & 0 deletions RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
)
)
)
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(lowPtTripletStepTrackingRegions,RegionPSet = dict(
ptMin = 0.05,
originRadius = 0.2,
))


# seeding
from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer
Expand Down Expand Up @@ -129,6 +135,7 @@
CAThetaCut = 0.002,
CAPhiCut = 0.05,
))
highBetaStar_2018.toModify(lowPtTripletStepHitTriplets,CAThetaCut = 0.004,CAPhiCut = 0.1)



Expand Down Expand Up @@ -256,6 +263,7 @@
mva = dict(GBRForestLabel = 'MVASelectorLowPtTripletStep_Phase1'),
qualityCuts = [-0.4,0.0,0.3],
))
highBetaStar_2018.toModify(lowPtTripletStep,qualityCuts = [-0.7,-0.3,-0.1])
fastSim.toModify(lowPtTripletStep, vertices = "firstStepPrimaryVerticesBeforeMixing")


Expand Down
21 changes: 21 additions & 0 deletions RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,17 @@
],
TEC = dict(clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny')),
)
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(mixedTripletStepSeedLayersA,
layerList = [
'BPix1+BPix2+BPix3',
'BPix1+FPix1_pos+FPix2_pos','BPix1+FPix1_neg+FPix2_neg',
'BPix2+FPix1_pos+FPix2_pos','BPix2+FPix1_neg+FPix2_neg',
'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg',
'BPix1+BPix2+FPix2_pos', 'BPix1+BPix2+FPix2_neg'
]
)


# TrackingRegion
from RecoTracker.TkTrackingRegions.globalTrackingRegionFromBeamSpotFixedZ_cfi import globalTrackingRegionFromBeamSpotFixedZ as _globalTrackingRegionFromBeamSpotFixedZ
Expand All @@ -72,6 +83,11 @@
originRadius = 1.5
))
trackingLowPU.toModify(_mixedTripletStepTrackingRegionsCommon, RegionPSet = dict(originHalfLength = 10.0))
highBetaStar_2018.toModify(_mixedTripletStepTrackingRegionsCommon,RegionPSet = dict(
ptMin = 0.05,
originRadius = 0.2
))

mixedTripletStepTrackingRegionsA = _mixedTripletStepTrackingRegionsCommon.clone()

from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017
Expand Down Expand Up @@ -165,6 +181,7 @@
)
)
)
highBetaStar_2018.toReplacewith(mixedTripletStepTrackingRegionsB, _mixedTripletStepTrackingRegionsCommon.clone())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

toReplacewith -> toReplaceWith


# seeding
mixedTripletStepHitDoubletsB = mixedTripletStepHitDoubletsA.clone(
Expand Down Expand Up @@ -197,6 +214,7 @@
minimumNumberOfHits = 3,
minPt = 0.1
)
highBetaStar_2018.toModify(_mixedTripletStepTrajectoryFilterBase,minPt = 0.05)

mixedTripletStepTrajectoryFilter = _mixedTripletStepTrajectoryFilterBase.clone(
constantValueForLostHitsFractionFilter = 1.4,
Expand All @@ -218,6 +236,7 @@
)
for e in [pp_on_XeXe_2017, pp_on_AA_2018]:
e.toModify(mixedTripletStepPropagator, ptMin=0.4)
highBetaStar_2018.toModify(mixedTripletStepPropagator,ptMin = 0.05)

import TrackingTools.MaterialEffects.OppositeMaterialPropagator_cfi
mixedTripletStepPropagatorOpposite = TrackingTools.MaterialEffects.OppositeMaterialPropagator_cfi.OppositeMaterialPropagator.clone(
Expand All @@ -227,6 +246,7 @@
)
for e in [pp_on_XeXe_2017, pp_on_AA_2018]:
e.toModify(mixedTripletStepPropagatorOpposite, ptMin=0.4)
highBetaStar_2018.toModify(mixedTripletStepPropagatorOpposite,ptMin = 0.05)

import RecoTracker.MeasurementDet.Chi2ChargeMeasurementEstimator_cfi
mixedTripletStepChi2Est = RecoTracker.MeasurementDet.Chi2ChargeMeasurementEstimator_cfi.Chi2ChargeMeasurementEstimator.clone(
Expand Down Expand Up @@ -317,6 +337,7 @@
mva = dict(GBRForestLabel = 'MVASelectorMixedTripletStep_Phase1'),
qualityCuts = [-0.5,0.0,0.5],
))
highBetaStar_2018.toModify(mixedTripletStep,qualityCuts = [-0.7,0.0,0.5])

# For LowPU
import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi
Expand Down
15 changes: 15 additions & 0 deletions RecoTracker/IterativeTracking/python/PixelPairStep_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@
)
trackingPhase1.toModify(pixelPairStepTrackingRegions, RegionPSet=_region_Phase1)
trackingPhase2PU140.toModify(pixelPairStepTrackingRegions, RegionPSet=_region_Phase1)
from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(pixelPairStepTrackingRegions,RegionPSet = dict(
ptMin = 0.05,
originRadius = 0.2,
fixedError = 4.
))
fastSim.toModify(pixelPairStepTrackingRegions, RegionPSet=dict(VertexCollection = "firstStepPrimaryVerticesBeforeMixing"))

# SEEDS
Expand Down Expand Up @@ -155,6 +161,11 @@
),
ignoreSingleFPixPanelModules = True,
)
highBetaStar_2018.toModify(pixelPairStepTrackingRegionsSeedLayersB,RegionPSet = dict(
ptMin = 0.05,
originRadius = 0.2,
))

pixelPairStepHitDoubletsB = pixelPairStepHitDoublets.clone(
seedingLayers = "",
trackingRegions = "",
Expand Down Expand Up @@ -191,6 +202,8 @@
maxLostHitsFraction = 1./10.,
constantValueForLostHitsFractionFilter = 0.701,
))
highBetaStar_2018.toModify(pixelPairStepTrajectoryFilterBase, minPt = 0.05)

import RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi
pixelPairStepTrajectoryFilterShape = RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi.StripSubClusterShapeTrajectoryFilterTIX12.clone()
pixelPairStepTrajectoryFilter = cms.PSet(
Expand Down Expand Up @@ -230,6 +243,7 @@
trackingLowPU.toModify(pixelPairStepChi2Est,
clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny'),
)
highBetaStar_2018.toModify(pixelPairStepChi2Est,MaxChi2 = cms.double(30))

# TRACK BUILDING
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
Expand Down Expand Up @@ -300,6 +314,7 @@
pixelPairStep.src = 'pixelPairStepTracks'
pixelPairStep.mva.GBRForestLabel = 'MVASelectorIter2_13TeV'
pixelPairStep.qualityCuts = [-0.2,0.0,0.3]
highBetaStar_2018.toModify(pixelPairStep,qualityCuts = [-0.95,0.0,0.3])

trackingPhase1.toModify(pixelPairStep, mva=dict(GBRForestLabel = 'MVASelectorPixelPairStep_Phase1'))
fastSim.toModify(pixelPairStep, vertices = "firstStepPrimaryVerticesBeforeMixing")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,18 @@
)
)

from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(offlinePrimaryVertices,
TkFilterParameters = dict(
maxNormalizedChi2 = 80.0,
minPixelLayersWithHits = 1,
minSiliconLayersWithHits = 3,
maxD0Significance = 7.0,
maxEta = 2.5
),
vertexCollections = {
0: dict(chi2cutoff = 4.0, minNdof = -1.1),
1: dict(chi2cutoff = 4.0, minNdof = -2.0),
}
)

14 changes: 14 additions & 0 deletions RecoVertex/PrimaryVertexProducer/python/TkClusParameters_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,20 @@
)
)

from Configuration.Eras.Modifier_highBetaStar_2018_cff import highBetaStar_2018
highBetaStar_2018.toModify(DA_vectParameters,
TkDAClusParameters = dict(
Tmin = 4.0,
Tpurge = 1.0,
Tstop = 1.0,
vertexSize = 0.01,
d0CutOff = 4.,
dzCutOff = 5.,
zmerge = 2.e-2,
uniquetrkweight = 0.9
)
)

DA2D_vectParameters = cms.PSet(
algorithm = cms.string("DA2D_vect"),
TkDAClusParameters = cms.PSet(
Expand Down