Merge branch 'follow_Moore2418' into 'master'

Remake DaVinci input files

See merge request !928

DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml

-input_files:
-- root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/B2JpsiK_spruce.dst
-annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/B2JpsiK_spruce.tck.json
-input_type: ROOT
-evt_max: 100
-ntuple_file: davinci_ntuple_ft.root
-print_freq: 1
-data_type: Upgrade
-simulation: true
-conddb_tag: sim-20201218-vc-md100
-dddb_tag: dddb-20201211
-conditions_version: master
-geometry_version: trunk
-input_process: TurboPass

DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py

@@ -39,7 +39,7 @@ from DaVinci import Options, make_config
 #
 # Definition of Sprucing line
 #
-bd2dsk_line = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line"
+bd2dsk_line = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST"
 
 _basic = "basic"
 _composite = "composite"

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_configFuntuple.py

@@ -49,7 +49,7 @@ def main(options: Options):
         "B0": FunctorCollection(variables_B),
     }
 
-    line = "SpruceB2OC_BdToDsmPi_DsmToKpKmPim_Line"
+    line = "SpruceB2OC_BdToDsmPi_DsmToKpKmPim"
     config = {
         "location": f"/Event/Spruce/{line}/Particles",
         "filters": [f"HLT_PASS('{line}Decision')"],

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_pvs.py

@@ -26,7 +26,7 @@ from DaVinci import Options, make_config
 
 
 def main(options: Options):
-    B_Line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    B_Line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     B_Data = get_particles(f"/Event/HLT2/{B_Line}/Particles")
 
     my_filter = create_lines_filter(name="HDRFilter_Bs2JpsiPhi", lines=[B_Line])

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py

@@ -28,7 +28,7 @@ from DaVinci import Options, make_config
 
 
 def main(options: Options):
-    B_Line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    B_Line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     B_Data = get_particles(f"/Event/HLT2/{B_Line}/Particles")
 
     my_filter = create_lines_filter(name="HDRFilter_Bs2JpsiPhi", lines=[f"{B_Line}"])

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_passthrough.py

@@ -24,7 +24,7 @@ from DaVinci.algorithms import create_lines_filter
 
 
 def main(options: Options):
-    bs2jpsiphi_line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    bs2jpsiphi_line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     bs2jpsiphi_data = get_particles(f"/Event/HLT2/{bs2jpsiphi_line}/Particles")
     fields = {
         "Bs": "[B_s0 -> (J/psi(1S) -> mu+ mu-) (phi(1020) -> K+ K-)]CC",

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_spruce.py

@@ -24,8 +24,8 @@ from DaVinci import Options, make_config
 
 
 def main(options: Options):
-    line_B0DsK = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line"
-    line_B0Dspi = "SpruceB2OC_BdToDsmPi_DsmToKpKmPim_Line"
+    line_B0DsK = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST"
+    line_B0Dspi = "SpruceB2OC_BdToDsmPi_DsmToKpKmPim"
     bd2dsk_line = get_particles(f"/Event/Spruce/{line_B0DsK}/Particles")
     bd2dspi_line = get_particles(f"/Event/Spruce/{line_B0Dspi}/Particles")
 

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_relation_isovariables.py

@@ -42,10 +42,9 @@ def main(options: Options):
         "Kp": "[B+ -> (J/psi(1S) -> mu+ mu- ) ^K+]CC",
     }
 
-    b2jpsik_data = get_particles("/Event/HLT2/Hlt2B2JpsiKLine/Particles")
-    tagged_data = get_particles(
-        "/Event/HLT2/Hlt2B2JpsiKLine/LongTaggingParticles/Particles"
-    )
+    Line = "Hlt2B2CC_BuToJpsiKplus_JpsiToMuMu_Prompt"
+    b2jpsik_data = get_particles(f"/Event/HLT2/{Line}/Particles")
+    tagged_data = get_particles(f"/Event/HLT2/{Line}/LongTaggingParticles/Particles")
 
     pvs = get_pvs()
 
@@ -84,7 +83,7 @@ def main(options: Options):
         "Kp": variables_all + track_iso_variables,
     }
 
