Merge branch 'ld-pv-refitting' into 'master'

Extend track-refitting integration test to include PV refitting

See merge request !1175

DaVinciTests/python/DaVinciTests/options_lhcbintegration_track_refitting.py

@@ -87,10 +87,14 @@ def main(options: Options):
 
     with default_VeloCluster_source.bind(bank_type="VPRetinaCluster"):
         tracks_from_dst = track_refitting.refit_tracks(
-            tracks_from_particles, True, use_PrKF=True
+            tracks_from_particles,
+            True,
+            track_fitter=track_refitting.TRACK_FIT_TYPE_PRKALMAN,
         )
         tracks_from_raw = track_refitting.refit_tracks(
-            tracks_from_particles, False, use_PrKF=True
+            tracks_from_particles,
+            False,
+            track_fitter=track_refitting.TRACK_FIT_TYPE_PRKALMAN,
         )
 
     muons = make_muons(partial(make_protos, tracks_from_raw))  # original
@@ -106,6 +110,9 @@ def main(options: Options):
         TracksInContainer=tracks_from_particles, name="TrackMonitor"
     )
 
+    pvs = get_pvs()
+    refitted_pvs = track_refitting.refit_pvs(input_pvs=pvs).OutputVertices
+
     relation_table_match_by_lhcbid = LHCbIDOverlapRelationTable(
         MatchFrom=muons,
         MatchTo=new_muons,
@@ -140,6 +147,15 @@ def main(options: Options):
                 @ F.MAP_INPUT_ARRAY(
                     Functor=F.PT, Relations=relation_table_match_by_lhcbid
                 ),
+                "Refitted_IPCHI2_OLDPV[nMatchTracks]": F.REVERSE_RANGE
+                @ F.MAP_INPUT_ARRAY(
+                    Functor=F.BPVIPCHI2(pvs), Relations=relation_table_match_by_lhcbid
+                ),
+                "Refitted_IPCHI2_NEWPV[nMatchTracks]": F.REVERSE_RANGE
+                @ F.MAP_INPUT_ARRAY(
+                    Functor=F.BPVIPCHI2(refitted_pvs),
+                    Relations=relation_table_match_by_lhcbid,
+                ),
                 "Refitted_WEIGHT[nMatchTracks]": F.REVERSE_RANGE
                 @ F.MAP_WEIGHT(Relations=relation_table_match_by_lhcbid),
                 "Refitted_ETA[nMatchTracks]": F.REVERSE_RANGE