From 3a7ab3aad34b1d83173b0a8946c5e104aeff6894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20G=C3=BCnther?= <p.gunther@cern.ch>
Date: Fri, 27 Oct 2023 13:14:01 +0200
Subject: [PATCH] Replace TrackCloneKiller with PrCloneKiller in light reco
 sequences

---
 Hlt/RecoConf/python/RecoConf/hlt2_tracking.py | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py b/Hlt/RecoConf/python/RecoConf/hlt2_tracking.py
index a45d3b4f3ad..592a9fe5c9a 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)
 
-- 
GitLab