Merge branch 'mstahl_rebase_fail' into 'master'

Remove leftover from failed attempt to rebase

See merge request lhcb/Moore!278

Hlt/RecoConf/python/RecoConf/hlt2_tracking.py

@@ -166,40 +166,6 @@ def get_UpgradeGhostId_tool(velo_hits=make_VPClus_hits,
         VPClusterLocation=velo_hits(), UTClusterLocation=ut_hits())
 
 
-def make_TrackBestTrackCreator_tracks(velo_tracks,
-                                      upstream_tracks,
-                                      hlt2_forward_tracks,
-                                      hlt1_forward_tracks,
-                                      scifi_tracks,
-                                      downstream_tracks,
-                                      match_tracks,
-                                      get_fitter_tool=get_track_master_fitter):
-    """Persists best quality tracks, calls track fitters and kills clones.
-
-    Args:
-        velo_tracks (DataHandle): velo tracks, e.g. from `all_velo_track_types <RecoConf.hlt1_tracking.all_velo_track_types>` ``["v1"]``.
-        upstream_tracks (DataHandle): upstream tracks, e.g. from `all_upstream_track_types <RecoConf.hlt1_tracking.all_upstream_track_types>` ``["v1"]``.
-        hlt2_forward_tracks (DataHandle): HLT2 forward tracks, e.g. from `all_hlt2_forward_track_types` ``["v1"]``.
-        hlt1_forward_tracks (DataHandle): HLT1 forward tracks, e.g. from `make_hlt1_fitted_tracks` ``["v1"]``.
-        scifi_tracks (DataHandle): SciFi seeding tracks, e.g. from `make_PrHybridSeeding_tracks` ``["v1"]``.
-        downstream_tracks (DataHandle): downstream tracks, e.g. from `make_PrLongLivedTracking_tracks` ``["v1"]``.
-        match_tracks (DataHandle): long tracks from matching, e.g. from `make_PrMatchNN_tracks` ``["v1"]``.
-        get_fitter_tool: instance of track fitting tool, defaults to `get_track_master_fitter <RecoConf.hlt1_tracking.get_track_master_fitter>`.
-
-    Returns:
-        DataHandle: TrackBestTrackCreator's TracksOutContainer
-
-    Note:
-        TrackBestTrackCreator's defaults have been overridden in this maker with ``InitTrackStates=False, DoNotRefit=False, FitTracks=True``
-
-    """
-    #TODO: the list has a random order, pls fix
-    tracklists = [
-        velo_tracks, hlt2_forward_tracks, hlt1_forward_tracks, upstream_tracks,
-        downstream_tracks, match_tracks, scifi_tracks
-    ]
-
-
 @configurable
 def make_TrackBestTrackCreator_tracks(track_list,
                                       get_fitter_tool=get_track_master_fitter,