Cleanup tests and switch to VPRetinaClusters

• Run tests in their own directory (see LHCb!3975 (merged))
• Switch reconstruction to use VPRetinaClusters

Alignment/Humboldt/python/Humboldt/alignment_tracking.py

@@ -8,19 +8,29 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-
-from RecoConf.hlt1_tracking import all_velo_track_types, make_VeloClusterTrackingSIMD_hits, make_PatPV3DFuture_pvs, make_VeloClusterTrackingSIMD
-from PyConf.Algorithms import PrKalmanFilter_Velo, TrackSelectionMerger, VeloClusterTrackingSIMDFull, PatPVLeftRightFinderMerger
+from functools import partial
+from RecoConf.hlt1_tracking import (
+    all_velo_track_types,
+    make_VeloClusterTrackingSIMD_hits,
+    make_VeloClusterTrackingSIMD,
+    make_RetinaDecoder_raw_event,
+    get_global_measurement_provider,
+)
+from PyConf.Algorithms import (
+    PrKalmanFilter_Velo,
+    TrackSelectionMerger,
+    VeloClusterTrackingSIMDFull,
+    PatPVLeftRightFinderMerger,
+    VeloRetinaClusterTrackingSIMDFull,
+    PrKalmanFilter_noUT,
+    PrStoreUTHitEmptyProducer,
+)
 from PyConf.Tools import TrackLinearExtrapolator
 from RecoConf.core_algorithms import make_unique_id_generator
-from functools import partial
 from Humboldt.TrackSelections import VPBackwardTracks, VPGoodTracks
 
-from PyConf.Algorithms import PrStoreUTHitEmptyProducer
-
 
 def make_pvs(inputtracks):
-    from PyConf.Algorithms import PatPVLeftRightFinderMerger
     return PatPVLeftRightFinderMerger(InputTracks=inputtracks).OutputVertices
 
 
@@ -40,7 +50,7 @@ def make_fitted_velotracks(usePrKalman=True,
                            MaxChi2Dof=5,
                            MinNVeloLayers=4):
     with make_VeloClusterTrackingSIMD.bind(
-            algorithm=VeloClusterTrackingSIMDFull):
+            algorithm=VeloRetinaClusterTrackingSIMDFull):
         vp_hits = make_VeloClusterTrackingSIMD_hits()
         velo_tracks = all_velo_track_types()
     backward_velo_tracks = velo_tracks["Pr::backward"]
@@ -77,12 +87,16 @@ def make_fitted_velotracks(usePrKalman=True,
                             ]).OutputLocation
     else:
         from PyConf.Algorithms import TrackEventFitter
-        from PyConf.Tools import TrackMasterFitter, TrackSimpleExtraSelector, TrackMasterExtrapolator, SimplifiedMaterialLocator
-        from RecoConf.hlt1_tracking import get_global_measurement_provider
+        from PyConf.Tools import (
+            TrackMasterFitter,
+            TrackSimpleExtraSelector,
+            TrackMasterExtrapolator,
+        )
         measprovider = get_global_measurement_provider(
             ignoreUT=True,
             ignoreFT=True,
             ignoreMuon=True,
+            velo_hits=make_RetinaDecoder_raw_event,
             ut_hits=make_empty_ut_hit_for_meas_provider)
         #materiallocator = SimplifiedMaterialLocator() this will not work with dd4hep
         extrapolatorselector = TrackSimpleExtraSelector(
@@ -126,13 +140,7 @@ def make_align_vp_input(usePrKalman=True,
 
 def make_align_input_besttracks(usePrKalman=True):
     # it seems that we have little choice but just to set up the entire reco sequence ourselves. the moore stuff is close to impossible to work with.
-    from RecoConf.reconstruction_objects import reconstruction
-    from PyConf.Algorithms import VeloClusterTrackingSIMDFull, PrKalmanFilter_noUT
     # note that the PVs reconstructed by TrackBeamLineVertexFinderSoA do not store the list of associated tracks. Use PatPV3DFuture instead
-    from RecoConf.hlt1_tracking import make_reco_pvs, make_PatPV3DFuture_pvs, make_VeloClusterTrackingSIMD
-    from RecoConf.hlt2_global_reco import make_fastest_reconstruction
-    from RecoConf.hlt2_global_reco import reconstruction as reconstruction_hook
-
     from RecoConf.hlt2_tracking import make_hlt2_tracks_without_UT
     with make_VeloClusterTrackingSIMD.bind(algorithm=VeloClusterTrackingSIMDFull),\
         PrKalmanFilter_noUT.bind(FillFitResult=True,ClassicSmoothing=True):