Revert !1772 (Tests for GaudiAllen)

This reverts commit db0b8a47, reversing changes made to 5dd84126.

There was some interference between Allen!991 (merged) and Allen!956 (merged) which caused some tests to fail: https://lhcb-nightlies.web.cern.ch/nightly/lhcb-master-mr/5792/

Hlt/RecoConf/options/allen_gaudi_forward.py

@@ -8,21 +8,28 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PyConf.Algorithms import VPRetinaFullClustering
 from Moore.config import Reconstruction
 from Moore.config import run_allen_reconstruction
 from Moore import options
-from RecoConf.hlt1_allen import make_allen_forward_tracks
-from RecoConf.hlt1_tracking import make_velo_full_clusters
-from RecoConf.event_filters import require_gec
-from RecoConf.mc_checking import (
-    check_tracking_efficiency, make_links_tracks_mcparticles,
-    make_links_lhcbids_mcparticles_tracking_system)
-from RecoConf.mc_checking_categories import (get_mc_categories,
-                                             get_hit_type_mask)
+
+
+def make_allen_forward_tracks():
+    from PyConf.Algorithms import (
+        LHCb__Converters__Track__v1__fromV2TrackV1Track as FromV2TrackV1Track)
+    import RecoConf.hlt1_allen
+
+    default_tracks = RecoConf.hlt1_allen.make_allen_forward_tracks()
+
+    forward_tracks_v1 = FromV2TrackV1Track(
+        InputTracksName=default_tracks['v2']).OutputTracksName
+
+    return {'v2': default_tracks['v2'], 'v1': forward_tracks_v1}
 
 
 def make_reconstruction():
+    from RecoConf.event_filters import require_gec
+    from RecoConf.mc_checking import check_tracking_efficiency, make_links_tracks_mcparticles, make_links_lhcbids_mcparticles_tracking_system
+    from RecoConf.mc_checking_categories import get_mc_categories, get_hit_type_mask
 
     forward_tracks = make_allen_forward_tracks()
 
@@ -31,14 +38,14 @@ def make_reconstruction():
 
     # build the PrChecker algorihm for forward track
     links_to_forward_tracks = make_links_tracks_mcparticles(
-        InputTracks=forward_tracks["v1keyed"], LinksToLHCbIDs=links_to_lhcbids)
+        InputTracks=forward_tracks, LinksToLHCbIDs=links_to_lhcbids)
 
     pr_checker_for_forward_track = check_tracking_efficiency(
         TrackType="Forward",
-        InputTracks=forward_tracks["v1keyed"],
+        InputTracks=forward_tracks,
         LinksToTracks=links_to_forward_tracks,
         LinksToLHCbIDs=links_to_lhcbids,
-        MCCategories=get_mc_categories("BestLong"),
+        MCCategories=get_mc_categories("MuonMatch"),
         HitTypesToCheck=get_hit_type_mask("BestLong"),
     )
 
@@ -46,8 +53,18 @@ def make_reconstruction():
                           [require_gec()])
 
 
+options.set_input_from_testfiledb('upgrade_DC19_01_MinBiasMD')
+options.set_conds_from_testfiledb('upgrade_DC19_01_MinBiasMD')
+
 options.evt_max = 100
+from RecoConf.decoders import default_ft_decoding_version
+default_ft_decoding_version.global_bind(value=6)
+
+from PyConf.application import configure_input
+config = configure_input(options)
+
 options.histo_file = "Hlt1ForwardTrackingResolutionAllen.root"
 
-with make_velo_full_clusters.bind(make_full_cluster=VPRetinaFullClustering):
+from AllenConf.velo_reconstruction import decode_velo
+with decode_velo.bind(retina_decoding=False):
     run_allen_reconstruction(options, make_reconstruction)