-    my_filter = create_lines_filter(name="HDRFilter_B2JpsiK", lines=["Hlt2B2JpsiKLine"])
+    my_filter = create_lines_filter(name="HDRFilter_B2JpsiK", lines=[f"{Line}"])
     my_tuple = Funtuple(
         name="Tuple",
         tuple_name="DecayTree",

DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py

@@ -43,7 +43,7 @@ import Functors as F
 
 def main(options: Options):
     # Define the input
-    B_Line = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line"
+    B_Line = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST"
     B_Data = get_particles(f"/Event/Spruce/{B_Line}/Particles")
 
     # Filter

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

@@ -21,6 +21,7 @@
 # Prerequisites: None
 #######################################################
 -->
+
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"><text>lbexec</text></argument>
   <!-- Minimum bias dst processed using topo {2,3} hlt2 lines and all sprucing lines -->
@@ -57,7 +58,7 @@ countErrorLines({"FATAL":0, "ERROR":20})
 import sys, os, glob
 from ROOT import TFile
 
-B_vars_stored  = ['B0_ISBASIC', 'B0_ABS_PX', 'B0_ALLPVX', 'B0_ALLPVY', 'B0_ALLPVZ', 'B0_ALLPV_FD', 'B0_ALLPV_IP', 'B0_ALV', 'B0_BKGCAT', 'B0_BPVCORRM', 'B0_BPVCORRMERR', 'B0_BPVDIRA', 'B0_BPVDLS', 'B0_BPVETA', 'B0_BPVFD', 'B0_BPVFDCHI2', 'B0_BPVFDIRX', 'B0_BPVFDIRY', 'B0_BPVFDIRZ', 'B0_BPVFDVECX', 'B0_BPVFDVECY', 'B0_BPVFDVECZ', 'B0_BPVIP', 'B0_BPVIPCHI2', 'B0_BPVLTIME', 'B0_BPVVDRHO', 'B0_BPVVDX', 'B0_BPVVDY', 'B0_BPVVDZ', 'B0_BPVX', 'B0_BPVY', 'B0_BPVZ', 'B0_CHARGE', 'B0_CHI2', 'B0_CHI2DOF', 'B0_CHILD1_PT', '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_M', 'B0_MASS', 'B0_MASSWITHHYPOTHESES', 'B0_MAXDOCA', 'B0_MAXDOCACHI2', 'B0_MAXPT', 'B0_MC_GD_GD_MOTHER_ID', 'B0_MC_GD_GD_MOTHER_KEY', 'B0_MC_GD_MOTHER_ID', 'B0_MC_GD_MOTHER_KEY', 'B0_MC_ISPROMPT', 'B0_MC_LONGLIVED_ID', 'B0_MC_LONGLIVED_KEY', 'B0_MC_MOTHER_ID', 'B0_MC_MOTHER_KEY', 'B0_MINIP', 'B0_MINIPCHI2', 'B0_MINPT', 'B0_OBJECT_KEY', 'B0_P', 'B0_PHI', 'B0_PT', 'B0_PX', 'B0_PY', 'B0_PZ', 'B0_REFERENCEPOINT_X', 'B0_REFERENCEPOINT_Y', 'B0_REFERENCEPOINT_Z', 'B0_SDOCA', 'B0_SDOCACHI2', 'B0_SUBCOMB12_MM', 'B0_SUMPT', 'B0_TRUEENDVERTEX_X', 'B0_TRUEENDVERTEX_Y', 'B0_TRUEENDVERTEX_Z', 'B0_TRUEENERGY', 'B0_TRUEID', 'B0_TRUEORIGINVERTEX_X', 'B0_TRUEORIGINVERTEX_Y', 'B0_TRUEORIGINVERTEX_Z', 'B0_TRUEP', 'B0_TRUEPT', 'B0_TRUEPX', 'B0_TRUEPY', 'B0_TRUEPZ', 'BUNCHCROSSING_ID', 'BUNCHCROSSING_TYPE', 'Ds_ISBASIC', 'Ds_ABS_PX', 'Ds_ALLPVX', 'Ds_ALLPVY', 'Ds_ALLPVZ', 'Ds_ALLPV_FD', 'Ds_ALLPV_IP', 'Ds_ALV', 'Ds_BKGCAT', 'Ds_BPVCORRM', 'Ds_BPVCORRMERR', 'Ds_BPVDIRA', 'Ds_BPVDLS', 'Ds_BPVETA', 'Ds_BPVFD', 'Ds_BPVFDCHI2', 'Ds_BPVFDIRX', 'Ds_BPVFDIRY', 'Ds_BPVFDIRZ', 'Ds_BPVFDVECX', 'Ds_BPVFDVECY', 'Ds_BPVFDVECZ', 'Ds_BPVIP', 'Ds_BPVIPCHI2', 'Ds_BPVLTIME', 'Ds_BPVVDRHO', 'Ds_BPVVDX', 'Ds_BPVVDY', 'Ds_BPVVDZ', 'Ds_BPVX', 'Ds_BPVY', 'Ds_BPVZ', 'Ds_CHARGE', 'Ds_CHI2', 'Ds_CHI2DOF', 'Ds_DOCA', 'Ds_DOCACHI2', 'Ds_DTF_BPVIPCHI2', 'Ds_DTF_PT', 'Ds_END_VRHO', 'Ds_END_VX', 'Ds_END_VY', 'Ds_END_VZ', 'Ds_ENERGY', 'Ds_ETA', 'Ds_FOURMOMENTUME', 'Ds_FOURMOMENTUMX', 'Ds_FOURMOMENTUMY', 'Ds_FOURMOMENTUMZ', 'Ds_M', 'Ds_MASS', 'Ds_MASSWITHHYPOTHESES', 'Ds_MAXDOCA', 'Ds_MAXDOCACHI2', 'Ds_MAXPT', 'Ds_MC_GD_GD_MOTHER_ID', 'Ds_MC_GD_GD_MOTHER_KEY', 'Ds_MC_GD_MOTHER_ID', 'Ds_MC_GD_MOTHER_KEY', 'Ds_MC_MOTHER_ID', 'Ds_MC_MOTHER_KEY', 'Ds_MINIP', 'Ds_MINIPCHI2', 'Ds_MINPT', 'Ds_OBJECT_KEY', 'Ds_P', 'Ds_PHI', 'Ds_PT', 'Ds_PX', 'Ds_PY', 'Ds_PZ', 'Ds_REFERENCEPOINT_X', 'Ds_REFERENCEPOINT_Y', 'Ds_REFERENCEPOINT_Z', 'Ds_SDOCA', 'Ds_SDOCACHI2', 'Ds_SUBCOMB12_MM', 'Ds_SUMPT', 'Ds_TRUEENDVERTEX_X', 'Ds_TRUEENDVERTEX_Y', 'Ds_TRUEENDVERTEX_Z', 'Ds_TRUEENERGY', 'Ds_TRUEID', 'Ds_TRUEORIGINVERTEX_X', 'Ds_TRUEORIGINVERTEX_Y', 'Ds_TRUEORIGINVERTEX_Z', 'Ds_TRUEP', 'Ds_TRUEPT', 'Ds_TRUEPX', 'Ds_TRUEPY', 'Ds_TRUEPZ', 'EVENTNUMBER', 'EVENTTYPE', 'GPSTIME', 'Kaon_ISBASIC', 'Kaon_ABS_PX', 'Kaon_ALLPVX', 'Kaon_ALLPVY', 'Kaon_ALLPVZ', 'Kaon_BPVIP', 'Kaon_BPVIPCHI2', 'Kaon_BPVX', 'Kaon_BPVY', 'Kaon_BPVZ', 'Kaon_BREMBENDCORR', 'Kaon_BREMENERGY', 'Kaon_BREMHYPODELTAX', 'Kaon_BREMHYPOENERGY', 'Kaon_BREMHYPOMATCH', 'Kaon_BREMPIDE', 'Kaon_CHARGE', 'Kaon_CHI2', 'Kaon_CHI2DOF', 'Kaon_CLUSTERMATCH', 'Kaon_DTF_BPVIPCHI2', 'Kaon_DTF_PT', 'Kaon_ECALPIDE', 'Kaon_ECALPIDMU', 'Kaon_ELECTRONENERGY', 'Kaon_ELECTRONID', 'Kaon_ELECTRONMATCH', 'Kaon_ELECTRONSHOWEREOP', 'Kaon_ENERGY', 'Kaon_ETA', 'Kaon_FOURMOMENTUME', 'Kaon_FOURMOMENTUMX', 'Kaon_FOURMOMENTUMY', 'Kaon_FOURMOMENTUMZ', 'Kaon_GHOSTPROB', 'Kaon_HASBREM', 'Kaon_HCALEOP', 'Kaon_HCALPIDE', 'Kaon_HCALPIDMU', 'Kaon_INECAL', 'Kaon_INHCAL', 'Kaon_INMUON', 'Kaon_ISMUON', 'Kaon_IS_ABS_ID_pi', 'Kaon_IS_ID_pi', 'Kaon_PDG_MASS_pi', 'Kaon_SIGNED_DELTA_MASS_pi', 'Kaon_ABS_DELTA_MASS_pi', 'Kaon_IS_NOT_H', 'Kaon_IS_PHOTON', 'Kaon_M', 'Kaon_MASS', 'Kaon_MC_GD_GD_MOTHER_ID', 'Kaon_MC_GD_GD_MOTHER_KEY', 'Kaon_MC_GD_MOTHER_ID', 'Kaon_MC_GD_MOTHER_KEY', 'Kaon_MC_MOTHER_ID', 'Kaon_MC_MOTHER_KEY', 'Kaon_MINIP', 'Kaon_MINIPCHI2', 'Kaon_NDOF', 'Kaon_NFTHITS', 'Kaon_NHITS', 'Kaon_NUTHITS', 'Kaon_NVPHITS', 'Kaon_OBJECT_KEY', 'Kaon_P', 'Kaon_PARTICLE_ID', '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_QOVERP', 'Kaon_REFERENCEPOINT_X', 'Kaon_REFERENCEPOINT_Y', 'Kaon_REFERENCEPOINT_Z', 'Kaon_SHOWER_SHAPE', 'Kaon_TRACKHASUT', 'Kaon_TRACKHASVELO', 'Kaon_TRACKHISTORY', 'Kaon_TRACKPT', 'Kaon_TRACK_MOM_X', 'Kaon_TRACK_MOM_Y', 'Kaon_TRACK_MOM_Z', 'Kaon_TRACK_POS_CLOSESTTOBEAM_X', 'Kaon_TRACK_POS_CLOSESTTOBEAM_Y', 'Kaon_TRACK_POS_CLOSESTTOBEAM_Z', 'Kaon_TRUEENERGY', 'Kaon_TRUEID', 'Kaon_TRUEP', 'Kaon_TRUEPT', 'Kaon_TRUEPX', 'Kaon_TRUEPY', 'Kaon_TRUEPZ', 'Kaon_TX', 'Kaon_TY', 'ODINTCK', 'PV_SIZE', 'RUNNUMBER', 'SpruceB2OC_BdToDsmK_DsmToHHH_FEST_LineDecision', 'Spruce_TCK', 'nPVs', 'pip_ABS_PX', 'pip_ALLPVX', 'pip_ALLPVY', 'pip_ALLPVZ', 'pip_BPVIP', 'pip_BPVIPCHI2', 'pip_BPVX', 'pip_BPVY', 'pip_BPVZ', 'pip_BREMBENDCORR', 'pip_BREMENERGY', 'pip_BREMHYPODELTAX', 'pip_BREMHYPOENERGY', 'pip_BREMHYPOMATCH', 'pip_BREMPIDE', 'pip_CHARGE', 'pip_CHI2', 'pip_CHI2DOF', 'pip_CLUSTERMATCH', 'pip_DTF_BPVIPCHI2', 'pip_DTF_PT', 'pip_ECALPIDE', 'pip_ECALPIDMU', 'pip_ELECTRONENERGY', 'pip_ELECTRONID', 'pip_ELECTRONMATCH', 'pip_ELECTRONSHOWEREOP', 'pip_ENERGY', 'pip_ETA', 'pip_FOURMOMENTUME', 'pip_FOURMOMENTUMX', 'pip_FOURMOMENTUMY', 'pip_FOURMOMENTUMZ', 'pip_GHOSTPROB', 'pip_HASBREM', 'pip_HCALEOP', 'pip_HCALPIDE', 'pip_HCALPIDMU', 'pip_INECAL', 'pip_INHCAL', 'pip_INMUON', 'pip_ISMUON', 'pip_IS_ABS_ID_pi', 'pip_IS_ID_pi',  'pip_PDG_MASS_pi', 'pip_SIGNED_DELTA_MASS_pi', 'pip_ABS_DELTA_MASS_pi', 'pip_IS_NOT_H', 'pip_IS_PHOTON', 'pip_M', 'pip_MASS', 'pip_MC_GD_GD_MOTHER_ID', 'pip_MC_GD_GD_MOTHER_KEY', 'pip_MC_GD_MOTHER_ID', 'pip_MC_GD_MOTHER_KEY', 'pip_MC_MOTHER_ID', 'pip_MC_MOTHER_KEY', 'pip_MINIP', 'pip_MINIPCHI2', 'pip_NDOF', 'pip_NFTHITS', 'pip_NHITS', 'pip_NUTHITS', 'pip_NVPHITS', 'pip_OBJECT_KEY', 'pip_P', 'pip_PARTICLE_ID', 'pip_PHI', 'pip_PID_E', 'pip_PID_K', 'pip_PID_MU', 'pip_PID_P', 'pip_PID_PI', 'pip_PROBNN_D', 'pip_PROBNN_E', 'pip_PROBNN_GHOST', 'pip_PROBNN_K', 'pip_PROBNN_MU', 'pip_PROBNN_P', 'pip_PROBNN_PI', 'pip_PT', 'pip_PX', 'pip_PY', 'pip_PZ', 'pip_QOVERP', 'pip_REFERENCEPOINT_X', 'pip_REFERENCEPOINT_Y', 'pip_REFERENCEPOINT_Z', 'pip_SHOWER_SHAPE', 'pip_TRACKHASUT', 'pip_TRACKHASVELO', 'pip_TRACKHISTORY', 'pip_TRACKPT', 'pip_TRACK_MOM_X', 'pip_TRACK_MOM_Y', 'pip_TRACK_MOM_Z', 'pip_TRACK_POS_CLOSESTTOBEAM_X', 'pip_TRACK_POS_CLOSESTTOBEAM_Y', 'pip_TRACK_POS_CLOSESTTOBEAM_Z', 'pip_TRUEENERGY', 'pip_TRUEID', 'pip_TRUEP', 'pip_TRUEPT', 'pip_TRUEPX', 'pip_TRUEPY', 'pip_TRUEPZ', 'pip_TX', 'pip_TY', 'pip_ISBASIC']
+B_vars_stored  = ['B0_ISBASIC', 'B0_ABS_PX', 'B0_ALLPVX', 'B0_ALLPVY', 'B0_ALLPVZ', 'B0_ALLPV_FD', 'B0_ALLPV_IP', 'B0_ALV', 'B0_BKGCAT', 'B0_BPVCORRM', 'B0_BPVCORRMERR', 'B0_BPVDIRA', 'B0_BPVDLS', 'B0_BPVETA', 'B0_BPVFD', 'B0_BPVFDCHI2', 'B0_BPVFDIRX', 'B0_BPVFDIRY', 'B0_BPVFDIRZ', 'B0_BPVFDVECX', 'B0_BPVFDVECY', 'B0_BPVFDVECZ', 'B0_BPVIP', 'B0_BPVIPCHI2', 'B0_BPVLTIME', 'B0_BPVVDRHO', 'B0_BPVVDX', 'B0_BPVVDY', 'B0_BPVVDZ', 'B0_BPVX', 'B0_BPVY', 'B0_BPVZ', 'B0_CHARGE', 'B0_CHI2', 'B0_CHI2DOF', 'B0_CHILD1_PT', '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_M', 'B0_MASS', 'B0_MASSWITHHYPOTHESES', 'B0_MAXDOCA', 'B0_MAXDOCACHI2', 'B0_MAXPT', 'B0_MC_GD_GD_MOTHER_ID', 'B0_MC_GD_GD_MOTHER_KEY', 'B0_MC_GD_MOTHER_ID', 'B0_MC_GD_MOTHER_KEY', 'B0_MC_ISPROMPT', 'B0_MC_LONGLIVED_ID', 'B0_MC_LONGLIVED_KEY', 'B0_MC_MOTHER_ID', 'B0_MC_MOTHER_KEY', 'B0_MINIP', 'B0_MINIPCHI2', 'B0_MINPT', 'B0_OBJECT_KEY', 'B0_P', 'B0_PHI', 'B0_PT', 'B0_PX', 'B0_PY', 'B0_PZ', 'B0_REFERENCEPOINT_X', 'B0_REFERENCEPOINT_Y', 'B0_REFERENCEPOINT_Z', 'B0_SDOCA', 'B0_SDOCACHI2', 'B0_SUBCOMB12_MM', 'B0_SUMPT', 'B0_TRUEENDVERTEX_X', 'B0_TRUEENDVERTEX_Y', 'B0_TRUEENDVERTEX_Z', 'B0_TRUEENERGY', 'B0_TRUEID', 'B0_TRUEORIGINVERTEX_X', 'B0_TRUEORIGINVERTEX_Y', 'B0_TRUEORIGINVERTEX_Z', 'B0_TRUEP', 'B0_TRUEPT', 'B0_TRUEPX', 'B0_TRUEPY', 'B0_TRUEPZ', 'BUNCHCROSSING_ID', 'BUNCHCROSSING_TYPE', 'Ds_ISBASIC', 'Ds_ABS_PX', 'Ds_ALLPVX', 'Ds_ALLPVY', 'Ds_ALLPVZ', 'Ds_ALLPV_FD', 'Ds_ALLPV_IP', 'Ds_ALV', 'Ds_BKGCAT', 'Ds_BPVCORRM', 'Ds_BPVCORRMERR', 'Ds_BPVDIRA', 'Ds_BPVDLS', 'Ds_BPVETA', 'Ds_BPVFD', 'Ds_BPVFDCHI2', 'Ds_BPVFDIRX', 'Ds_BPVFDIRY', 'Ds_BPVFDIRZ', 'Ds_BPVFDVECX', 'Ds_BPVFDVECY', 'Ds_BPVFDVECZ', 'Ds_BPVIP', 'Ds_BPVIPCHI2', 'Ds_BPVLTIME', 'Ds_BPVVDRHO', 'Ds_BPVVDX', 'Ds_BPVVDY', 'Ds_BPVVDZ', 'Ds_BPVX', 'Ds_BPVY', 'Ds_BPVZ', 'Ds_CHARGE', 'Ds_CHI2', 'Ds_CHI2DOF', 'Ds_DOCA', 'Ds_DOCACHI2', 'Ds_DTF_BPVIPCHI2', 'Ds_DTF_PT', 'Ds_END_VRHO', 'Ds_END_VX', 'Ds_END_VY', 'Ds_END_VZ', 'Ds_ENERGY', 'Ds_ETA', 'Ds_FOURMOMENTUME', 'Ds_FOURMOMENTUMX', 'Ds_FOURMOMENTUMY', 'Ds_FOURMOMENTUMZ', 'Ds_M', 'Ds_MASS', 'Ds_MASSWITHHYPOTHESES', 'Ds_MAXDOCA', 'Ds_MAXDOCACHI2', 'Ds_MAXPT', 'Ds_MC_GD_GD_MOTHER_ID', 'Ds_MC_GD_GD_MOTHER_KEY', 'Ds_MC_GD_MOTHER_ID', 'Ds_MC_GD_MOTHER_KEY', 'Ds_MC_MOTHER_ID', 'Ds_MC_MOTHER_KEY', 'Ds_MINIP', 'Ds_MINIPCHI2', 'Ds_MINPT', 'Ds_OBJECT_KEY', 'Ds_P', 'Ds_PHI', 'Ds_PT', 'Ds_PX', 'Ds_PY', 'Ds_PZ', 'Ds_REFERENCEPOINT_X', 'Ds_REFERENCEPOINT_Y', 'Ds_REFERENCEPOINT_Z', 'Ds_SDOCA', 'Ds_SDOCACHI2', 'Ds_SUBCOMB12_MM', 'Ds_SUMPT', 'Ds_TRUEENDVERTEX_X', 'Ds_TRUEENDVERTEX_Y', 'Ds_TRUEENDVERTEX_Z', 'Ds_TRUEENERGY', 'Ds_TRUEID', 'Ds_TRUEORIGINVERTEX_X', 'Ds_TRUEORIGINVERTEX_Y', 'Ds_TRUEORIGINVERTEX_Z', 'Ds_TRUEP', 'Ds_TRUEPT', 'Ds_TRUEPX', 'Ds_TRUEPY', 'Ds_TRUEPZ', 'EVENTNUMBER', 'EVENTTYPE', 'GPSTIME', 'Kaon_ISBASIC', 'Kaon_ABS_PX', 'Kaon_ALLPVX', 'Kaon_ALLPVY', 'Kaon_ALLPVZ', 'Kaon_BPVIP', 'Kaon_BPVIPCHI2', 'Kaon_BPVX', 'Kaon_BPVY', 'Kaon_BPVZ', 'Kaon_BREMBENDCORR', 'Kaon_BREMENERGY', 'Kaon_BREMHYPODELTAX', 'Kaon_BREMHYPOENERGY', 'Kaon_BREMHYPOMATCH', 'Kaon_BREMPIDE', 'Kaon_CHARGE', 'Kaon_CHI2', 'Kaon_CHI2DOF', 'Kaon_CLUSTERMATCH', 'Kaon_DTF_BPVIPCHI2', 'Kaon_DTF_PT', 'Kaon_ECALPIDE', 'Kaon_ECALPIDMU', 'Kaon_ELECTRONENERGY', 'Kaon_ELECTRONID', 'Kaon_ELECTRONMATCH', 'Kaon_ELECTRONSHOWEREOP', 'Kaon_ENERGY', 'Kaon_ETA', 'Kaon_FOURMOMENTUME', 'Kaon_FOURMOMENTUMX', 'Kaon_FOURMOMENTUMY', 'Kaon_FOURMOMENTUMZ', 'Kaon_GHOSTPROB', 'Kaon_HASBREM', 'Kaon_HCALEOP', 'Kaon_HCALPIDE', 'Kaon_HCALPIDMU', 'Kaon_INECAL', 'Kaon_INHCAL', 'Kaon_INMUON', 'Kaon_ISMUON', 'Kaon_IS_ABS_ID_pi', 'Kaon_IS_ID_pi', 'Kaon_PDG_MASS_pi', 'Kaon_SIGNED_DELTA_MASS_pi', 'Kaon_ABS_DELTA_MASS_pi', 'Kaon_IS_NOT_H', 'Kaon_IS_PHOTON', 'Kaon_M', 'Kaon_MASS', 'Kaon_MC_GD_GD_MOTHER_ID', 'Kaon_MC_GD_GD_MOTHER_KEY', 'Kaon_MC_GD_MOTHER_ID', 'Kaon_MC_GD_MOTHER_KEY', 'Kaon_MC_MOTHER_ID', 'Kaon_MC_MOTHER_KEY', 'Kaon_MINIP', 'Kaon_MINIPCHI2', 'Kaon_NDOF', 'Kaon_NFTHITS', 'Kaon_NHITS', 'Kaon_NUTHITS', 'Kaon_NVPHITS', 'Kaon_OBJECT_KEY', 'Kaon_P', 'Kaon_PARTICLE_ID', '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_QOVERP', 'Kaon_REFERENCEPOINT_X', 'Kaon_REFERENCEPOINT_Y', 'Kaon_REFERENCEPOINT_Z', 'Kaon_SHOWER_SHAPE', 'Kaon_TRACKHASUT', 'Kaon_TRACKHASVELO', 'Kaon_TRACKHISTORY', 'Kaon_TRACKPT', 'Kaon_TRACK_MOM_X', 'Kaon_TRACK_MOM_Y', 'Kaon_TRACK_MOM_Z', 'Kaon_TRACK_POS_CLOSESTTOBEAM_X', 'Kaon_TRACK_POS_CLOSESTTOBEAM_Y', 'Kaon_TRACK_POS_CLOSESTTOBEAM_Z', 'Kaon_TRUEENERGY', 'Kaon_TRUEID', 'Kaon_TRUEP', 'Kaon_TRUEPT', 'Kaon_TRUEPX', 'Kaon_TRUEPY', 'Kaon_TRUEPZ', 'Kaon_TX', 'Kaon_TY', 'ODINTCK', 'PV_SIZE', 'RUNNUMBER', 'SpruceB2OC_BdToDsmK_DsmToHHH_FESTDecision', 'Spruce_TCK', 'nPVs', 'pip_ABS_PX', 'pip_ALLPVX', 'pip_ALLPVY', 'pip_ALLPVZ', 'pip_BPVIP', 'pip_BPVIPCHI2', 'pip_BPVX', 'pip_BPVY', 'pip_BPVZ', 'pip_BREMBENDCORR', 'pip_BREMENERGY', 'pip_BREMHYPODELTAX', 'pip_BREMHYPOENERGY', 'pip_BREMHYPOMATCH', 'pip_BREMPIDE', 'pip_CHARGE', 'pip_CHI2', 'pip_CHI2DOF', 'pip_CLUSTERMATCH', 'pip_DTF_BPVIPCHI2', 'pip_DTF_PT', 'pip_ECALPIDE', 'pip_ECALPIDMU', 'pip_ELECTRONENERGY', 'pip_ELECTRONID', 'pip_ELECTRONMATCH', 'pip_ELECTRONSHOWEREOP', 'pip_ENERGY', 'pip_ETA', 'pip_FOURMOMENTUME', 'pip_FOURMOMENTUMX', 'pip_FOURMOMENTUMY', 'pip_FOURMOMENTUMZ', 'pip_GHOSTPROB', 'pip_HASBREM', 'pip_HCALEOP', 'pip_HCALPIDE', 'pip_HCALPIDMU', 'pip_INECAL', 'pip_INHCAL', 'pip_INMUON', 'pip_ISMUON', 'pip_IS_ABS_ID_pi', 'pip_IS_ID_pi',  'pip_PDG_MASS_pi', 'pip_SIGNED_DELTA_MASS_pi', 'pip_ABS_DELTA_MASS_pi', 'pip_IS_NOT_H', 'pip_IS_PHOTON', 'pip_M', 'pip_MASS', 'pip_MC_GD_GD_MOTHER_ID', 'pip_MC_GD_GD_MOTHER_KEY', 'pip_MC_GD_MOTHER_ID', 'pip_MC_GD_MOTHER_KEY', 'pip_MC_MOTHER_ID', 'pip_MC_MOTHER_KEY', 'pip_MINIP', 'pip_MINIPCHI2', 'pip_NDOF', 'pip_NFTHITS', 'pip_NHITS', 'pip_NUTHITS', 'pip_NVPHITS', 'pip_OBJECT_KEY', 'pip_P', 'pip_PARTICLE_ID', 'pip_PHI', 'pip_PID_E', 'pip_PID_K', 'pip_PID_MU', 'pip_PID_P', 'pip_PID_PI', 'pip_PROBNN_D', 'pip_PROBNN_E', 'pip_PROBNN_GHOST', 'pip_PROBNN_K', 'pip_PROBNN_MU', 'pip_PROBNN_P', 'pip_PROBNN_PI', 'pip_PT', 'pip_PX', 'pip_PY', 'pip_PZ', 'pip_QOVERP', 'pip_REFERENCEPOINT_X', 'pip_REFERENCEPOINT_Y', 'pip_REFERENCEPOINT_Z', 'pip_SHOWER_SHAPE', 'pip_TRACKHASUT', 'pip_TRACKHASVELO', 'pip_TRACKHISTORY', 'pip_TRACKPT', 'pip_TRACK_MOM_X', 'pip_TRACK_MOM_Y', 'pip_TRACK_MOM_Z', 'pip_TRACK_POS_CLOSESTTOBEAM_X', 'pip_TRACK_POS_CLOSESTTOBEAM_Y', 'pip_TRACK_POS_CLOSESTTOBEAM_Z', 'pip_TRUEENERGY', 'pip_TRUEID', 'pip_TRUEP', 'pip_TRUEPT', 'pip_TRUEPX', 'pip_TRUEPY', 'pip_TRUEPZ', 'pip_TX', 'pip_TY', 'pip_ISBASIC']
 B_vars_stored += ['Ds_DTF_TAUERR', 'Ds_DTF_MASSERR', 'Ds_DTF_FDERR', 'B0_DTF_MASS', 'B0_DTF_PERR', 'B0_DTF_TAUERR', 'Ds_DTF_PERR', 'Ds_DTF_MASS', 'B0_DTF_TAU', 'B0_DTF_NDOF', 'B0_DTF_MASSERR', 'Ds_DTF_TAU', 'Ds_DTF_FD', 'B0_DTF_CHI2', 'B0_DTF_FD', 'B0_DTF_NITER', 'Ds_DTF_P', 'B0_DTF_FDERR', 'B0_DTF_CHI2DOF', 'B0_DTF_P']
 
 #sort the expected vars

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

-<?xml version="1.0" ?>
-<!--
-###############################################################################
-# (c) Copyright 2021-2023 CERN for the benefit of the LHCb Collaboration      #
-#                                                                             #
-# This software is distributed under the terms of the GNU General Public      #
-# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
-#                                                                             #
-# In applying this licence, CERN does not waive the privileges and immunities #
-# granted to it by virtue of its status as an Intergovernmental Organization  #
-# or submit itself to any jurisdiction.                                       #
-###############################################################################
--->
-<!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: pkoppenb
-# Purpose: Test for All functors
-# Prerequisites: None
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
-  <argument name="program"><text>lbexec</text></argument>
-  <!-- Minimum bias dst processed using topo {2,3} hlt2 lines and all sprucing lines -->
-  <argument name="extra_options_yaml"><text>
-    input_files:
-      - root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtimereco_newPacking.dst'
-    annsvc_config: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtime_newPacking.tck.json'
-    data_type: Upgrade
-    input_type: ROOT
-    simulation: true
-    conddb_tag: sim-20171127-vc-md100
-    dddb_tag: dddb-20171126
-    conditions_version: master
-    geometry_version: trunk
-    input_raw_format: 0.3
-    lumi: false
-    ntuple_file: 'DV_example_allFunctors_ntp_old.root'
-    print_freq: 1
-    input_process: Spruce
-    input_stream: default
-  </text></argument>
-  <argument name="timeout"><integer>1000</integer></argument>
-  <argument name="args"><set>
-  <text>DaVinciExamples.tupling.AllFunctors:alg_config</text>
-  </set></argument>
-<argument name="validator"><text>
-from PyConf.components import findRootObjByDir
-
-findReferenceBlock("""B0DsK_Tuple                         SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections"""
-, stdout, result, causes, signature_offset = 0)
-
-countErrorLines({"FATAL":0, "ERROR":20})
-
-import sys, os, glob
-from ROOT import TFile
-
-B_vars_stored  = ['B0_ISBASIC', 'B0_ABS_PX', 'B0_ALLPVX', 'B0_ALLPVY', 'B0_ALLPVZ', 'B0_ALLPV_FD', 'B0_ALLPV_IP', 'B0_ALV', 'B0_BKGCAT', 'B0_BPVCORRM', 'B0_BPVCORRMERR', 'B0_BPVDIRA', 'B0_BPVDLS', 'B0_BPVETA', 'B0_BPVFD', 'B0_BPVFDCHI2', 'B0_BPVFDIRX', 'B0_BPVFDIRY', 'B0_BPVFDIRZ', 'B0_BPVFDVECX', 'B0_BPVFDVECY', 'B0_BPVFDVECZ', 'B0_BPVIP', 'B0_BPVIPCHI2', 'B0_BPVLTIME', 'B0_BPVVDRHO', 'B0_BPVVDX', 'B0_BPVVDY', 'B0_BPVVDZ', 'B0_BPVX', 'B0_BPVY', 'B0_BPVZ', 'B0_CHARGE', 'B0_CHI2', 'B0_CHI2DOF', 'B0_CHILD1_PT', '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_M', 'B0_MASS', 'B0_MASSWITHHYPOTHESES', 'B0_MAXDOCA', 'B0_MAXDOCACHI2', 'B0_MAXPT', 'B0_MC_GD_GD_MOTHER_ID', 'B0_MC_GD_GD_MOTHER_KEY', 'B0_MC_GD_MOTHER_ID', 'B0_MC_GD_MOTHER_KEY', 'B0_MC_ISPROMPT', 'B0_MC_LONGLIVED_ID', 'B0_MC_LONGLIVED_KEY', 'B0_MC_MOTHER_ID', 'B0_MC_MOTHER_KEY', 'B0_MINIP', 'B0_MINIPCHI2', 'B0_MINPT', 'B0_OBJECT_KEY', 'B0_P', 'B0_PHI', 'B0_PT', 'B0_PX', 'B0_PY', 'B0_PZ', 'B0_REFERENCEPOINT_X', 'B0_REFERENCEPOINT_Y', 'B0_REFERENCEPOINT_Z', 'B0_SDOCA', 'B0_SDOCACHI2', 'B0_SUBCOMB12_MM', 'B0_SUMPT', 'B0_TRUEENDVERTEX_X', 'B0_TRUEENDVERTEX_Y', 'B0_TRUEENDVERTEX_Z', 'B0_TRUEENERGY', 'B0_TRUEID', 'B0_TRUEORIGINVERTEX_X', 'B0_TRUEORIGINVERTEX_Y', 'B0_TRUEORIGINVERTEX_Z', 'B0_TRUEP', 'B0_TRUEPT', 'B0_TRUEPX', 'B0_TRUEPY', 'B0_TRUEPZ', 'BUNCHCROSSING_ID', 'BUNCHCROSSING_TYPE', 'Ds_ISBASIC', 'Ds_ABS_PX', 'Ds_ALLPVX', 'Ds_ALLPVY', 'Ds_ALLPVZ', 'Ds_ALLPV_FD', 'Ds_ALLPV_IP', 'Ds_ALV', 'Ds_BKGCAT', 'Ds_BPVCORRM', 'Ds_BPVCORRMERR', 'Ds_BPVDIRA', 'Ds_BPVDLS', 'Ds_BPVETA', 'Ds_BPVFD', 'Ds_BPVFDCHI2', 'Ds_BPVFDIRX', 'Ds_BPVFDIRY', 'Ds_BPVFDIRZ', 'Ds_BPVFDVECX', 'Ds_BPVFDVECY', 'Ds_BPVFDVECZ', 'Ds_BPVIP', 'Ds_BPVIPCHI2', 'Ds_BPVLTIME', 'Ds_BPVVDRHO', 'Ds_BPVVDX', 'Ds_BPVVDY', 'Ds_BPVVDZ', 'Ds_BPVX', 'Ds_BPVY', 'Ds_BPVZ', 'Ds_CHARGE', 'Ds_CHI2', 'Ds_CHI2DOF', 'Ds_DOCA', 'Ds_DOCACHI2', 'Ds_DTF_BPVIPCHI2', 'Ds_DTF_PT', 'Ds_END_VRHO', 'Ds_END_VX', 'Ds_END_VY', 'Ds_END_VZ', 'Ds_ENERGY', 'Ds_ETA', 'Ds_FOURMOMENTUME', 'Ds_FOURMOMENTUMX', 'Ds_FOURMOMENTUMY', 'Ds_FOURMOMENTUMZ', 'Ds_M', 'Ds_MASS', 'Ds_MASSWITHHYPOTHESES', 'Ds_MAXDOCA', 'Ds_MAXDOCACHI2', 'Ds_MAXPT', 'Ds_MC_GD_GD_MOTHER_ID', 'Ds_MC_GD_GD_MOTHER_KEY', 'Ds_MC_GD_MOTHER_ID', 'Ds_MC_GD_MOTHER_KEY', 'Ds_MC_MOTHER_ID', 'Ds_MC_MOTHER_KEY', 'Ds_MINIP', 'Ds_MINIPCHI2', 'Ds_MINPT', 'Ds_OBJECT_KEY', 'Ds_P', 'Ds_PHI', 'Ds_PT', 'Ds_PX', 'Ds_PY', 'Ds_PZ', 'Ds_REFERENCEPOINT_X', 'Ds_REFERENCEPOINT_Y', 'Ds_REFERENCEPOINT_Z', 'Ds_SDOCA', 'Ds_SDOCACHI2', 'Ds_SUBCOMB12_MM', 'Ds_SUMPT', 'Ds_TRUEENDVERTEX_X', 'Ds_TRUEENDVERTEX_Y', 'Ds_TRUEENDVERTEX_Z', 'Ds_TRUEENERGY', 'Ds_TRUEID', 'Ds_TRUEORIGINVERTEX_X', 'Ds_TRUEORIGINVERTEX_Y', 'Ds_TRUEORIGINVERTEX_Z', 'Ds_TRUEP', 'Ds_TRUEPT', 'Ds_TRUEPX', 'Ds_TRUEPY', 'Ds_TRUEPZ', 'EVENTNUMBER', 'EVENTTYPE', 'GPSTIME', 'Kaon_ISBASIC', 'Kaon_ABS_PX', 'Kaon_ALLPVX', 'Kaon_ALLPVY', 'Kaon_ALLPVZ', 'Kaon_BPVIP', 'Kaon_BPVIPCHI2', 'Kaon_BPVX', 'Kaon_BPVY', 'Kaon_BPVZ', 'Kaon_BREMBENDCORR', 'Kaon_BREMENERGY', 'Kaon_BREMHYPODELTAX', 'Kaon_BREMHYPOENERGY', 'Kaon_BREMHYPOMATCH', 'Kaon_BREMPIDE', 'Kaon_CHARGE', 'Kaon_CHI2', 'Kaon_CHI2DOF', 'Kaon_CLUSTERMATCH', 'Kaon_DTF_BPVIPCHI2', 'Kaon_DTF_PT', 'Kaon_ECALPIDE', 'Kaon_ECALPIDMU', 'Kaon_ELECTRONENERGY', 'Kaon_ELECTRONID', 'Kaon_ELECTRONMATCH', 'Kaon_ELECTRONSHOWEREOP', 'Kaon_ENERGY', 'Kaon_ETA', 'Kaon_FOURMOMENTUME', 'Kaon_FOURMOMENTUMX', 'Kaon_FOURMOMENTUMY', 'Kaon_FOURMOMENTUMZ', 'Kaon_GHOSTPROB', 'Kaon_HASBREM', 'Kaon_HCALEOP', 'Kaon_HCALPIDE', 'Kaon_HCALPIDMU', 'Kaon_INECAL', 'Kaon_INHCAL', 'Kaon_INMUON', 'Kaon_ISMUON', 'Kaon_IS_ABS_ID_pi', 'Kaon_IS_ID_pi', 'Kaon_PDG_MASS_pi', 'Kaon_SIGNED_DELTA_MASS_pi', 'Kaon_ABS_DELTA_MASS_pi', 'Kaon_IS_NOT_H', 'Kaon_IS_PHOTON', 'Kaon_M', 'Kaon_MASS', 'Kaon_MC_GD_GD_MOTHER_ID', 'Kaon_MC_GD_GD_MOTHER_KEY', 'Kaon_MC_GD_MOTHER_ID', 'Kaon_MC_GD_MOTHER_KEY', 'Kaon_MC_MOTHER_ID', 'Kaon_MC_MOTHER_KEY', 'Kaon_MINIP', 'Kaon_MINIPCHI2', 'Kaon_NDOF', 'Kaon_NFTHITS', 'Kaon_NHITS', 'Kaon_NUTHITS', 'Kaon_NVPHITS', 'Kaon_OBJECT_KEY', 'Kaon_P', 'Kaon_PARTICLE_ID', '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_QOVERP', 'Kaon_REFERENCEPOINT_X', 'Kaon_REFERENCEPOINT_Y', 'Kaon_REFERENCEPOINT_Z', 'Kaon_SHOWER_SHAPE', 'Kaon_TRACKHASUT', 'Kaon_TRACKHASVELO', 'Kaon_TRACKHISTORY', 'Kaon_TRACKPT', 'Kaon_TRACK_MOM_X', 'Kaon_TRACK_MOM_Y', 'Kaon_TRACK_MOM_Z', 'Kaon_TRACK_POS_CLOSESTTOBEAM_X', 'Kaon_TRACK_POS_CLOSESTTOBEAM_Y', 'Kaon_TRACK_POS_CLOSESTTOBEAM_Z', 'Kaon_TRUEENERGY', 'Kaon_TRUEID', 'Kaon_TRUEP', 'Kaon_TRUEPT', 'Kaon_TRUEPX', 'Kaon_TRUEPY', 'Kaon_TRUEPZ', 'Kaon_TX', 'Kaon_TY', 'ODINTCK', 'PV_SIZE', 'RUNNUMBER', 'SpruceB2OC_BdToDsmK_DsmToHHH_FEST_LineDecision', 'Spruce_TCK', 'nPVs', 'pip_ABS_PX', 'pip_ALLPVX', 'pip_ALLPVY', 'pip_ALLPVZ', 'pip_BPVIP', 'pip_BPVIPCHI2', 'pip_BPVX', 'pip_BPVY', 'pip_BPVZ', 'pip_BREMBENDCORR', 'pip_BREMENERGY', 'pip_BREMHYPODELTAX', 'pip_BREMHYPOENERGY', 'pip_BREMHYPOMATCH', 'pip_BREMPIDE', 'pip_CHARGE', 'pip_CHI2', 'pip_CHI2DOF', 'pip_CLUSTERMATCH', 'pip_DTF_BPVIPCHI2', 'pip_DTF_PT', 'pip_ECALPIDE', 'pip_ECALPIDMU', 'pip_ELECTRONENERGY', 'pip_ELECTRONID', 'pip_ELECTRONMATCH', 'pip_ELECTRONSHOWEREOP', 'pip_ENERGY', 'pip_ETA', 'pip_FOURMOMENTUME', 'pip_FOURMOMENTUMX', 'pip_FOURMOMENTUMY', 'pip_FOURMOMENTUMZ', 'pip_GHOSTPROB', 'pip_HASBREM', 'pip_HCALEOP', 'pip_HCALPIDE', 'pip_HCALPIDMU', 'pip_INECAL', 'pip_INHCAL', 'pip_INMUON', 'pip_ISMUON', 'pip_IS_ABS_ID_pi', 'pip_IS_ID_pi', 'pip_PDG_MASS_pi', 'pip_SIGNED_DELTA_MASS_pi', 'pip_ABS_DELTA_MASS_pi', 'pip_IS_NOT_H', 'pip_IS_PHOTON', 'pip_M', 'pip_MASS', 'pip_MC_GD_GD_MOTHER_ID', 'pip_MC_GD_GD_MOTHER_KEY', 'pip_MC_GD_MOTHER_ID', 'pip_MC_GD_MOTHER_KEY', 'pip_MC_MOTHER_ID', 'pip_MC_MOTHER_KEY', 'pip_MINIP', 'pip_MINIPCHI2', 'pip_NDOF', 'pip_NFTHITS', 'pip_NHITS', 'pip_NUTHITS', 'pip_NVPHITS', 'pip_OBJECT_KEY', 'pip_P', 'pip_PARTICLE_ID', 'pip_PHI', 'pip_PID_E', 'pip_PID_K', 'pip_PID_MU', 'pip_PID_P', 'pip_PID_PI', 'pip_PROBNN_D', 'pip_PROBNN_E', 'pip_PROBNN_GHOST', 'pip_PROBNN_K', 'pip_PROBNN_MU', 'pip_PROBNN_P', 'pip_PROBNN_PI', 'pip_PT', 'pip_PX', 'pip_PY', 'pip_PZ', 'pip_QOVERP', 'pip_REFERENCEPOINT_X', 'pip_REFERENCEPOINT_Y', 'pip_REFERENCEPOINT_Z', 'pip_SHOWER_SHAPE', 'pip_TRACKHASUT', 'pip_TRACKHASVELO', 'pip_TRACKHISTORY', 'pip_TRACKPT', 'pip_TRACK_MOM_X', 'pip_TRACK_MOM_Y', 'pip_TRACK_MOM_Z', 'pip_TRACK_POS_CLOSESTTOBEAM_X', 'pip_TRACK_POS_CLOSESTTOBEAM_Y', 'pip_TRACK_POS_CLOSESTTOBEAM_Z', 'pip_TRUEENERGY', 'pip_TRUEID', 'pip_TRUEP', 'pip_TRUEPT', 'pip_TRUEPX', 'pip_TRUEPY', 'pip_TRUEPZ', 'pip_TX', 'pip_TY', 'pip_ISBASIC']
-B_vars_stored += ['Ds_DTF_TAUERR', 'Ds_DTF_MASSERR', 'Ds_DTF_FDERR', 'B0_DTF_MASS', 'B0_DTF_PERR', 'B0_DTF_TAUERR', 'Ds_DTF_PERR', 'Ds_DTF_MASS', 'B0_DTF_TAU', 'B0_DTF_NDOF', 'B0_DTF_MASSERR', 'Ds_DTF_TAU', 'Ds_DTF_FD', 'B0_DTF_CHI2', 'B0_DTF_FD', 'B0_DTF_NITER', 'Ds_DTF_P', 'B0_DTF_FDERR', 'B0_DTF_CHI2DOF', 'B0_DTF_P']
-
-#sort the expected vars
-B_vars_stored = sorted(B_vars_stored)
-
-#open the TFile and TTree
-ntuple = './DV_example_allFunctors_ntp_old.root'
-if not os.path.isfile(ntuple):
-    causes.append(f"File {ntuple} does not exist!")
-f      = TFile.Open(ntuple)
-t_B    = findRootObjByDir(f, 'B0DsK_Tuple', 'DecayTree')
-
-#sort the stores vars
-b_names = sorted([b.GetName() for b in t_B.GetListOfLeaves()])
-
-B_excluded_1 = set(B_vars_stored) - set(b_names)
-B_excluded_2 = set(b_names) - set(B_vars_stored)
-if len(B_excluded_1) != 0:
-    causes.append(f"Number of stored variables is less than what is expected. The extra variables expected are: {B_excluded_1}")
-if len(B_excluded_2) != 0:
-    causes.append(f"Number of stored variables is greater than what is expected. The extra variables stored are: {B_excluded_2}")
-f.Close()
-
-# Check there are no NaN values in the ntuple except where expected.
-from DaVinciTests.QMTest.check_helpers import list_fields_with_nan
-
-l_branches_with_nans =  ['B0_TRUEP', 'B0_TRUEPT', 'B0_TRUEPX', 'B0_TRUEPY', 'B0_TRUEPZ', 'B0_TRUEENERGY', 'B0_TRUEORIGINVERTEX_X', 'B0_TRUEORIGINVERTEX_Y', 'B0_TRUEORIGINVERTEX_Z', 'B0_TRUEENDVERTEX_X', 'B0_TRUEENDVERTEX_Y', 'B0_TRUEENDVERTEX_Z', 'Kaon_PROBNN_D', 'Kaon_PROBNN_MU', 'Kaon_TRUEP', 'Kaon_TRUEPT', 'Kaon_TRUEPX', 'Kaon_TRUEPY', 'Kaon_TRUEPZ', 'Kaon_TRUEENERGY', 'Kaon_BREMENERGY', 'Kaon_BREMBENDCORR', 'Kaon_BREMPIDE', 'Kaon_ECALPIDE', 'Kaon_ECALPIDMU', 'Kaon_HCALPIDE', 'Kaon_HCALPIDMU', 'Kaon_ELECTRONSHOWEREOP', 'Kaon_CLUSTERMATCH', 'Kaon_ELECTRONMATCH', 'Kaon_BREMHYPOMATCH', 'Kaon_ELECTRONENERGY', 'Kaon_BREMHYPOENERGY', 'Kaon_BREMHYPODELTAX', 'Kaon_ELECTRONID', 'Kaon_HCALEOP', 'Ds_TRUEP', 'Ds_TRUEPT', 'Ds_TRUEPX', 'Ds_TRUEPY', 'Ds_TRUEPZ', 'Ds_TRUEENERGY', 'Ds_TRUEORIGINVERTEX_X', 'Ds_TRUEORIGINVERTEX_Y', 'Ds_TRUEORIGINVERTEX_Z', 'Ds_TRUEENDVERTEX_X', 'Ds_TRUEENDVERTEX_Y', 'Ds_TRUEENDVERTEX_Z', 'Ds_BPVCORRMERR', 'Ds_BPVLTIME', 'Ds_MASSWITHHYPOTHESES', 'pip_PROBNN_D', 'pip_PROBNN_MU', 'pip_TRUEP', 'pip_TRUEPT', 'pip_TRUEPX', 'pip_TRUEPY', 'pip_TRUEPZ', 'pip_TRUEENERGY', 'pip_BREMENERGY', 'pip_BREMBENDCORR', 'pip_BREMPIDE', 'pip_ECALPIDE', 'pip_ECALPIDMU', 'pip_HCALPIDE', 'pip_HCALPIDMU', 'pip_ELECTRONSHOWEREOP', 'pip_CLUSTERMATCH', 'pip_ELECTRONMATCH', 'pip_BREMHYPOMATCH', 'pip_ELECTRONENERGY', 'pip_BREMHYPOENERGY', 'pip_BREMHYPODELTAX', 'pip_ELECTRONID', 'pip_HCALEOP']
-
-l_test = list_fields_with_nan("DV_example_allFunctors_ntp_old.root", "B0DsK_Tuple/DecayTree")
-if sorted(l_test) != sorted(l_branches_with_nans):
-    causes.append("Unexpected list of branches with NaN values")
-
-print('Test successfully completed!')
-os.system(f"rm {ntuple}")
-</text></argument>
-</extension>

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

@@ -37,7 +37,7 @@ B_vars_stored = ['Bs_DTF_AllPVs_CHI2', 'Bs_DTF_AllPVs_CHI2DOF', 'Bs_DTF_AllPVs_F
 
 # The hash is got from DaVinci/v63r6 with 5 significant digit
 #                      dd4hep platform       desc platform
-expected_chi2_hashs = [-6712918245859272476, -5204790546497831928]
+expected_chi2_hashs = [-6712918245859272476, -8420881755086790226]
 
 #sort the expected vars
 B_vars_stored = sorted(B_vars_stored)

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

-<?xml version="1.0" ?>
-<!--
-###############################################################################
-# (c) Copyright 2022 CERN for the benefit of the LHCb Collaboration           #
-#                                                                             #
-# This software is distributed under the terms of the GNU General Public      #
-# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
-#                                                                             #
-# In applying this licence, CERN does not waive the privileges and immunities #
-# granted to it by virtue of its status as an Intergovernmental Organization  #
-# or submit itself to any jurisdiction.                                       #
-###############################################################################
--->
-<!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
-<extension class="GaudiTest.GaudiExeTest" kind="test">
-  <argument name="program"><text>lbexec</text></argument>
-  <argument name="args"><set>
-    <text>DaVinciExamples.tupling.option_davinci_tupling_from_data:main</text>
-  </set></argument>
-  <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/Spruce_Run251342.yaml</text></argument>
-  <argument name="reference"><text>../refs/test_davinci_tupling_from_data.ref</text></argument>
-  <argument name="error_reference"><text>../refs/empty.ref</text></argument>
-  <argument name="validator"><text>
-from DaVinciTests.QMTest.DaVinciExclusions import preprocessor, counter_preprocessor
-validateWithReference(preproc = preprocessor, counter_preproc = counter_preprocessor)
-countErrorLines({"FATAL":0, "ERROR":0})
-  </text></argument>
-  <argument name="validator"><text>
-from PyConf.components import findRootObjByDir
-
-findReferenceBlock("""Tuple_KS2PiPi                       SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections"""
-, stdout, result, causes, signature_offset = 0)
-
-import sys, os, glob
-from ROOT import TFile
-#open the TFile and TTree
-ntuple = './Spruce_DV_Ks_example.root'
-if not os.path.isfile(ntuple): raise Exception(f"File: {ntuple} does not exist!")
-f      = TFile.Open(ntuple)
-t_B    = findRootObjByDir(f, 'Tuple_KS2PiPi', 'DecayTree')
-
-b_names= [b.GetName() for b in t_B.GetListOfLeaves()]
-if not b_names: raise Exception(f"File: {ntuple} does not contain any branches. Please check.")
-f.Close()
-print('Test successfully completed!')
-
-os.system(f"rm {ntuple}")
-countErrorLines({"FATAL":0, "ERROR":0})
-  </text></argument>
-
-</extension>

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

@@ -17,7 +17,7 @@
   <argument name="args"><set>
     <text>DaVinciExamples.tupling.option_davinci_tupling_relation_isovariables:main</text>
   </set></argument>
-  <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/spruce_b2jpsik_opt.yaml</text></argument>
+  <argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/test_passthrough_thor_lines.yaml</text></argument>
   <argument name="extra_options_yaml"><text>
     input_type: ROOT
     evt_max: 100

DaVinciTests/python/DaVinciTests/filters.py

@@ -17,10 +17,10 @@ from DaVinci import Options, make_config
 
 def main(options: Options):
     filter_B0DsK = create_lines_filter(
-        "HDRFilter_B0DsK", lines=["SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line"]
+        "HDRFilter_B0DsK", lines=["SpruceB2OC_BdToDsmK_DsmToHHH_FEST"]
     )
     filter_B0Dspi = create_lines_filter(
-        "HDRFilter_B0Dspi", lines=["SpruceB2OC_BdToDsmPi_DsmToHHH_Line"]
+        "HDRFilter_B0Dspi", lines=["SpruceB2OC_BdToDsmPi_DsmToKpKmPim"]
     )
 
     algs = {"B0DsK": [filter_B0DsK], "B0Dspi": [filter_B0Dspi]}

DaVinciTests/python/DaVinciTests/funtuple_array.py

@@ -22,7 +22,7 @@ from DaVinci import Options, make_config
 
 
 def main(options: Options):
-    bd2dsk_line = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line"
+    bd2dsk_line = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST"
     bd2dsk_data = get_particles(f"/Event/Spruce/{bd2dsk_line}/Particles")
 
     # In this test we want to save the information regarding long pions available in the event

DaVinciTests/python/DaVinciTests/recVertices.py

@@ -20,7 +20,7 @@ from DaVinci import Options, make_config
 
 
 def main(options: Options):
-    bd2dsk_line = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line"
+    bd2dsk_line = "SpruceB2OC_BdToDsmK_DsmToHHH_FEST"
     bd2dsk_data = get_particles(f"/Event/Spruce/{bd2dsk_line}/Particles")
 
     fields_dsk = {

DaVinciTutorials/python/DaVinciTutorials/tutorial0_basic_DVjob.py

@@ -29,7 +29,7 @@ def main(options: Options):
     # For the TES path checkout spruce_passthrough.tck.json or you can do a dst dump
     # (see https://lhcb.github.io/starterkit-lessons/first-analysis-steps/interactive-dst.html)
     #
-    turbo_line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    turbo_line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     input_data = get_particles(f"/Event/HLT2/{turbo_line}/Particles")
 
     # Add a filter: We are not really filtering over particles