Merge branch 'decianm-fixHlt2PPThorData2022Test' into 'master'

Fix pp thor data 2022 test

See merge request !2455

Hlt/Hlt2Conf/options/hlt2_pp_thor_data_2022.py

@@ -22,6 +22,7 @@ from RecoConf.hlt2_tracking import (
     make_PrKalmanFilter_Velo_tracks, make_TrackBestTrackCreator_tracks,
     get_UpgradeGhostId_tool_no_UT)
 from PyConf.Algorithms import VeloRetinaClusterTrackingSIMD, VPRetinaFullClusterDecoder
+from PyConf.Tools import TrackMasterFitter
 from RecoConf.hlt1_tracking import (
     make_VeloClusterTrackingSIMD, make_RetinaClusters,
     get_global_measurement_provider, make_velo_full_clusters)
@@ -47,7 +48,8 @@ def remove_lines(lines_dict, pattern_to_remove):
 # The latter is not supported in DD4HEP and leads to crashes, see https://gitlab.cern.ch/lhcb/Rec/-/issues/429.
 to_remove = [
     "Hlt2TrackEff_DiMuon_MuonUT.*", "Hlt2TrackEff_DiMuon_Downstream.*",
-    "Hlt2TrackEff_DiMuon_VeloMuon.*", "Hlt2TrackEff_DiMuon_SeedMuon.*"
+    "Hlt2QEE_TrackEff_ZToMuMu_Downstream.*",
+    "Hlt2QEE_TrackEff_ZToMuMu_UTMuon.*"
 ]
 
 
@@ -60,6 +62,9 @@ def make_lines():
     return [builder() for builder in trunc_lines.values()]
 
 
+make_velo_full_clusters.global_bind(
+    make_full_cluster=VPRetinaFullClusterDecoder)
+
 # Note the following lines are commented out as the DD4HEP build would automatically change to the detailed geometry (11/2022)
 # from RecoConf.global_tools import stateProvider_with_simplified_geom, trackMasterExtrapolator_with_simplified_geom
 # public_tools = [
@@ -78,7 +83,7 @@ with reconstruction.bind(from_file=False),\
      make_PrKalmanFilter_Seed_tracks.bind(max_chi2ndof=8.0),\
      make_VeloClusterTrackingSIMD.bind(algorithm=VeloRetinaClusterTrackingSIMD),\
      get_UpgradeGhostId_tool_no_UT.bind(velo_hits=make_RetinaClusters),\
-     make_velo_full_clusters.bind(make_full_cluster=VPRetinaFullClusterDecoder),\
      get_global_measurement_provider.bind(velo_hits=make_RetinaClusters),\
+     TrackMasterFitter.bind(FastMaterialApproximation=True),\
      hlt2_reconstruction.bind(make_reconstruction=make_light_reco_pr_kf_without_UT):
     config = run_moore(options, make_lines, public_tools)