Merge branch 're-enable-functors' into 'master'

Add additional functors to example-tupling-AllFunctors.py

See merge request lhcb/DaVinci!656

DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-AllFunctors.py

@@ -55,25 +55,23 @@ def all_variables(pvs, DTFR, ptype):
     all_vars['TY'] = F.TY
     # all_vars['COV'] = F.COV # 'Track__Covariance' object has no attribute 'to_json'
     all_vars['P'] = F.P
-    all_vars['FOURMOMENTUM'] = F.FOURMOMENTUM
+    all_vars['PT'] = F.PT
+    all_vars['PHI'] = F.PHI
+    all_vars['ETA'] = F.ETA
     all_vars['PX'] = F.PX
     all_vars['PY'] = F.PY
     all_vars['PZ'] = F.PZ
     all_vars['ENERGY'] = F.ENERGY
-    all_vars['PT'] = F.PT
-    all_vars['PHI'] = F.PHI
-    all_vars['ETA'] = F.ETA
+    all_vars['FOURMOMENTUM'] = F.FOURMOMENTUM
+    all_vars['MASS'] = F.MASS
 
     if (_basic == ptype):
         all_vars['ISMUON'] = F.ISMUON
 
-    #    all_vars['NDOF'] = F.NDOF # no member named 'nDoF' in 'LHCb::Particle
 
-    #if (_basic == ptype):
-    #   all_vars['QOVERP'] = F.QOVERP # no member named 'qOverP' in 'LHCb::Particle'
-
-    all_vars['CHI2DOF'] = F.CHI2DOF  # should work on both
-    all_vars['CHI2'] = F.CHI2  # should work on both
+#    all_vars['NDOF'] = F.NDOF # no member named 'nDoF' in 'LHCb::Particle
+    all_vars['CHI2DOF'] = F.CHI2DOF
+    all_vars['CHI2'] = F.CHI2
 
     if (_basic == ptype):
         all_vars['GHOSTPROB'] = F.GHOSTPROB
@@ -84,16 +82,16 @@ def all_variables(pvs, DTFR, ptype):
     #    all_vars['NFTHITS'] = F.NFTHITS
     #    all_vars['TRACKHISTORY'] = F.TRACKHISTORY
 
-    all_vars['MINIP'] = F.MINIP(pvs)  # crashes on composites @CHECK
-    all_vars['MINIPCHI2'] = F.MINIPCHI2(pvs)  # crashes on composites @CHECK
-
-    if (_composite == ptype):
-        all_vars['CHILD'] = F.CHILD(1, F.PT)  # Needs ParticleCombination
-#        all_vars['SUBCOMB'] = F.SUBCOMB(1,2,F.PT)
-#        all_vars['MASSWITHHYPOTHESES'] = F.MASSWITHHYPOTHESES([939.,939.]) # relies on numChildren. Not in LHCb::Particle
-    all_vars['MASS'] = F.MASS
+    all_vars['MINIP'] = F.MINIP(pvs)
+    all_vars['MINIPCHI2'] = F.MINIPCHI2(pvs)
 
     if (_composite == ptype):
+        all_vars['SUMPT'] = F.SUM(F.PT)
+        all_vars['MINPT'] = F.MIN(F.PT)
+        all_vars['MAXPT'] = F.MAX(F.PT)
+        all_vars['CHILD'] = F.CHILD(1, F.PT)
+        #all_vars['SUBCOMB'] = F.SUBCOMB
+        all_vars['MASSWITHHYPOTHESES'] = F.MASSWITHHYPOTHESES([939., 939.])
         all_vars['END_VX'] = F.END_VX
         all_vars['END_VY'] = F.END_VY
         all_vars['END_VZ'] = F.END_VZ
@@ -101,13 +99,12 @@ def all_variables(pvs, DTFR, ptype):
         all_vars['Ds_END_VZ'] = F.CHILD(1, F.END_VZ)
         all_vars['Delta_END_VZ_DsB0'] = F.CHILD(1, F.END_VZ) - F.END_VZ
 
