From 26813cc808b4a58a451abdc34ae0eb539f1e6e6e Mon Sep 17 00:00:00 2001 From: Maarten Van Veghel Date: Wed, 29 May 2024 15:08:18 +0200 Subject: [PATCH 1/3] extra clone removal --- Hlt/RecoConf/python/RecoConf/hlt2_tracking.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py index f2fb70a4f47..4e49077d9a6 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py +++ b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py @@ -1039,6 +1039,7 @@ def make_TrackBestTrackCreator_tracks( FitTracks=fit_tracks, MaxChi2DoF=max_chi2ndof, MaxGhostProb=max_ghost_prob, + MinLongLongDeltaQoP=1e-6, ) if fit_tracks: @@ -1255,6 +1256,7 @@ def make_pr_kf_light_reco_best_tracks( name="CloneKiller" + name_2 + "_{hash}", TracksInContainer=second, TracksRefContainer=best_1, + MinLongLongDeltaQoP=1e-6, ).TracksOutContainer fitted_2 = make_PrKalmanFilter_tracks( @@ -1436,6 +1438,7 @@ def make_pr_kf_light_reco_best_tracks_without_UT( name="CloneKiller" + name_2 + "_{hash}", TracksInContainer=second, TracksRefContainer=best_1, + MinLongLongDeltaQoP=1e-6, ).TracksOutContainer fitted_2 = make_PrKalmanFilter_noUT_tracks( -- GitLab From e1698bbb4263dce6652388fa1784633f62cc809d Mon Sep 17 00:00:00 2001 From: Maarten Van Veghel Date: Thu, 30 May 2024 20:59:18 +0200 Subject: [PATCH 2/3] factorize setting --- Hlt/RecoConf/python/RecoConf/hlt2_tracking.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py index 4e49077d9a6..41e27a5a440 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py +++ b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py @@ -993,6 +993,7 @@ def make_TrackBestTrackCreator_tracks( fit_tracks: bool = True, max_chi2ndof: float = 3, max_ghost_prob: float = 99999, + min_dqop_longlong: float = -1., name: str = None, skip_UT: bool = False) -> dict[str, DataHandle]: """Persists best quality tracks, calls track fitters, kills clones and adds neural-net response for fake-track (a.k.a. ghost) rejection. @@ -1039,7 +1040,7 @@ def make_TrackBestTrackCreator_tracks( FitTracks=fit_tracks, MaxChi2DoF=max_chi2ndof, MaxGhostProb=max_ghost_prob, - MinLongLongDeltaQoP=1e-6, + MinLongLongDeltaQoP=min_dqop_longlong, ) if fit_tracks: @@ -1198,6 +1199,7 @@ def make_pr_kf_light_reco_best_tracks( tracks, fast_reco, fit_forward_first=True, + min_dqop_longlong=1e-6, clusters_on_track_tool=get_global_clusters_on_track_tool): """ Preselect forward,match, and downstream tracks @@ -1250,13 +1252,14 @@ def make_pr_kf_light_reco_best_tracks( name="TBTC_" + name_1 + "_{hash}", get_ghost_tools=get_GhostProbabilityTools(track_type='Long'), do_not_refit=True, + min_dqop_longlong=min_dqop_longlong, fit_tracks=False)["Best"] decloned_2 = PrCloneKillerLong( name="CloneKiller" + name_2 + "_{hash}", TracksInContainer=second, TracksRefContainer=best_1, - MinLongLongDeltaQoP=1e-6, + MinLongLongDeltaQoP=min_dqop_longlong, ).TracksOutContainer fitted_2 = make_PrKalmanFilter_tracks( @@ -1271,6 +1274,7 @@ def make_pr_kf_light_reco_best_tracks( name="TBTC" + name_2 + "_{hash}", # FIXME TBTC -> TBTC_ get_ghost_tools=get_GhostProbabilityTools(track_type='Long'), do_not_refit=True, + min_dqop_longlong=min_dqop_longlong, fit_tracks=False)["Best"] best_long = TrackContainersMerger( InputLocations=[best_1, best_2]).OutputLocation @@ -1389,6 +1393,7 @@ def make_pr_kf_light_reco_best_tracks_without_UT( tracks, fast_reco, fit_forward_first=True, + min_dqop_longlong=1e-6, clusters_on_track_tool=get_global_clusters_on_track_tool_no_ut): """ Preselect forward, match, and downstream tracks @@ -1432,13 +1437,14 @@ def make_pr_kf_light_reco_best_tracks_without_UT( track_type='Long', without_UT=True), do_not_refit=True, fit_tracks=False, + min_dqop_longlong=min_dqop_longlong, skip_UT=True)["Best"] decloned_2 = PrCloneKillerLong( name="CloneKiller" + name_2 + "_{hash}", TracksInContainer=second, TracksRefContainer=best_1, - MinLongLongDeltaQoP=1e-6, + MinLongLongDeltaQoP=min_dqop_longlong, ).TracksOutContainer fitted_2 = make_PrKalmanFilter_noUT_tracks( @@ -1454,6 +1460,7 @@ def make_pr_kf_light_reco_best_tracks_without_UT( track_type='Long', without_UT=True), do_not_refit=True, fit_tracks=False, + min_dqop_longlong=min_dqop_longlong, skip_UT=True)["Best"] best_long = TrackContainersMerger( -- GitLab From ad519737a46eb67f8993c4d9c32c7b5f0e1b091d Mon Sep 17 00:00:00 2001 From: Maarten Van Veghel Date: Thu, 30 May 2024 21:00:56 +0200 Subject: [PATCH 3/3] larger seeding window velo pr --- Hlt/RecoConf/python/RecoConf/legacy_rec_hlt1_tracking.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hlt/RecoConf/python/RecoConf/legacy_rec_hlt1_tracking.py b/Hlt/RecoConf/python/RecoConf/legacy_rec_hlt1_tracking.py index ca80190d572..1c56e6b3476 100644 --- a/Hlt/RecoConf/python/RecoConf/legacy_rec_hlt1_tracking.py +++ b/Hlt/RecoConf/python/RecoConf/legacy_rec_hlt1_tracking.py @@ -62,7 +62,8 @@ def make_VeloClusterTrackingSIMD(algorithm=None, MaxScatterSeeding=0.1, MaxScatterForwarding=0.1, MaxScatter3hits=0.02, - SkipForward=1): + SkipForward=1, + SeedingWindow=4): """Simple helper to make sure both, make_VeloClusterTrackingSIMD_tracks and make_VeloClusterTrackingSIMD_hits, access the identically configured version of VeloClusterTrackingSIMD @@ -92,7 +93,8 @@ def make_VeloClusterTrackingSIMD(algorithm=None, MaxScatterSeeding=MaxScatterSeeding, MaxScatterForwarding=MaxScatterForwarding, MaxScatter3hits=MaxScatter3hits, - SkipForward=SkipForward) + SkipForward=SkipForward, + SeedingWindow=SeedingWindow) @configurable -- GitLab