update test with new functor

DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py

@@ -382,7 +382,7 @@ def alg_config(options: Options):
     odin = get_odin()
     #    decreports = get_decreports('Spruce')
     decreports = None
-    evt_vars = event_variables(v2_pvs, odin, decreports, [bd2dsk_line + "Decision"])
+    evt_vars = event_variables(odin, decreports, [bd2dsk_line + "Decision"])
 
     #
     # Sprucing filter

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_FunTupleEvent.py

@@ -40,7 +40,7 @@ def main(options: Options):
     evt_vars = FunctorCollection({
         'nPVs':
         F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nPVs"),
-        'nNFT':
+        'nFTClusters':
         F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nFTClusters"),
         'nTracks':
         F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nTracks")

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py

@@ -42,7 +42,7 @@ def main(options: Options):
     evt_vars = FunctorCollection({
         'nPVs':
         F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nPVs"),
-        'nNFT':
+        'nFTClusters':
         F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nFTClusters"),
         'nTracks':
         F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nTracks")