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.

Sign up for GitHub

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

Jump to bottom

Use parabolic magnetic field in track final fit and modify min N(hits) condition in track duplicate merge #39578

Merged
merged 4 commits into from
Oct 4, 2022
Merged

Use parabolic magnetic field in track final fit and modify min N(hits) condition in track duplicate merge #39578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8a5ff5
Use parabolic magnetic field and corrsponding propagator in track fit
mmasciov Oct 3, 2022
d975c87
Decrease cut on min number of hits in KFFittingSmoother used for dupl…
mmasciov Oct 3, 2022
b20be59
Use parabolic magnetic field only for main tracking iterations
mmasciov Oct 4, 2022
0a8e500
Avoid redefinition using clone
mmasciov Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@
fastSim.toReplaceWith(detachedQuadStepTrackCandidates,_fastSim_detachedQuadStepTrackCandidates)

# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
detachedQuadStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
detachedQuadStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
AlgorithmName = 'detachedQuadStep',
src = 'detachedQuadStepTrackCandidates',
Fitter = 'FlexibleKFFittingSmoother',
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@


# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
detachedTripletStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
detachedTripletStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
AlgorithmName = 'detachedTripletStep',
src = 'detachedTripletStepTrackCandidates',
Fitter = 'FlexibleKFFittingSmoother'
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@
fastSim.toReplaceWith(highPtTripletStepTrackCandidates,_fastSim_highPtTripletStepTrackCandidates)

# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
highPtTripletStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
highPtTripletStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'highPtTripletStepTrackCandidates',
AlgorithmName = 'highPtTripletStep',
Fitter = 'FlexibleKFFittingSmoother',
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@
))

# fitting
import RecoTracker.TrackProducer.TrackProducer_cfi
initialStepTracksPreSplitting = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
initialStepTracksPreSplitting = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'initialStepTrackCandidatesPreSplitting',
AlgorithmName = 'initialStep',
Fitter = 'FlexibleKFFittingSmoother',
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/InitialStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@


# fitting
import RecoTracker.TrackProducer.TrackProducer_cfi
initialStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
initialStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'initialStepTrackCandidates',
AlgorithmName = 'initialStep',
Fitter = 'FlexibleKFFittingSmoother'
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@
)

# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
jetCoreRegionalStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
jetCoreRegionalStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
AlgorithmName = 'jetCoreRegionalStep',
src = 'jetCoreRegionalStepTrackCandidates',
Fitter = 'FlexibleKFFittingSmoother'
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/LowPtBarrelTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
MinNumberOfHits = 3
)

import RecoTracker.TrackProducer.TrackProducer_cfi
lowPtBarrelTripletStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
lowPtBarrelTripletStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'lowPtBarrelTripletStepTrackCandidates',
AlgorithmName = 'lowPtTripletStep',
Fitter = 'lowPtBarrelTripletStepKFFittingSmoother',
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/LowPtForwardTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
)

# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
lowPtForwardTripletStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
lowPtForwardTripletStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'lowPtForwardTripletStepTrackCandidates',
AlgorithmName = 'lowPtTripletStep'
)
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@
fastSim.toReplaceWith(lowPtQuadStepTrackCandidates,_fastSim_lowPtQuadStepTrackCandidates)

# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
lowPtQuadStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
lowPtQuadStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'lowPtQuadStepTrackCandidates',
AlgorithmName = 'lowPtQuadStep',
Fitter = 'FlexibleKFFittingSmoother',
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@
)

# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
lowPtTripletStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
lowPtTripletStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'lowPtTripletStepTrackCandidates',
AlgorithmName = 'lowPtTripletStep',
Fitter = 'FlexibleKFFittingSmoother'
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@


# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
mixedTripletStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
mixedTripletStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
AlgorithmName = 'mixedTripletStep',
src = 'mixedTripletStepTrackCandidates',
Fitter = 'FlexibleKFFittingSmoother'
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/PixelLessStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,8 @@


# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
pixelLessStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
pixelLessStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'pixelLessStepTrackCandidates',
AlgorithmName = 'pixelLessStep',
Fitter = 'FlexibleKFFittingSmoother'
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/PixelPairStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,8 @@
trackingPhase2PU140.toModify(pixelPairStepTrajectoryCleanerBySharedHits, fractionShared = 0.09)

# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
pixelPairStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
pixelPairStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
AlgorithmName = 'pixelPairStep',
src = 'pixelPairStepTrackCandidates',
Fitter = 'FlexibleKFFittingSmoother'
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/IterativeTracking/python/TobTecStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,8 @@


# TRACK FITTING
import RecoTracker.TrackProducer.TrackProducer_cfi
tobTecStepTracks = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
import RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi
tobTecStepTracks = RecoTracker.TrackProducer.TrackProducerIterativeDefault_cfi.TrackProducer.clone(
src = 'tobTecStepTrackCandidates',
AlgorithmName = 'tobTecStep',
#Fitter = 'tobTecStepFitterSmoother',
Expand Down
8 changes: 8 additions & 0 deletions RecoTracker/TrackProducer/python/TrackProducerIterativeDefault_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import FWCore.ParameterSet.Config as cms
import RecoTracker.TrackProducer.TrackProducer_cfi

TrackProducer = RecoTracker.TrackProducer.TrackProducer_cfi.TrackProducer.clone(
useSimpleMF = cms.bool(True),
SimpleMagneticField = cms.string("ParabolicMf"),
Propagator = cms.string('PropagatorWithMaterialParabolicMf'),
Comment on lines +5 to +7
Copy link
Contributor

Choose a reason for hiding this comment

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

Use safer syntax (for a possible update)

)
2 changes: 1 addition & 1 deletion TrackingTools/TrackFitters/plugins/KFFittingSmootherESProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace {
desc.add<int>("MaxNumberOfOutliers", 3);
desc.add<int>("MinDof", 2);
desc.add<bool>("NoOutliersBeginEnd", false);
desc.add<int>("MinNumberOfHits", 5);
desc.add<int>("MinNumberOfHits", 3);
Copy link
Contributor

Choose a reason for hiding this comment

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

it looks like this is cloned all over the place, like GsfElectronFittingSmoother or KFFittingSmootheForSTA, which all could trigger an increase in fakes (unless the number of hits 5->3 is shadowed by a tighter cut somewhere else).

It would be better to change this only in the iter tracking context.

Copy link
Contributor

Choose a reason for hiding this comment

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

So, a bugfix is quite likely needed now.

Copy link
Contributor

Choose a reason for hiding this comment

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

So, a bugfix is quite likely needed now.

Yes!
Please @slava77 @mmasciov provide that fix
Please @rappoccio wait for that fix before proceeding with building the pre-release!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@slava77, @perrotta, @rappoccio: PR #39611 now only applies this change to RKFittingSmoother, without affecting GsfElectronFittingSmoother or KFFittingSmootheForSTA.

desc.add<int>("MinNumberOfHitsHighEta", 5);
desc.add<double>("HighEtaSwitch", 5.0);
desc.add<bool>("RejectTracks", true);
Expand Down