test rec_summary functor

DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py

@@ -109,7 +109,7 @@ def all_variables(pvs, dtf, mctruth, ptype, candidates=None, ftAlg=None):
     # give a custom branch name for the index.
     # This can be achieved by enclosing custom index
     # name within square brackets (see code below).
-    # The branch name ("nPV") will correspond to the
+    # The branch name ("nPVs") will correspond to the
     # index of the PV. If no index branch name given i.e.
     # all_vars.update({ 'ALLPVX'] the default "indx" is used.
 
@@ -293,7 +293,7 @@ def all_variables(pvs, dtf, mctruth, ptype, candidates=None, ftAlg=None):
     return all_vars
 
 
-def event_variables(PVs, ODIN, decreports, lines):
+def event_variables(ODIN, decreports, lines):
     """
     event variables
     """

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_FunTupleEvent.py

@@ -36,13 +36,16 @@ def main(options: Options):
     # Note more information can be added to the RecSummary object
     # (see MRs: https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/1649)
     rec_summary = get_rec_summary()
-    evt_vars = FunctorCollection(
-        {
-            "nTracks": F.VALUE_OR(-1) @ F.NTRACKS(rec_summary),
-            "nPVs": F.VALUE_OR(-1) @ F.NPVS(rec_summary),
-            "nFTClusters": F.VALUE_OR(-1) @ F.NFTCLUSTERS(rec_summary),
-        }
-    )
+
+    evt_vars = FunctorCollection({
+        'nPVs':
+        F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nPVs"),
+        'nNFT':
+        F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nFTClusters"),
+        'nTracks':
+        F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nTracks")
+    })
+
     evt_vars += FC.EventInfo()
 
     # define tupling algorithm

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py

@@ -39,13 +39,14 @@ def main(options: Options):
     # Note more information can be added to the RecSummary object
     # (see MRs: https://gitlab.cern.ch/lhcb/Moore/-/merge_requests/1649)
     rec_summary = get_rec_summary()
-    evt_vars = FunctorCollection(
-        {
-            "nTracks": F.VALUE_OR(-1) @ F.NTRACKS(rec_summary),
-            "nPVs": F.VALUE_OR(-1) @ F.NPVS(rec_summary),
-            "nFTClusters": F.VALUE_OR(-1) @ F.NFTCLUSTERS(rec_summary),
-        }
-    )
+    evt_vars = FunctorCollection({
+        'nPVs':
+        F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nPVs"),
+        'nNFT':
+        F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nFTClusters"),
+        'nTracks':
+        F.VALUE_OR(-1) @ F.RECSUMMARY_INFO(rec_summary, "nTracks")
+    })
     evt_vars += FC.EventInfo()
 
     # get particles to run over