-    # https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/656
-    #    all_vars['SDOCA'] = F.SDOCA(Child1=1,Child2=2)    # no member named 'doca' in 'LHCb::Particle' (?)
-    #    all_vars['DOCA'] = F.DOCA(Child1=1,Child2=2)    # no member named 'doca' in 'LHCb::Particle' (?)
-    #    all_vars['DOCACHI2'] = F.DOCACHI2(Child1=1,Child2=2)  # same here
-    #    all_vars['MAXDOCA'] = F.MAXDOCA    # does not work
-    #    all_vars['MAXDOCACHI2'] = F.MAXDOCACHI2
-    #    all_vars['ALV'] = F.ALV(Child1=1,Child2=2)  # wants cos_angle_prod
+        # use 'SDOCA' instad of 'DOCA' to avoid accessing the conditions DB for the magnetic field
+        all_vars['DOCA'] = F.SDOCA(Child1=1, Child2=2)
+        all_vars['DOCACHI2'] = F.SDOCACHI2(Child1=1, Child2=2)
+        all_vars['ALV'] = F.ALV(Child1=1, Child2=2)
+        all_vars['MAXDOCA'] = F.MAXSDOCA
+        all_vars['MAXDOCACHI2'] = F.MAXSDOCACHI2
 
     all_vars['CHARGE'] = F.CHARGE
 
@@ -125,18 +122,14 @@ def all_variables(pvs, DTFR, ptype):
         all_vars['PROBNN_P'] = F.PROBNN_P
         all_vars['PROBNN_PI'] = F.PROBNN_PI
 
+    #    all_vars['SIZE'] = F.SIZE(DTFR)  # no matching function for call to 'invoke'
 
-#    all_vars['SIZE'] = F.SIZE(DTFR) # no matching function for call to 'invoke'
-
+    all_vars['BPVIP'] = F.BPVIP(pvs)
+    all_vars['BPVIPCHI2'] = F.BPVIPCHI2(pvs)
     if (_composite == ptype):  # all these require a vertex
         all_vars['BPVETA'] = F.BPVETA(pvs)
         all_vars['BPVCORRM'] = F.BPVCORRM(pvs)
         all_vars['BPVDIRA'] = F.BPVDIRA(pvs)
-
-    all_vars['BPVIP'] = F.BPVIP(pvs)
-    all_vars['BPVIPCHI2'] = F.BPVIPCHI2(pvs)
-
-    if (_composite == ptype):  # all these require a vertex
         all_vars['BPVFDCHI2'] = F.BPVFDCHI2(pvs)
         all_vars['BPVVDZ'] = F.BPVVDZ(pvs)
         all_vars['BPVVDRHO'] = F.BPVVDRHO(pvs)

DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt

@@ -40,7 +40,7 @@ findReferenceBlock("""B0DsK_Tuple                         SUCCESS Booked 1 N-Tup
 import sys, os, glob
 from ROOT import TFile
 
-B_vars_stored = [ 'B0_BPVCORRM', 'B0_BPVDIRA', 'B0_BPVDLS', 'B0_BPVETA', 'B0_BPVFDCHI2', 'B0_BPVIP', 'B0_BPVIPCHI2', 'B0_BPVLTIME', 'B0_BPVVDRHO', 'B0_BPVVDZ', 'B0_CHARGE', 'B0_CHI2', 'B0_CHI2DOF', 'B0_CHILD', 'B0_DTF_BPVIPCHI2', 'B0_DTF_PT', 'B0_Delta_END_VZ_DsB0', 'B0_Ds_END_VZ', 'B0_END_VRho', 'B0_END_VX', 'B0_END_VY', 'B0_END_VZ', 'B0_ENERGY', 'B0_ETA', 'B0_FOURMOMENTUME', 'B0_FOURMOMENTUMX', 'B0_FOURMOMENTUMY', 'B0_FOURMOMENTUMZ', 'B0_MASS', 'B0_MINIP', 'B0_MINIPCHI2', 'B0_P', 'B0_PHI', 'B0_PT', 'B0_PX', 'B0_PY', 'B0_PZ', 'B0_REFERENCEPOINT_X', 'B0_REFERENCEPOINT_Y', 'B0_REFERENCEPOINT_Z', 'B0_TX', 'B0_TY', 'Kaon_BPVIP', 'Kaon_BPVIPCHI2', 'Kaon_CHARGE', 'Kaon_ISMUON', 'Kaon_CHI2', 'Kaon_CHI2DOF', 'Kaon_DTF_BPVIPCHI2', 'Kaon_DTF_PT', 'Kaon_ENERGY', 'Kaon_ETA', 'Kaon_FOURMOMENTUME', 'Kaon_FOURMOMENTUMX', 'Kaon_FOURMOMENTUMY', 'Kaon_FOURMOMENTUMZ', 'Kaon_GHOSTPROB', 'Kaon_MASS', 'Kaon_MINIP', 'Kaon_MINIPCHI2', 'Kaon_P', 'Kaon_PHI', 'Kaon_PID_E', 'Kaon_PID_K', 'Kaon_PID_MU', 'Kaon_PID_P', 'Kaon_PID_PI', 'Kaon_PROBNN_D', 'Kaon_PROBNN_E', 'Kaon_PROBNN_GHOST', 'Kaon_PROBNN_K', 'Kaon_PROBNN_MU', 'Kaon_PROBNN_P', 'Kaon_PROBNN_PI', 'Kaon_PT', 'Kaon_PX', 'Kaon_PY', 'Kaon_PZ', 'Kaon_REFERENCEPOINT_X', 'Kaon_REFERENCEPOINT_Y', 'Kaon_REFERENCEPOINT_Z', 'Kaon_TX', 'Kaon_TY']
+B_vars_stored = [ 'B0_ALV', 'B0_BPVCORRM', 'B0_BPVDIRA', 'B0_BPVDLS', 'B0_BPVETA', 'B0_BPVFDCHI2', 'B0_BPVIP', 'B0_BPVIPCHI2', 'B0_BPVLTIME', 'B0_BPVVDRHO', 'B0_BPVVDZ', 'B0_CHARGE', 'B0_CHI2', 'B0_CHI2DOF', 'B0_CHILD', 'B0_DOCA', 'B0_DOCACHI2', 'B0_DTF_BPVIPCHI2', 'B0_DTF_PT', 'B0_Delta_END_VZ_DsB0', 'B0_Ds_END_VZ', 'B0_END_VRho', 'B0_END_VX', 'B0_END_VY', 'B0_END_VZ', 'B0_ENERGY', 'B0_ETA', 'B0_FOURMOMENTUME', 'B0_FOURMOMENTUMX', 'B0_FOURMOMENTUMY', 'B0_FOURMOMENTUMZ', 'B0_MASS', 'B0_MASSWITHHYPOTHESES', 'B0_MAXDOCA', 'B0_MAXDOCACHI2', 'B0_MAXPT', 'B0_MINIP', 'B0_MINIPCHI2', 'B0_MINPT', 'B0_P', 'B0_PHI', 'B0_PT', 'B0_PX', 'B0_PY', 'B0_PZ', 'B0_REFERENCEPOINT_X', 'B0_REFERENCEPOINT_Y', 'B0_REFERENCEPOINT_Z', 'B0_SUMPT', 'B0_TX', 'B0_TY', 'Kaon_BPVIP', 'Kaon_BPVIPCHI2', 'Kaon_CHARGE', 'Kaon_CHI2', 'Kaon_CHI2DOF', 'Kaon_DTF_BPVIPCHI2', 'Kaon_DTF_PT', 'Kaon_ENERGY', 'Kaon_ETA', 'Kaon_FOURMOMENTUME', 'Kaon_FOURMOMENTUMX', 'Kaon_FOURMOMENTUMY', 'Kaon_FOURMOMENTUMZ', 'Kaon_GHOSTPROB', 'Kaon_ISMUON', 'Kaon_MASS', 'Kaon_MINIP', 'Kaon_MINIPCHI2', 'Kaon_P', 'Kaon_PHI', 'Kaon_PID_E', 'Kaon_PID_K', 'Kaon_PID_MU', 'Kaon_PID_P', 'Kaon_PID_PI', 'Kaon_PROBNN_D', 'Kaon_PROBNN_E', 'Kaon_PROBNN_GHOST', 'Kaon_PROBNN_K', 'Kaon_PROBNN_MU', 'Kaon_PROBNN_P', 'Kaon_PROBNN_PI', 'Kaon_PT', 'Kaon_PX', 'Kaon_PY', 'Kaon_PZ', 'Kaon_REFERENCEPOINT_X', 'Kaon_REFERENCEPOINT_Y', 'Kaon_REFERENCEPOINT_Z', 'Kaon_TX', 'Kaon_TY']
 
 #sort the expected vars
 B_vars_stored = sorted(B_vars_stored)