add ForwardTrack using residual scifi hits

Hlt/RecoConf/python/RecoConf/hlt2_tracking.py

@@ -25,7 +25,7 @@ from RecoConf.hlt1_tracking import (
 
 from PyConf.Algorithms import (
     PrForwardTrackingVelo, PrHybridSeeding, PrMatchNN, PrLongLivedTracking,
-    TrackBestTrackCreator, TracksFTConverter,
+    TrackBestTrackCreator, TracksFTConverter, PrResidualSciFiHits,
     LHCb__Converters__Track__v1__fromV2TrackV1Track as FromV2TrackV1Track,
     MakeZipContainer__Track_v2)
 
@@ -54,7 +54,6 @@ def make_PrForwardTrackingVelo_tracks(input_tracks,
         ForwardHitsLocation=make_ft_hits(),
         AddUTHitsToolName=ut_hits_tool()).OutputName
 
-
 @configurable
 def all_hlt2_forward_track_types(
         input_tracks, make_forward_tracks=make_PrForwardTrackingVelo_tracks):
@@ -82,7 +81,6 @@ def all_hlt2_forward_track_types(
         "v2Zip": forward_tracks_v2_zip,
     }
 
-
 @configurable
 def make_PrHybridSeeding_tracks(make_ft_hits=make_PrStoreFTHit_hits):
     """Makes seed tracks with PrHybridSeeding [1]_.
@@ -166,6 +164,26 @@ def get_UpgradeGhostId_tool(velo_hits=make_VPClus_hits,
         VPClusterLocation=velo_hits(), UTClusterLocation=ut_hits())
 
 
+def make_ReduceSciFiHits_fromMatch():
+    """
+    Funtion to remove SciFi hits used by PrMatchNN algorithm ans create a new SciFiHits container for the residual SciFi hits, which are later used as input to `PrForwardTrackingVelo`
+    """
+    hlt1_tracks = make_hlt1_tracks()
+    scifi_tracks = make_PrHybridSeeding_tracks()
+    match_tracks = make_PrMatchNN_tracks(hlt1_tracks["Velo"], scifi_tracks)
+    return PrResidualSciFiHits(
+        TracksLocation=match_tracks["v1"],
+        SciFiHitsLocation=make_PrStoreSciFiHits_hits()).SciFiHitsOutput
+
+@configurable
+def make_ForwardTrack_ReduceSciFiHits(input_tracks):
+    
+    return PrForwardTrackingVelo(
+        InputName=input_tracks["Pr"],
+        ForwardHitsLocation=make_ReduceSciFiHits_fromMatch(),
+        AddUTHitsToolName=get_global_ut_hits_tool()).OutputName
+
+
 def get_default_hlt2_tracks():
     """Function to get default set of tracks reconstructed in HLT2, which are later used as input to `make_TrackBestTrackCreator_tracks`.
 
@@ -174,10 +192,11 @@ def get_default_hlt2_tracks():
     """
     hlt1_tracks = make_hlt1_tracks()
     fitted_hlt1_tracks = make_hlt1_fitted_tracks(hlt1_tracks)
-    hlt2_forward_tracks = all_hlt2_forward_track_types(hlt1_tracks["Velo"])
+    #hlt2_forward_tracks = all_hlt2_forward_track_types(hlt1_tracks["Velo"])
     scifi_tracks = make_PrHybridSeeding_tracks()
     downstream_tracks = make_PrLongLivedTracking_tracks(scifi_tracks)
     match_tracks = make_PrMatchNN_tracks(hlt1_tracks["Velo"], scifi_tracks)
+    hlt2_forward_tracks = all_hlt2_forward_track_types(hlt1_tracks["Velo"], make_forward_tracks=make_ForwardTrack_ReduceSciFiHits)
     return {
         "Velo": hlt1_tracks["Velo"],
         "Upstream": hlt1_tracks["Upstream"],