Merge branch 'AM_evtnum_runnum' into 'master'

Tuple run and event number by default (Follow up from  Analysis!929)

Closes #47

See merge request !784

DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py

@@ -262,15 +262,11 @@ def event_variables(PVs, ODIN, decreports):
             Lines=[bd2dsk_line + "Decision"], DecReports=decreports)
     # DECREPORTS_RE_FILTER
     if ODIN:
-        evt_vars['EVENTNUMBER'] = F.EVENTNUMBER(
-            ODIN
-        )  # WARNING FunTupleBase<Gaudi::NamedRange_<std::vector<LHCb::Particle const*,std::allocator<LHCb::Particle const*> >,__gnu_cxx::__normal_iterator<LHCb::Particle const* const*,std::vector<LHCb::Particle const*,std::allocator<LHCb::Particle const*> > > > >:: Tuple 'DecayTree' 'unsigned long' has different sizes on 32/64 bit systems. Casting 'EVENTNUMBER' to 'unsigned long long'
         evt_vars['EVENTTYPE'] = F.EVENTTYPE(ODIN)
         evt_vars['GPSTIME'] = F.GPSTIME(
             ODIN
         )  # WARNING FunTupleBase<Gaudi::NamedRange_<std::vector<LHCb::Particle const*,std::allocator<LHCb::Particle const*> >,__gnu_cxx::__normal_iterator<LHCb::Particle const* const*,std::vector<LHCb::Particle const*,std::allocator<LHCb::Particle const*> > > > >:: Tuple 'DecayTree' 'unsigned long' has different sizes on 32/64 bit systems. Casting 'EVENTNUMBER' to 'unsigned long long'
         evt_vars['ODINTCK'] = F.ODINTCK(ODIN)
-        evt_vars['RUNNUMBER'] = F.RUNNUMBER(ODIN)
     evt_vars['PV_SIZE'] = F.SIZE(
         PVs)  # no matching function for call to 'invoke'
     if decreports: evt_vars['TCK'] = F.TCK(decreports)

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py

@@ -16,8 +16,8 @@ import Functors as F
 from FunTuple import FunctorCollection as FC
 from FunTuple import FunTuple_Particles as Funtuple
 from DaVinci.algorithms import add_filter
-from DaVinci import make_config, Options
 from FunTuple.functorcollections import EventInfo
+from DaVinci import make_config, Options
 from PyConf.reading import get_particles, get_rec_summary
 
 
@@ -39,8 +39,7 @@ def main(options: Options):
         'nPVs': F.VALUE_OR(-1) @ F.NPVS(rec_summary),
         'nFTClusters': F.VALUE_OR(-1) @ F.NFTCLUSTERS(rec_summary)
     })
-    #Get RunNUmber and EventNumber
-    evt_vars += EventInfo(extra_info=True)
+    evt_vars += EventInfo()
 
     #get particles to run over
     line_name = 'Hlt2SLB_LbToLcMuNu_LcToPKPi_Line'

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_data.py

@@ -92,7 +92,7 @@ def main(options: Options):
     #
     # Event variables
     #
