Merge branch 'mwaterla_VP_hit_efficiency' into 'master'

add track selection for Velo hit efficiency options

See merge request !2665

Hlt/RecoConf/options/VP_tracking_monitors.py

@@ -42,6 +42,8 @@ from PyConf.Algorithms import (
     VeloRetinaClusterTrackingSIMDFull,
     fromPrVeloTracksV1TracksMerger,
     TrackEventFitter,
+    TrackListRefiner,
+    TrackSelectionToContainer,
 )
 
 from PyConf.Tools import (
@@ -51,6 +53,7 @@ from PyConf.Tools import (
     TrackInterpolator,
     TrackLinearExtrapolator,
 )
+import Functors as F
 
 make_reco_pvs.global_bind(make_pvs_from_velo_tracks=make_PatPV3DFuture_pvs)
 
@@ -114,18 +117,27 @@ def make_my_sequence():
         trackExtrapolator = TrackLinearExtrapolator()
         trackInterpolator = TrackInterpolator(Extrapolator=trackExtrapolator)
 
+        # do track selection
+        tracks_selection = TrackListRefiner(
+            inputLocation=bestTracks,
+            Code=F.require_all(
+                F.NVPHITS >= 4,
+                F.P >= 0,  # Here to make it explicit
+                F.PT >= 0)).outputLocation
+        filtered_tracks = TrackSelectionToContainer(
+            name="TrackSelectionToContainer_{hash}",
+            InputLocation=tracks_selection).OutputLocation
+
         # Loop over sensors. Subset of all sensors at the moment for testing
         for sensor_under_study in [20, 21, 22, 23, 96, 97, 98, 99, 100]:
 
             my_vp_efficiency_alg_TMF = VPHitEfficiencyMonitor(
                 name="VPHitEfficiencyMonitorSensor_{0}".format(
                     sensor_under_study),
-                TrackLocation=bestTracks,
-                TrackMinP=0.0,
+                TrackLocation=filtered_tracks,
                 PrVPHitsLocation=clusters,
                 MaxTrackCov=100.0,
                 SensorUnderStudy=sensor_under_study,
-                MinHitsOnTrack=4,  # to partially undo the effects of not masking
                 Interpolator=trackInterpolator,
                 Extrapolator=trackExtrapolator,
             )

Hlt/RecoConf/options/examples/VP_hit_efficiency.py

@@ -29,6 +29,8 @@ from PyConf.Algorithms import (
     VeloRetinaClusterTrackingSIMDFull,
     fromPrVeloTracksV1TracksMerger,
     TrackEventFitter,
+    TrackListRefiner,
+    TrackSelectionToContainer,
 )
 from PyConf.Tools import (
     TrackMasterFitter,
@@ -38,6 +40,8 @@ from PyConf.Tools import (
     TrackLinearExtrapolator,
 )
 
+import Functors as F
+
 make_reco_pvs.global_bind(make_pvs_from_velo_tracks=make_PatPV3DFuture_pvs)
 """
 Options file to determine the hit efficiencies in the VELO
@@ -107,15 +111,24 @@ def make_my_sequence():
                 MaxChi2DoF=2.8,
             ).TracksOutContainer
 
+            # do track selection
+            tracks_selection = TrackListRefiner(
+                inputLocation=bestTracks,
+                Code=F.require_all(
+                    F.NVPHITS >= 3,
+                    F.P >= 0,  # Here to make it explicit
+                    F.PT >= 0)).outputLocation
+            filtered_tracks = TrackSelectionToContainer(
+                name="TrackSelectionToContainer_{hash}",
+                InputLocation=tracks_selection).OutputLocation
+
             my_vp_efficiency_alg_TMF = VPHitEfficiencyMonitor(
                 name="VPHitEfficiencyMonitorSensor{0}".format(
                     sensor_under_study),
-                TrackLocation=bestTracks,
-                TrackMinP=0.0,
+                TrackLocation=filtered_tracks,
                 PrVPHitsLocation=clusters,
                 MaxTrackCov=100.0,
                 SensorUnderStudy=sensor_under_study,
-                MinHitsOnTrack=3,
                 Interpolator=trackInterpolator,
                 Extrapolator=trackExtrapolator,
             )