diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py index a45d3b4f3adf6d8acd48444ba4553e9f99298674..592a9fe5c9a9c47646a5f1f077b6c0b49e23b064 100644 --- a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py +++ b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py @@ -1017,7 +1017,8 @@ def make_pr_kf_light_reco_best_tracks(tracks, """ from PyConf.Algorithms import (PrCloneKillerLong, PrCloneKillerDown, - PrCloneKillerUp) + PrCloneKillerUp, PrCloneKillerSeed, + PrCloneKillerSeedDown) vp_hits = make_VeloClusterTrackingSIMD_hits() ut_hits = make_PrStorePrUTHits_hits() @@ -1092,9 +1093,19 @@ def make_pr_kf_light_reco_best_tracks(tracks, name="TBTC_down_{hash}", do_not_refit=True, fit_tracks=False)["Best"] - best_seed = kill_clones( - inputTracks=tracks["Seed"]["v1"], - referenceTracks=[best_long, best_down]) + + best_seed_vs_long = PrCloneKillerSeed( + TracksInContainer=tracks["Seed"]["Pr"], + TracksRefContainer=best_long, + ).TracksOutContainer + + best_seed_pr = PrCloneKillerSeedDown( + TracksInContainer=best_seed_vs_long, + TracksRefContainer=best_down, + ).TracksOutContainer + + best_seed = fromPrSeedingTracksV1Tracks( + InputTracksLocation=best_seed_pr).OutputTracksLocation declonned_up = PrCloneKillerUp( TracksInContainer=tracks['Upstream']['Pr'], @@ -1161,7 +1172,7 @@ def make_pr_kf_light_reco_best_tracks_without_UT(tracks, DataHandles: BestLong """ - from PyConf.Algorithms import PrCloneKillerLong + from PyConf.Algorithms import (PrCloneKillerLong, PrCloneKillerSeed) vp_hits = make_VeloClusterTrackingSIMD_hits() ft_hits = make_PrStoreSciFiHits_hits() @@ -1217,9 +1228,14 @@ def make_pr_kf_light_reco_best_tracks_without_UT(tracks, best_long = TrackContainersMerger( InputLocations=[best_1, best_2]).OutputLocation - decloned_seed = kill_clones( - inputTracks=tracks["Seed"]["v1"], referenceTracks=[best_long]) + decloned_seed_pr = PrCloneKillerSeed( + TracksInContainer=tracks["Seed"]["Pr"], + TracksRefContainer=best_long, + ).TracksOutContainer + decloned_seed = fromPrSeedingTracksV1Tracks( + InputTracksLocation=decloned_seed_pr).OutputTracksLocation + # these are used by the monitoring seed_fitted = make_PrKalmanFilter_Seed_tracks( input_tracks=tracks['Seed']['Pr'], hits_ft=ft_hits)