diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py index f2fb70a4f473b2e2d24f791458ab9c3be797fb69..41e27a5a44074f36df51efd1b09f0a3a7b2b2356 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,6 +1040,7 @@ def make_TrackBestTrackCreator_tracks( FitTracks=fit_tracks, MaxChi2DoF=max_chi2ndof, MaxGhostProb=max_ghost_prob, + MinLongLongDeltaQoP=min_dqop_longlong, ) if fit_tracks: @@ -1197,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 @@ -1249,12 +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=min_dqop_longlong, ).TracksOutContainer fitted_2 = make_PrKalmanFilter_tracks( @@ -1269,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 @@ -1387,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 @@ -1430,12 +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=min_dqop_longlong, ).TracksOutContainer fitted_2 = make_PrKalmanFilter_noUT_tracks( @@ -1451,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( diff --git a/Hlt/RecoConf/python/RecoConf/legacy_rec_hlt1_tracking.py b/Hlt/RecoConf/python/RecoConf/legacy_rec_hlt1_tracking.py index ca80190d572b54eb1f3e40d4338620c1a5930793..1c56e6b34769b7558136e834c93bea9a073dcb90 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