Merge branch 'decianm-unifiyVeloTrackingConfiguration' into 'master'

Changes for unified configuration of VeloClusterTrackingSIMD

Closes Rec#299

See merge request !1432

Hlt/RecoConf/python/RecoConf/hlt1_tracking.py

@@ -93,8 +93,18 @@ def require_gec(make_raw=default_raw_banks, cut=-1, **kwargs):
 
 
 @configurable
-def make_VeloClusterTrackingSIMD_hits(make_raw=default_raw_event,
-                                      make_tracks=VeloClusterTrackingSIMD):
+def make_VeloClusterTrackingSIMD(algorithm=VeloClusterTrackingSIMD,
+                                 raw_event=default_raw_event):
+    """
+    Simple helper to make sure both, make_VeloClusterTrackingSIMD_tracks and make_VeloClusterTrackingSIMD_hits,
+    access the identically configured version of VeloClusterTrackingSIMD
+    """
+    return algorithm(RawEventLocation=raw_event(["VP"]))
+
+
+@configurable
+def make_VeloClusterTrackingSIMD_hits(
+        make_tracks=make_VeloClusterTrackingSIMD):
     """Makes velo hits with VeloClusterTrackingSIMD
 
        Args:
@@ -103,7 +113,7 @@ def make_VeloClusterTrackingSIMD_hits(make_raw=default_raw_event,
        Returns:
            DataHandle: VeloClusterTrackingSIMD's HitsLocation.
     """
-    return make_tracks(RawEventLocation=make_raw(["VP"])).HitsLocation
+    return make_tracks().HitsLocation
 
 
 def make_VPClus_location_and_offsets(make_raw=default_raw_event):
@@ -173,8 +183,8 @@ def make_RetinaDecoder_raw_event(detector=["VP"], make_raw=default_raw_event):
 
 
 @configurable
-def make_VeloClusterTrackingSIMD_tracks(make_raw=default_raw_event,
-                                        make_tracks=VeloClusterTrackingSIMD):
+def make_VeloClusterTrackingSIMD_tracks(
+        make_tracks=make_VeloClusterTrackingSIMD):
     """Makes velo tracks with VeloClusterTrackingSIMD.
 
        Args:
@@ -183,7 +193,7 @@ def make_VeloClusterTrackingSIMD_tracks(make_raw=default_raw_event,
        Returns:
            A dict mapping forward-, backward-going and v2 velo tracks to ``'Pr'``, ``'Pr::backward'`` and ``'v2'`` respectively.
     """
-    tracking = make_tracks(RawEventLocation=make_raw(["VP"]))
+    tracking = make_tracks()
     forward_going_tracks = tracking.TracksLocation
     backward_going_tracks = tracking.TracksBackwardLocation
     return {

Hlt/RecoConf/python/RecoConf/standalone.py

@@ -12,10 +12,10 @@ from PyConf.tonic import configurable
 from .hlt1_tracking import (
     require_gec, make_reco_pvs, make_pvs, make_hlt1_tracks,
     make_SPmixed_raw_event, make_RetinaCluster_raw_event,
-    make_VeloClusterTrackingSIMD_hits, make_VeloKalman_fitted_tracks,
-    make_PatPV3DFuture_pvs, all_hlt1_forward_track_types,
-    make_TrackEventFitter_fitted_tracks, make_hlt1_fitted_tracks,
-    make_VeloClusterTrackingSIMD_tracks, make_velo_full_clusters,
+    make_VeloClusterTrackingSIMD, make_VeloClusterTrackingSIMD_hits,
+    make_VeloKalman_fitted_tracks, make_PatPV3DFuture_pvs,
+    all_hlt1_forward_track_types, make_TrackEventFitter_fitted_tracks,
+    make_hlt1_fitted_tracks, make_velo_full_clusters,
     make_RetinaDecoder_raw_event, get_global_measurement_provider)
 
 from RecoConf.hlt1_muonmatch import make_tracks_with_muonmatch_ipcut
@@ -149,13 +149,10 @@ def standalone_hlt1_reco_retinacluster(do_mc_checking=False):
 
     """
     with make_RetinaCluster_raw_event.bind(make_raw=make_SPmixed_raw_event),\
-         make_VeloClusterTrackingSIMD_tracks.bind(
-                make_raw=make_RetinaCluster_raw_event,
-                make_tracks=VeloRetinaClusterTrackingSIMD),\
-         make_VeloClusterTrackingSIMD_hits.bind(
-             make_raw=make_RetinaCluster_raw_event,
-             make_tracks=VeloRetinaClusterTrackingSIMD),\
-         make_velo_full_clusters.bind(make_raw=make_SPmixed_raw_event, make_full_cluster=VPRetinaFullClustering):
+             make_VeloClusterTrackingSIMD.bind(
+        raw_event=make_RetinaCluster_raw_event,
+        algorithm=VeloRetinaClusterTrackingSIMD),\
+        make_velo_full_clusters.bind(make_raw=make_SPmixed_raw_event, make_full_cluster=VPRetinaFullClustering):
 
         return standalone_hlt1_reco(do_mc_checking=do_mc_checking)
 
@@ -249,16 +246,13 @@ def standalone_hlt2_full_track_reco_retinacluster(light_reco=False,
     """
 
     with make_RetinaCluster_raw_event.bind(make_raw=make_SPmixed_raw_event),\
-         make_VeloClusterTrackingSIMD_tracks.bind(
-                make_raw=make_RetinaCluster_raw_event,
-                make_tracks=VeloRetinaClusterTrackingSIMD),\
-         make_VeloClusterTrackingSIMD_hits.bind(
-             make_raw=make_RetinaCluster_raw_event,
-             make_tracks=VeloRetinaClusterTrackingSIMD),\
-         make_RetinaDecoder_raw_event.bind(make_raw=make_RetinaCluster_raw_event),\
-         get_UpgradeGhostId_tool.bind(velo_hits=make_RetinaDecoder_raw_event),\
-         get_global_measurement_provider.bind(velo_hits=make_RetinaDecoder_raw_event),\
-         make_velo_full_clusters.bind(make_raw=make_SPmixed_raw_event, make_full_cluster=VPRetinaFullClustering):
+             make_VeloClusterTrackingSIMD.bind(
+        raw_event=make_RetinaCluster_raw_event,
+        algorithm=VeloRetinaClusterTrackingSIMD),\
+        make_RetinaDecoder_raw_event.bind(make_raw=make_RetinaCluster_raw_event),\
+        get_UpgradeGhostId_tool.bind(velo_hits=make_RetinaDecoder_raw_event),\
+        get_global_measurement_provider.bind(velo_hits=make_RetinaDecoder_raw_event),\
+        make_velo_full_clusters.bind(make_raw=make_SPmixed_raw_event, make_full_cluster=VPRetinaFullClustering):
 
         return standalone_hlt2_full_track_reco(
             light_reco=light_reco,