-    evt_vars = EventInfo(extra_info=True)
+    evt_vars = EventInfo()
     evt_vars['PV_SIZE'] = F.SIZE(v2_pvs)
 
     tuple_KS2PiPi = Funtuple(

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2.py

@@ -14,7 +14,7 @@ Read an HLT2 file and create an ntuple with the new DaVinci configuration.
 import Functors as F
 from FunTuple import FunctorCollection as FC
 from FunTuple import FunTuple_Particles as Funtuple
-from PyConf.reading import get_particles, get_pvs, get_odin
+from PyConf.reading import get_particles, get_pvs
 from DaVinci.algorithms import add_filter
 from DaVinci import Options, make_config
 from DaVinci.truth_matching import configured_MCTruthAndBkgCatAlg
@@ -93,17 +93,11 @@ def main(options: Options):
     #sort of related issue (https://gitlab.cern.ch/lhcb/Rec/-/issues/356)
     #variables['D0'] += FC({'TRUEPT_Kaon': MCTRUTH(F.CHILD(1, F.PT))})
 
-    #get odin which hold the event information
-    odin = get_odin()
-
-    #define event level variables
-    evt_variables = FC({
-        "RUNNUMBER": F.RUNNUMBER(odin),
-        "EVENTNUMBER": F.EVENTNUMBER(odin)
-    })
-    evt_variables += SelectionInfo(
+    #define event level variables (just as an example)
+    evt_variables = SelectionInfo(
         selection_type="Hlt2", trigger_lines=[line_name])
-    #For now remove: The 'Hlt2' line decision tuples fine but breaks unit test with an error. (Why?)
+    #For now remove: The 'Hlt2' line decision is written okay but breaks unit test with an error.
+    #This is possibly related to having long TBranch names.
     #see linked issue here: https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/654#note_5320732
     evt_variables.pop('Hlt2')
 

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py

@@ -74,7 +74,7 @@ def main(options: Options):
     variables = {'ALL': variables_all}
 
     # Get event information
-    evt_vars = EventInfo(extra_info=True)
+    evt_vars = EventInfo()
 
     #
     # Configure Funtuple algorithms

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

@@ -45,7 +45,9 @@ B_vars_stored =['B0_ID',
 'Hlt1_Hlt1D2KPiDecision',
 'Hlt1_Hlt1D2PiPiDecision',
 'Hlt1_Hlt1TrackMVADecision',
-'Hlt1_TCK'
+'Hlt1_TCK',
+'RUNNUMBER',
+'EVENTNUMBER'
 ]
 
 #sort the expected vars

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

@@ -23,10 +23,9 @@
     histo_file: DV-example-tupling-DTF-his.root
     input_raw_format: 4.3
     ntuple_file: DV-example-tupling-DTF-ntp.root
-    input_process: Turbo
   </text></argument>
 <argument name="validator"><text>
-findReferenceBlock("""DimuonsTuple                        SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=16 {Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm_PT,Jpsi_LOKI_MAXPT,Jp}""")
+findReferenceBlock("""DimuonsTuple                        SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=18 {EVENTNUMBER,RUNNUMBER,Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm}""")
 countErrorLines({"FATAL":0, "ERROR":0})
 </text></argument>
 </extension>

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

@@ -30,6 +30,7 @@ from ROOT import TFile
 
 
 B_vars_stored = ['Bs_DTF_JpsiKst_CHI2DOF', 'Bs_DTF_JpsiKst_ENERGY', 'Bs_DTF_JpsiKst_ID', 'Bs_DTF_JpsiKst_M', 'Bs_DTF_JpsiKst_P', 'Bs_DTF_JpsiPhi_CHI2DOF', 'Bs_DTF_JpsiPhi_ENERGY', 'Bs_DTF_JpsiPhi_ID', 'Bs_DTF_JpsiPhi_M', 'Bs_DTF_JpsiPhi_P', 'Bs_ORIGINAL_CHI2DOF', 'Bs_ORIGINAL_ENERGY', 'Bs_ORIGINAL_ID', 'Bs_ORIGINAL_M', 'Bs_ORIGINAL_P', 'Jpsi_DTF_JpsiKst_CHI2DOF', 'Jpsi_DTF_JpsiKst_ENERGY', 'Jpsi_DTF_JpsiKst_ID', 'Jpsi_DTF_JpsiKst_M', 'Jpsi_DTF_JpsiKst_P', 'Jpsi_DTF_JpsiPhi_CHI2DOF', 'Jpsi_DTF_JpsiPhi_ENERGY', 'Jpsi_DTF_JpsiPhi_ID', 'Jpsi_DTF_JpsiPhi_M', 'Jpsi_DTF_JpsiPhi_P', 'Jpsi_ORIGINAL_CHI2DOF', 'Jpsi_ORIGINAL_ENERGY', 'Jpsi_ORIGINAL_ID', 'Jpsi_ORIGINAL_M', 'Jpsi_ORIGINAL_P', 'KM_DTF_JpsiKst_CHI2DOF', 'KM_DTF_JpsiKst_ENERGY', 'KM_DTF_JpsiKst_ID', 'KM_DTF_JpsiKst_M', 'KM_DTF_JpsiKst_P', 'KM_DTF_JpsiPhi_CHI2DOF', 'KM_DTF_JpsiPhi_ENERGY', 'KM_DTF_JpsiPhi_ID', 'KM_DTF_JpsiPhi_M', 'KM_DTF_JpsiPhi_P', 'KM_ORIGINAL_CHI2DOF', 'KM_ORIGINAL_ENERGY', 'KM_ORIGINAL_ID', 'KM_ORIGINAL_M', 'KM_ORIGINAL_P', 'KP_DTF_JpsiKst_CHI2DOF', 'KP_DTF_JpsiKst_ENERGY', 'KP_DTF_JpsiKst_ID', 'KP_DTF_JpsiKst_M', 'KP_DTF_JpsiKst_P', 'KP_DTF_JpsiPhi_CHI2DOF', 'KP_DTF_JpsiPhi_ENERGY', 'KP_DTF_JpsiPhi_ID', 'KP_DTF_JpsiPhi_M', 'KP_DTF_JpsiPhi_P', 'KP_ORIGINAL_CHI2DOF', 'KP_ORIGINAL_ENERGY', 'KP_ORIGINAL_ID', 'KP_ORIGINAL_M', 'KP_ORIGINAL_P', 'MuM_DTF_JpsiKst_CHI2DOF', 'MuM_DTF_JpsiKst_ENERGY', 'MuM_DTF_JpsiKst_ID', 'MuM_DTF_JpsiKst_M', 'MuM_DTF_JpsiKst_P', 'MuM_DTF_JpsiPhi_CHI2DOF', 'MuM_DTF_JpsiPhi_ENERGY', 'MuM_DTF_JpsiPhi_ID', 'MuM_DTF_JpsiPhi_M', 'MuM_DTF_JpsiPhi_P', 'MuM_ORIGINAL_CHI2DOF', 'MuM_ORIGINAL_ENERGY', 'MuM_ORIGINAL_ID', 'MuM_ORIGINAL_M', 'MuM_ORIGINAL_P', 'MuP_DTF_JpsiKst_CHI2DOF', 'MuP_DTF_JpsiKst_ENERGY', 'MuP_DTF_JpsiKst_ID', 'MuP_DTF_JpsiKst_M', 'MuP_DTF_JpsiKst_P', 'MuP_DTF_JpsiPhi_CHI2DOF', 'MuP_DTF_JpsiPhi_ENERGY', 'MuP_DTF_JpsiPhi_ID', 'MuP_DTF_JpsiPhi_M', 'MuP_DTF_JpsiPhi_P', 'MuP_ORIGINAL_CHI2DOF', 'MuP_ORIGINAL_ENERGY', 'MuP_ORIGINAL_ID', 'MuP_ORIGINAL_M', 'MuP_ORIGINAL_P', 'Phi_DTF_JpsiKst_CHI2DOF', 'Phi_DTF_JpsiKst_ENERGY', 'Phi_DTF_JpsiKst_ID', 'Phi_DTF_JpsiKst_M', 'Phi_DTF_JpsiKst_P', 'Phi_DTF_JpsiPhi_CHI2DOF', 'Phi_DTF_JpsiPhi_ENERGY', 'Phi_DTF_JpsiPhi_ID', 'Phi_DTF_JpsiPhi_M', 'Phi_DTF_JpsiPhi_P', 'Phi_ORIGINAL_CHI2DOF', 'Phi_ORIGINAL_ENERGY', 'Phi_ORIGINAL_ID', 'Phi_ORIGINAL_M', 'Phi_ORIGINAL_P']
+B_vars_stored += ['RUNNUMBER', 'EVENTNUMBER']
 
 
 #sort the expected vars

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

@@ -46,7 +46,9 @@ Jpsi_vars_stored = ['Jpsi_MAXPT',
  			'MuPlus_PT',
  			'MuPlus_PX',
  			'MuPlus_PY',
- 			'MuPlus_PZ']
+ 			'MuPlus_PZ',
+      'RUNNUMBER',
+      'EVENTNUMBER']
 
 Ks_vars_stored = ['KS_MAXPT',
 			'KS_PX',
@@ -59,7 +61,9 @@ Ks_vars_stored = ['KS_MAXPT',
 			'KS_ENERGY',
 			'KS_P',
 			'KS_M',
-			'KS_PT']
+			'KS_PT',
+      'RUNNUMBER',
+      'EVENTNUMBER']
 
 #sort the expected vars
 Jpsi_vars_stored = sorted(Jpsi_vars_stored)

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

@@ -19,8 +19,7 @@
   </set></argument>
   <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/test_tistos.yaml</text></argument>
   <argument name="extra_options_yaml"><text>
-    histo_file: tistos_histos.root
-    ntuple_file: tistos_ntuple.root
+    ntuple_file: tuple_tistos.root
     print_freq: 1
   </text></argument>
   <argument name="reference"><text>../refs/test_davinci_tupling_tistos.ref</text></argument>
@@ -34,6 +33,7 @@ import sys, os, glob
 from ROOT import TFile
 
 B_vars_stored =['phi2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Km2_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km2_PT', 'Kp2_PT', 'Bs_Hlt1_Hlt1TrackMVADecision_TOS', 'Bs_PT', 'Kp2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Km1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'phi1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Kp2_Hlt1_Hlt1TrackMVADecision_TOS', 'Kp2_Hlt1_Hlt1TrackMVADecision_TIS', 'Kp2_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Bs_Hlt1_Hlt1TrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TrackMVADecision_TOS', 'phi2_Hlt1_Hlt1TrackMVADecision_TOS', 'Kp1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Kp1_Hlt1_Hlt1TrackMVADecision_TOS', 'Km1_Hlt1_Hlt1TrackMVADecision_TIS', 'Km1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'phi2_PT', 'Kp1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TrackMVADecision_TIS', 'phi2_Hlt1_Hlt1TrackMVADecision_TIS', 'phi1_PT', 'Hlt1_Hlt1TrackMVADecision', 'Hlt1_TCK', 'Kp1_Hlt1_Hlt1TrackMVADecision_TIS', 'Hlt1_Hlt1TwoTrackMVADecision', 'Kp1_PT', 'Km2_Hlt1_Hlt1TrackMVADecision_TIS', 'Bs_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km1_Hlt1_Hlt1TrackMVADecision_TOS', 'Km2_Hlt1_Hlt1TrackMVADecision_TOS', 'Km1_PT', 'Bs_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi2_Hlt1_Hlt1TwoTrackMVADecision_TOS']
+B_vars_stored += ['RUNNUMBER', 'EVENTNUMBER']
 
 #sort the expected vars
 B_vars_stored = sorted(B_vars_stored)

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

@@ -30,7 +30,7 @@
   <argument name="timeout"><integer>3600</integer></argument>
   <argument name="reference"><text>$DAVINCIEXAMPLESROOT/tests/refs/test_davinci_tupling_weightedrelation_trackvariables.ref</text></argument>
   <argument name="validator"><text>
-findReferenceBlock("""Tuple                               SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=32 {B_THOR_P,B_THOR_PT,B_THOR_MASS,B_First_P,B_First_PT,B_Sum_P,B_Sum_PT,B_Max_P,B_Ma}""")
+findReferenceBlock("""Tuple                               SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=34 {EVENTNUMBER,RUNNUMBER,B_THOR_P,B_THOR_PT,B_THOR_MASS,B_First_P,B_First_PT,B_Sum_P}""")
 countErrorLines({"FATAL":0, "ERROR":0})
   </text></argument>
 </extension>

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

@@ -29,8 +29,8 @@
 import sys, os, glob
 from ROOT import TFile
 
-B_vars_stored =['B_PX', 'B_PY', 'B_PZ']
-K_vars_stored =['K_PX', 'K_PY', 'K_PZ']
+B_vars_stored =['B_PX', 'B_PY', 'B_PZ', 'RUNNUMBER', 'EVENTNUMBER']
+K_vars_stored =['K_PX', 'K_PY', 'K_PZ', 'RUNNUMBER', 'EVENTNUMBER']
 
 #sort the expected vars
 B_vars_stored = sorted(B_vars_stored)

DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic-run-mc.qmt

@@ -23,7 +23,7 @@
     histo_file: DV-example-tupling-basic-his-run-mc.root
     input_raw_format: 4.3
     ntuple_file: DV-example-tupling-basic-ntp-run-mc.root
-    input_process: Turbo
+    input_process: Hlt2
   </text></argument>
   <argument name="reference"><text>../refs/test_davinci_tupling-basic-run-mc.ref</text></argument>
   <argument name="error_reference"><text>../refs/empty.ref</text></argument>

DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic.qmt

@@ -21,7 +21,7 @@
     histo_file: DV-example-tupling-basic-his.root
     evt_max: 10
     input_raw_format: 4.3
-    input_process: Spruce
+    input_process: Hlt2
 </text></argument>
 <argument name="timeout"><integer>3600</integer></argument>
 <argument name="args"><set>

DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref

@@ -136,7 +136,7 @@ FSROutputStreamDstWriter               INFO Set up File Summary Record
 FSROutputStreamDstWriter               INFO Events output: 1
 Tuple_B0Dspi                        SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
 Tuple_B0Dspi                        SUCCESS List of booked N-Tuples in directory "FILE1/Tuple_B0Dspi"
-Tuple_B0Dspi                        SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=25 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_M,B}
+Tuple_B0Dspi                        SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=27 {EVENTNUMBER,RUNNUMBER,B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTR}
 LAZY_AND: DaVinci                         #=118     Sum=1           Eff=|(0.8474576 +- 0.843859)%|
  NONLAZY_OR: FileSummaryRecords           #=118     Sum=118         Eff=|( 100.0000 +- 0.00000 )%|
   LAZY_AND: GenFSR                        #=118     Sum=118         Eff=|( 100.0000 +- 0.00000 )%|

DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref

@@ -18,7 +18,7 @@ FSROutputStreamDstWriter               INFO Set up File Summary Record
 FSROutputStreamDstWriter               INFO Events output: 1
 DimuonsTuple                        SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
 DimuonsTuple                        SUCCESS List of booked N-Tuples in directory "FILE1/DimuonsTuple"
-DimuonsTuple                        SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=10 {Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm_PT,Jpsi_LOKI_MAXPT,Jp}
+DimuonsTuple                        SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=12 {EVENTNUMBER,RUNNUMBER,Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm}
 LAZY_AND: DaVinci                           #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
  NONLAZY_OR: FileSummaryRecords             #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
   LAZY_AND: GenFSR                          #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|

DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref

@@ -25,7 +25,7 @@ FSROutputStreamDstWriter               INFO Set up File Summary Record
 FSROutputStreamDstWriter               INFO Events output: 1
 B0DsK_Tuple                         SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
 B0DsK_Tuple                         SUCCESS List of booked N-Tuples in directory "FILE1/B0DsK_Tuple"
-B0DsK_Tuple                         SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=23 {B0_THOR_MASS,B0_PT,B0_TRUEID,indx,B0_TagTr_P[1]/V,nTags,B0_TagTr_PT[1]/V,B0_TagTr}
+B0DsK_Tuple                         SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=25 {EVENTNUMBER,RUNNUMBER,B0_THOR_MASS,B0_PT,B0_TRUEID,indx,B0_TagTr_P[1]/V,nTags,B0_}
 LAZY_AND: DaVinci                         #=14      Sum=14          Eff=|( 100.0000 +- 0.00000 )%|
  NONLAZY_OR: FileSummaryRecords           #=14      Sum=14          Eff=|( 100.0000 +- 0.00000 )%|
   LAZY_AND: GenFSR                        #=14      Sum=14          Eff=|( 100.0000 +- 0.00000 )%|

DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref

@@ -20,7 +20,7 @@ FSROutputStreamDstWriter               INFO Set up File Summary Record
 FSROutputStreamDstWriter               INFO Events output: 1
 Bs2JpsiPhi_Tuple                    SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
 Bs2JpsiPhi_Tuple                    SUCCESS List of booked N-Tuples in directory "FILE1/Bs2JpsiPhi_Tuple"
-Bs2JpsiPhi_Tuple                    SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=21 {Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,Jpsi_M,Jpsi_P,Jpsi_PT,Jpsi_PX,Jpsi_PY}
+Bs2JpsiPhi_Tuple                    SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=23 {EVENTNUMBER,RUNNUMBER,Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,Jpsi_M,Jpsi_P,J}
 LAZY_AND: DaVinci                           #=1978    Sum=298         Eff=|( 15.06572 +- 0.804310)%|
  NONLAZY_OR: FileSummaryRecords             #=1978    Sum=1978        Eff=|( 100.0000 +- 0.00000 )%|
   LAZY_AND: GenFSR                          #=1978    Sum=1978        Eff=|( 100.0000 +- 0.00000 )%|

DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref

@@ -137,10 +137,10 @@ FSROutputStreamDstWriter               INFO Set up File Summary Record
 FSROutputStreamDstWriter               INFO Events output: 1
 B0DsK_Tuple                         SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
 B0DsK_Tuple                         SUCCESS List of booked N-Tuples in directory "FILE1/B0DsK_Tuple"
-B0DsK_Tuple                         SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=27 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_M,B}
+B0DsK_Tuple                         SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=29 {EVENTNUMBER,RUNNUMBER,B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTR}
 B0Dspi_Tuple                        SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
 B0Dspi_Tuple                        SUCCESS List of booked N-Tuples in directory "FILE1/B0Dspi_Tuple"
-B0Dspi_Tuple                        SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=27 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_M,B}
+B0Dspi_Tuple                        SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=29 {EVENTNUMBER,RUNNUMBER,B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTR}
 LAZY_AND: DaVinci                         #=118     Sum=48          Eff=|( 40.67797 +- 4.52217 )%|
  NONLAZY_OR: FileSummaryRecords           #=118     Sum=118         Eff=|( 100.0000 +- 0.00000 )%|
   LAZY_AND: GenFSR                        #=118     Sum=118         Eff=|( 100.0000 +- 0.00000 )%|