diff --git a/DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml b/DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml
deleted file mode 100644
index 7ee525644cd479eba99b84d15de837c4745cc36e..0000000000000000000000000000000000000000
--- a/DaVinciExamples/example_data/spruce_b2jpsik_opt.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-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
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py b/DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py
index fbf69124c28e432333aa566cd985b6f83e44722b..04a6ef551ae624c9d289965c02350ac76ced9ffc 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py
+++ b/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"
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_configFuntuple.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_configFuntuple.py
index 15f826d1ef9165170d3bc7342aba3d64012ef434..985721f628c706904edf9236067f338dbcf7b589 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_configFuntuple.py
+++ b/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')"],
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_pvs.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_pvs.py
index 462c05626176623cfdd7fbe5db759fe22052ca9b..b3076a9c4fdc66881cd677758f7eed5b3f0d5855 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_pvs.py
+++ b/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])
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py
index 9aecea2afd69d77d62d78e25e78ac17ae8408eb6..ca25ddcf4b37bb904d909c2f8177fddcbba16ba1 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_DTF_substitutePID.py
+++ b/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}"])
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_passthrough.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_passthrough.py
index 2c236058c8152d8b5751c079a4db24c129a6cef5..b870c2992ca2e09f37ea2f380e51da3b96f2dd15 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_passthrough.py
+++ b/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",
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_spruce.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_spruce.py
index aea114796e6238d3bbd9cade31210b86e35abb94..aac4a432d2a2588d038405fae9e9462a5c76aee5 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_spruce.py
+++ b/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")
 
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_relation_isovariables.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_relation_isovariables.py
index 90cb4870970b244f33d86da7a943afb8658a0bb7..a699c4f3c775af8834e9609e4f26c1b4426415eb 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_relation_isovariables.py
+++ b/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",
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py
index 705f48141fa6d69cd66f68c04408f126fd19ff47..6a3a3fd5656f811fd096d016bae00fb3c5a4f0c9 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py
+++ b/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
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt
index 8f3155424cda1c9e2bda348623cfa0be6bc71574..b4f23b35995aa306a8913f61adb893307ca9dd32 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt
+++ b/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
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_olddst.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_olddst.qmt
deleted file mode 100755
index ee6b673d2f7c1c44098b9a5d0c00be8c407b3c53..0000000000000000000000000000000000000000
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_olddst.qmt
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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>
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_pvs.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_pvs.qmt
index 377664facfafee4bb21e18beedcb3c10502e0985..3e39402c0c1c12bd0ac35187a0069c8dfc9533ba 100644
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_pvs.qmt
+++ b/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)
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_data.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_data.qmt
deleted file mode 100644
index 14e7a0a0a63c3c1a922825b399d10c09ee05f404..0000000000000000000000000000000000000000
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_from_data.qmt
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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>
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_relation_isovariables.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_relation_isovariables.qmt
index 0294af92add006738db0e9d22049656c80a8d71c..f1e96f4f8bd19c98545e01a0d3a1673313acf737 100644
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_relation_isovariables.qmt
+++ b/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
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_data.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_data.ref
deleted file mode 100644
index daab7ae91a894287fc0a3de79718df89951cfb25..0000000000000000000000000000000000000000
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_data.ref
+++ /dev/null
@@ -1,476 +0,0 @@
-ApplicationMgr    SUCCESS
-====================================================================================================================================
-                                                   Welcome to DaVinci_Tests version 0
-                                          running on lxplus700.cern.ch on Thu Nov 10 20:07:10 2022
-====================================================================================================================================
-ApplicationMgr       INFO Application Manager Configured successfully
-ToolSvc.GitDDDB                        INFO opening Git repository '/cvmfs/lhcb.cern.ch/lib/lhcb/git-conddb/DDDB.git'
-ToolSvc.GitDDDB                        INFO using commit 'upgrade/master' corresponding to 183db2b407a65b09956f91577b0b3ed38cb27f9e
-ToolSvc.GitSIMCOND                     INFO opening Git repository '/cvmfs/lhcb.cern.ch/lib/lhcb/git-conddb/SIMCOND.git'
-ToolSvc.GitSIMCOND                     INFO using commit 'upgrade/md_VP_SciFi_macromicrosurvey_from20220923' corresponding to 5860a8cfe486f8b938c9a197c1e7c50d4c067aab
-DetectorPersistencySvc                 INFO Added successfully Conversion service:XmlCnvSvc
-DetectorDataSvc                     SUCCESS Detector description database: git:/lhcb.xml
-EventClockSvc.FakeEventTime            INFO Event times generated from 0 with steps of 0
-EventClockSvc.FakeEventTime            INFO Run numbers generated from 0 every 0 events
-MagneticFieldGridReader INFO  Opened magnetic field file:  /cvmfs/lhcbdev.cern.ch/nightlies/lhcb-head/3411/DBASE/FieldMap/v5r7/cdf//field.v5r0.c1.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  /cvmfs/lhcbdev.cern.ch/nightlies/lhcb-head/3411/DBASE/FieldMap/v5r7/cdf//field.v5r0.c2.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  /cvmfs/lhcbdev.cern.ch/nightlies/lhcb-head/3411/DBASE/FieldMap/v5r7/cdf//field.v5r0.c3.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  /cvmfs/lhcbdev.cern.ch/nightlies/lhcb-head/3411/DBASE/FieldMap/v5r7/cdf//field.v5r0.c4.down.cdf
-MagneticFieldSvc                       INFO Map scaled by factor 1 with polarity internally used: -1 signed relative current: -1
-NTupleSvc                              INFO Added stream file:Spruce_DV_Ks_example.root as FILE1
-HLTControlFlowMgr                      INFO Start initialization
-RootHistSvc                            INFO Writing ROOT histograms to: Spruce_DV_Ks_example.root
-HistogramPersistencySvc                INFO Added successfully Conversion service:RootHistSvc
-FSROutputStreamDstWriter               INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
-HiveDataBrokerSvc                   WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter
-HLTControlFlowMgr                      INFO Concurrency level information:
-HLTControlFlowMgr                      INFO  o Number of events slots: 1
-HLTControlFlowMgr                      INFO  o TBB thread pool size:  'ThreadPoolSize':1
-HLTControlFlowMgr                      INFO ---> End of Initialization. This took 15338 ms
-ApplicationMgr                         INFO Application Manager Initialized successfully
-FunctorFactory                         INFO Reusing functor library: "/tmp/pkoppenb/FunctorJitLib_0xaeaf010b513474cc_0x17f546e4b765be9.so"
-DeFTDetector                           INFO Current FT geometry version =   64
-ApplicationMgr                         INFO Application Manager Started successfully
-EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
-EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='/eos/lhcb/wg/dpa/wp1/data/Run251342/spruce_all_lines_data.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
-HLTControlFlowMgr                      INFO Will measure time between events 10 and 2147483647 (stop might be some events later)
-HLTControlFlowMgr                      INFO Starting loop on events
-EventSelector                       SUCCESS Reading Event record 1. Record number within stream 1: 1
-RFileCnv                               INFO opening Root file "Spruce_DV_Ks_example.root" for writing
-RCWNTupleCnv                           INFO Booked TTree with ID: DecayTree "DecayTree" in directory Spruce_DV_Ks_example.root:/Tuple_KS2PiPi
-HLTControlFlowMgr                      INFO Timing started at: 20:09:00
-EventSelector                       SUCCESS Reading Event record 101. Record number within stream 1: 101
-EventSelector                       SUCCESS Reading Event record 201. Record number within stream 1: 201
-EventSelector                       SUCCESS Reading Event record 301. Record number within stream 1: 301
-EventSelector                       SUCCESS Reading Event record 401. Record number within stream 1: 401
-EventSelector                       SUCCESS Reading Event record 501. Record number within stream 1: 501
-EventSelector                       SUCCESS Reading Event record 601. Record number within stream 1: 601
-EventSelector                       SUCCESS Reading Event record 701. Record number within stream 1: 701
-EventSelector                       SUCCESS Reading Event record 801. Record number within stream 1: 801
-EventSelector                       SUCCESS Reading Event record 901. Record number within stream 1: 901
-EventSelector                       SUCCESS Reading Event record 1001. Record number within stream 1: 1001
-EventSelector                       SUCCESS Reading Event record 1101. Record number within stream 1: 1101
-EventSelector                       SUCCESS Reading Event record 1201. Record number within stream 1: 1201
-EventSelector                       SUCCESS Reading Event record 1301. Record number within stream 1: 1301
-EventSelector                       SUCCESS Reading Event record 1401. Record number within stream 1: 1401
-EventSelector                       SUCCESS Reading Event record 1501. Record number within stream 1: 1501
-EventSelector                       SUCCESS Reading Event record 1601. Record number within stream 1: 1601
-EventSelector                       SUCCESS Reading Event record 1701. Record number within stream 1: 1701
-EventSelector                       SUCCESS Reading Event record 1801. Record number within stream 1: 1801
-EventSelector                       SUCCESS Reading Event record 1901. Record number within stream 1: 1901
-EventSelector                       SUCCESS Reading Event record 2001. Record number within stream 1: 2001
-EventSelector                       SUCCESS Reading Event record 2101. Record number within stream 1: 2101
-EventSelector                       SUCCESS Reading Event record 2201. Record number within stream 1: 2201
-EventSelector                       SUCCESS Reading Event record 2301. Record number within stream 1: 2301
-EventSelector                       SUCCESS Reading Event record 2401. Record number within stream 1: 2401
-EventSelector                       SUCCESS Reading Event record 2501. Record number within stream 1: 2501
-EventSelector                       SUCCESS Reading Event record 2601. Record number within stream 1: 2601
-EventSelector                       SUCCESS Reading Event record 2701. Record number within stream 1: 2701
-EventSelector                       SUCCESS Reading Event record 2801. Record number within stream 1: 2801
-EventSelector                       SUCCESS Reading Event record 2901. Record number within stream 1: 2901
-EventSelector                       SUCCESS Reading Event record 3001. Record number within stream 1: 3001
-EventSelector                       SUCCESS Reading Event record 3101. Record number within stream 1: 3101
-EventSelector                       SUCCESS Reading Event record 3201. Record number within stream 1: 3201
-EventSelector                       SUCCESS Reading Event record 3301. Record number within stream 1: 3301
-EventSelector                       SUCCESS Reading Event record 3401. Record number within stream 1: 3401
-EventSelector                       SUCCESS Reading Event record 3501. Record number within stream 1: 3501
-EventSelector                       SUCCESS Reading Event record 3601. Record number within stream 1: 3601
-EventSelector                       SUCCESS Reading Event record 3701. Record number within stream 1: 3701
-EventSelector                       SUCCESS Reading Event record 3801. Record number within stream 1: 3801
-EventSelector                       SUCCESS Reading Event record 3901. Record number within stream 1: 3901
-EventSelector                       SUCCESS Reading Event record 4001. Record number within stream 1: 4001
-EventSelector                       SUCCESS Reading Event record 4101. Record number within stream 1: 4101
-EventSelector                       SUCCESS Reading Event record 4201. Record number within stream 1: 4201
-EventSelector                       SUCCESS Reading Event record 4301. Record number within stream 1: 4301
-EventSelector                       SUCCESS Reading Event record 4401. Record number within stream 1: 4401
-EventSelector                       SUCCESS Reading Event record 4501. Record number within stream 1: 4501
-EventSelector                       SUCCESS Reading Event record 4601. Record number within stream 1: 4601
-EventSelector                       SUCCESS Reading Event record 4701. Record number within stream 1: 4701
-EventSelector                       SUCCESS Reading Event record 4801. Record number within stream 1: 4801
-EventSelector                       SUCCESS Reading Event record 4901. Record number within stream 1: 4901
-EventSelector                       SUCCESS Reading Event record 5001. Record number within stream 1: 5001
-EventSelector                       SUCCESS Reading Event record 5101. Record number within stream 1: 5101
-EventSelector                       SUCCESS Reading Event record 5201. Record number within stream 1: 5201
-EventSelector                       SUCCESS Reading Event record 5301. Record number within stream 1: 5301
-EventSelector                       SUCCESS Reading Event record 5401. Record number within stream 1: 5401
-EventSelector                       SUCCESS Reading Event record 5501. Record number within stream 1: 5501
-EventSelector                       SUCCESS Reading Event record 5601. Record number within stream 1: 5601
-EventSelector                       SUCCESS Reading Event record 5701. Record number within stream 1: 5701
-EventSelector                       SUCCESS Reading Event record 5801. Record number within stream 1: 5801
-EventSelector                       SUCCESS Reading Event record 5901. Record number within stream 1: 5901
-EventSelector                       SUCCESS Reading Event record 6001. Record number within stream 1: 6001
-EventSelector                       SUCCESS Reading Event record 6101. Record number within stream 1: 6101
-EventSelector                       SUCCESS Reading Event record 6201. Record number within stream 1: 6201
-EventSelector                       SUCCESS Reading Event record 6301. Record number within stream 1: 6301
-EventSelector                       SUCCESS Reading Event record 6401. Record number within stream 1: 6401
-EventSelector                       SUCCESS Reading Event record 6501. Record number within stream 1: 6501
-EventSelector                       SUCCESS Reading Event record 6601. Record number within stream 1: 6601
-EventSelector                       SUCCESS Reading Event record 6701. Record number within stream 1: 6701
-EventSelector                       SUCCESS Reading Event record 6801. Record number within stream 1: 6801
-EventSelector                       SUCCESS Reading Event record 6901. Record number within stream 1: 6901
-EventSelector                       SUCCESS Reading Event record 7001. Record number within stream 1: 7001
-EventSelector                       SUCCESS Reading Event record 7101. Record number within stream 1: 7101
-EventSelector                       SUCCESS Reading Event record 7201. Record number within stream 1: 7201
-EventSelector                       SUCCESS Reading Event record 7301. Record number within stream 1: 7301
-EventSelector                       SUCCESS Reading Event record 7401. Record number within stream 1: 7401
-EventSelector                       SUCCESS Reading Event record 7501. Record number within stream 1: 7501
-EventSelector                       SUCCESS Reading Event record 7601. Record number within stream 1: 7601
-EventSelector                       SUCCESS Reading Event record 7701. Record number within stream 1: 7701
-EventSelector                       SUCCESS Reading Event record 7801. Record number within stream 1: 7801
-EventSelector                       SUCCESS Reading Event record 7901. Record number within stream 1: 7901
-EventSelector                       SUCCESS Reading Event record 8001. Record number within stream 1: 8001
-EventSelector                       SUCCESS Reading Event record 8101. Record number within stream 1: 8101
-EventSelector                       SUCCESS Reading Event record 8201. Record number within stream 1: 8201
-EventSelector                       SUCCESS Reading Event record 8301. Record number within stream 1: 8301
-EventSelector                       SUCCESS Reading Event record 8401. Record number within stream 1: 8401
-EventSelector                       SUCCESS Reading Event record 8501. Record number within stream 1: 8501
-EventSelector                       SUCCESS Reading Event record 8601. Record number within stream 1: 8601
-EventSelector                       SUCCESS Reading Event record 8701. Record number within stream 1: 8701
-EventSelector                       SUCCESS Reading Event record 8801. Record number within stream 1: 8801
-EventSelector                       SUCCESS Reading Event record 8901. Record number within stream 1: 8901
-EventSelector                       SUCCESS Reading Event record 9001. Record number within stream 1: 9001
-EventSelector                       SUCCESS Reading Event record 9101. Record number within stream 1: 9101
-EventSelector                       SUCCESS Reading Event record 9201. Record number within stream 1: 9201
-EventSelector                       SUCCESS Reading Event record 9301. Record number within stream 1: 9301
-EventSelector                       SUCCESS Reading Event record 9401. Record number within stream 1: 9401
-EventSelector                       SUCCESS Reading Event record 9501. Record number within stream 1: 9501
-EventSelector                       SUCCESS Reading Event record 9601. Record number within stream 1: 9601
-EventSelector                       SUCCESS Reading Event record 9701. Record number within stream 1: 9701
-EventSelector                       SUCCESS Reading Event record 9801. Record number within stream 1: 9801
-EventSelector                       SUCCESS Reading Event record 9901. Record number within stream 1: 9901
-EventSelector                       SUCCESS Reading Event record 10001. Record number within stream 1: 10001
-EventSelector                       SUCCESS Reading Event record 10101. Record number within stream 1: 10101
-EventSelector                       SUCCESS Reading Event record 10201. Record number within stream 1: 10201
-EventSelector                       SUCCESS Reading Event record 10301. Record number within stream 1: 10301
-EventSelector                       SUCCESS Reading Event record 10401. Record number within stream 1: 10401
-EventSelector                       SUCCESS Reading Event record 10501. Record number within stream 1: 10501
-HLTControlFlowMgr                      INFO No more events in event selection
-HLTControlFlowMgr                      INFO ---> Loop over 10593 Events Finished -  WSS 1447.29, timed 10583 Events: 59954 ms, Evts/s = 176.519
-HDRFilter_KS2PiPi                      INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- |*"#passed"                                       |     10593 |      10593 |( 100.0000 +-  0.000000)% |
-ParticleUnpacker                       INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# Linked BufferData"                           |     63558 |5.026234e+07 |     790.81 |
- | "# UnpackedData"                                |     21186 |    3026271 |     142.84 |
-RecVertexUnpacker                      INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnpackedData"                                |     21186 |    1684358 |     79.503 |
-ToolSvc.HltFactory                     INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# loaded from PYTHON"                          |         1 |
-Tuple_KS2PiPi                          INFO Number of counters : 8
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# events with multiple candidates for field KS"|      1658 |
- | "# events with multiple candidates for field pim"|      1658 |
- | "# events with multiple candidates for field pip"|      1658 |
- | "# non-empty events for field KS"               |     10593 |
- | "# non-empty events for field pim"              |     10593 |
- | "# non-empty events for field pip"              |     10593 |
- | "# processed events"                            |     10593 |
- | "Lifetime fit did not converge. Aborting."      |     11985 |
-ApplicationMgr                         INFO Application Manager Stopped successfully
-FSROutputStreamDstWriter               INFO Set up File Summary Record
-FSROutputStreamDstWriter               INFO Events output: 1
-Tuple_KS2PiPi                       SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
-Tuple_KS2PiPi                       SUCCESS List of booked N-Tuples in directory "FILE1/Tuple_KS2PiPi"
-Tuple_KS2PiPi                       SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=64 {BUNCHCROSSING_ID,BUNCHCROSSING_TYPE,EVENTNUMBER,GPSTIME,ODINTCK,PV_SIZE,RUNNUMBER}
-HLTControlFlowMgr                      INFO Memory pool: used 0.00530577 +/- 3.58757e-05 MiB (min: 0, max: 0) in 1 +/- 0 blocks (allocated >once in 0 +/- 0% events). Allocated capacity was 10 +/- 0 MiB (min: 10, max: 10) and 85.6539 +/- 0.578745 (min: 68, max: 1348) requests were served
-HLTControlFlowMgr                      INFO Timing table:
-HLTControlFlowMgr                      INFO
- | Name of Algorithm                               | Execution Count | Total Time / s  | Avg. Time / us   |
- | Sum of all Algorithms                           |           10593 |          58.840 |         5554.620 |
- | "Tuple_KS2PiPi"                                 |           10593 |          46.918 |         4429.155 |
- | "Gaudi__Hive__FetchDataFromFile#6"              |           10593 |           8.517 |          804.063 |
- | "ParticleUnpacker"                              |           10593 |           1.875 |          177.029 |
- | "HltPackedBufferDecoder"                        |           10593 |           0.555 |           52.380 |
- | "SpruceDecReportsDecoder"                       |           10593 |           0.275 |           25.947 |
- | "RecVertexUnpacker"                             |           10593 |           0.220 |           20.735 |
- | "RecV1ToPVConverter"                            |           10593 |           0.089 |            8.382 |
- | "reserveIOV"                                    |           10593 |           0.072 |            6.834 |
- | "HDRFilter_KS2PiPi"                             |           10593 |           0.072 |            6.753 |
- | "createODIN#1"                                  |           10593 |           0.063 |            5.912 |
- | "LHCb__UnpackRawEvent#2"                        |           10593 |           0.060 |            5.700 |
- | "DummyEventTime"                                |           10593 |           0.053 |            4.961 |
- | "LHCb__UnpackRawEvent#1"                        |           10593 |           0.042 |            3.933 |
- | "FSROutputStreamDstWriter"                      |           10593 |           0.030 |            2.829 |
-
-HLTControlFlowMgr                      INFO StateTree: CFNode   #executed  #passed
-LAZY_AND: DaVinci                         #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: FileSummaryRecords           #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-  LAZY_AND: GenFSR                        #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-   RecordStream/FSROutputStreamDstWriter  #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: UserAnalysis                 #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-  LAZY_AND: KS2PiPi                       #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-   LoKi__HDRFilter/HDRFilter_KS2PiPi      #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-   FunTupleBase_Particles/Tuple_KS2PiPi   #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-
-HLTControlFlowMgr                      INFO Histograms converted successfully according to request.
-ToolSvc                                INFO Removing all tools created by ToolSvc
-RootCnvSvc                             INFO Disconnected data IO:F145EF36-60DF-11ED-B616-FA163EF28092 [/eos/lhcb/wg/dpa/wp1/data/Run251342/spruce_all_lines_data.dst]
-RFileCnv                               INFO dumping contents of /NTUPLES/FILE1
-TFile: name=Spruce_DV_Ks_example.root, title=Gaudi Trees, option=CREATE
-******************************************************************************
-*Tree    :DecayTree : DecayTree                                              *
-*Entries :    13515 : Total =         5063226 bytes  File  Size =    1904952 *
-*        :          : Tree compression factor =   2.65                       *
-******************************************************************************
-*Br    0 :BUNCHCROSSING_ID : BUNCHCROSSING_ID/s                              *
-*Entries :    13515 : Total  Size=      27651 bytes  File Size  =      17612 *
-*Baskets :        1 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-*Br    1 :BUNCHCROSSING_TYPE : BUNCHCROSSING_TYPE/b                          *
-*Entries :    13515 : Total  Size=      14144 bytes  File Size  =        186 *
-*Baskets :        1 : Basket Size=      32000 bytes  Compression=  73.15     *
-*............................................................................*
-*Br    2 :EVENTNUMBER : EVENTNUMBER/l                                        *
-*Entries :    13515 : Total  Size=     108989 bytes  File Size  =      30100 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   3.60     *
-*............................................................................*
-*Br    3 :GPSTIME   : GPSTIME/l                                              *
-*Entries :    13515 : Total  Size=     108957 bytes  File Size  =      17253 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   6.29     *
-*............................................................................*
-*Br    4 :ODINTCK   : ODINTCK/i                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =        458 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression= 118.38     *
-*............................................................................*
-*Br    5 :PV_SIZE   : PV_SIZE/I                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =       7525 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   7.21     *
-*............................................................................*
-*Br    6 :RUNNUMBER : RUNNUMBER/i                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =        504 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression= 107.58     *
-*............................................................................*
-*Br    7 :KS_BPVFDCHI2 : KS_BPVFDCHI2/F                                      *
-*Entries :    13515 : Total  Size=      54753 bytes  File Size  =      38649 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.40     *
-*............................................................................*
-*Br    8 :KS_BPVFD  : KS_BPVFD/F                                             *
-*Entries :    13515 : Total  Size=      54729 bytes  File Size  =      38065 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.42     *
-*............................................................................*
-*Br    9 :KS_BPVLTIME : KS_BPVLTIME/F                                        *
-*Entries :    13515 : Total  Size=      54747 bytes  File Size  =      33566 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.62     *
-*............................................................................*
-*Br   10 :KS_BPVIP  : KS_BPVIP/F                                             *
-*Entries :    13515 : Total  Size=      54729 bytes  File Size  =      37885 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.43     *
-*............................................................................*
-*Br   11 :KS_BPVIPCHI2 : KS_BPVIPCHI2/F                                      *
-*Entries :    13515 : Total  Size=      54753 bytes  File Size  =      38541 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.41     *
-*............................................................................*
-*Br   12 :KS_CHI2   : KS_CHI2/D                                              *
-*Entries :    13515 : Total  Size=     108957 bytes  File Size  =      51357 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.11     *
-*............................................................................*
-*Br   13 :KS_END_VX : KS_END_VX/F                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =      34409 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.58     *
-*............................................................................*
-*Br   14 :KS_END_VY : KS_END_VY/F                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =      35940 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.51     *
-*............................................................................*
-*Br   15 :KS_END_VZ : KS_END_VZ/F                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =      38864 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.40     *
-*............................................................................*
-*Br   16 :KS_BPVX   : KS_BPVX/F                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =      26175 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   2.07     *
-*............................................................................*
-*Br   17 :KS_BPVY   : KS_BPVY/F                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =      27618 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.96     *
-*............................................................................*
-*Br   18 :KS_BPVZ   : KS_BPVZ/F                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =      33235 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.63     *
-*............................................................................*
-*Br   19 :KS_M      : KS_M/D                                                 *
-*Entries :    13515 : Total  Size=     108933 bytes  File Size  =      75135 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   1.44     *
-*............................................................................*
-*Br   20 :KS_P      : KS_P/F                                                 *
-*Entries :    13515 : Total  Size=      54705 bytes  File Size  =      37389 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.45     *
-*............................................................................*
-*Br   21 :KS_PT     : KS_PT/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      37069 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.46     *
-*............................................................................*
-*Br   22 :KS_PX     : KS_PX/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      36833 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.47     *
-*............................................................................*
-*Br   23 :KS_PY     : KS_PY/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      36863 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.47     *
-*............................................................................*
-*Br   24 :KS_PZ     : KS_PZ/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      37317 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.45     *
-*............................................................................*
-*Br   25 :KS_ENERGY : KS_ENERGY/F                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =      37374 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.45     *
-*............................................................................*
-*Br   26 :pip_PID_E : pip_PID_E/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =      47006 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.31     *
-*............................................................................*
-*Br   27 :pip_PID_K : pip_PID_K/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =        925 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 117.24     *
-*............................................................................*
-*Br   28 :pip_PID_MU : pip_PID_MU/D                                          *
-*Entries :    13515 : Total  Size=     108981 bytes  File Size  =      49101 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.21     *
-*............................................................................*
-*Br   29 :pip_PID_P : pip_PID_P/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =        925 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 117.24     *
-*............................................................................*
-*Br   30 :pip_PID_PI : pip_PID_PI/D                                          *
-*Entries :    13515 : Total  Size=     108981 bytes  File Size  =        929 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 116.74     *
-*............................................................................*
-*Br   31 :pip_PROBNN_D : pip_PROBNN_D/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =       1087 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=  99.78     *
-*............................................................................*
-*Br   32 :pip_PROBNN_E : pip_PROBNN_E/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      46829 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.32     *
-*............................................................................*
-*Br   33 :pip_PROBNN_GHOST : pip_PROBNN_GHOST/D                              *
-*Entries :    13515 : Total  Size=     109029 bytes  File Size  =      36554 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.97     *
-*............................................................................*
-*Br   34 :pip_PROBNN_K : pip_PROBNN_K/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      46807 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.32     *
-*............................................................................*
-*Br   35 :pip_PROBNN_MU : pip_PROBNN_MU/D                                    *
-*Entries :    13515 : Total  Size=     109005 bytes  File Size  =       2619 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=  41.41     *
-*............................................................................*
-*Br   36 :pip_PROBNN_P : pip_PROBNN_P/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      46847 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.32     *
-*............................................................................*
-*Br   37 :pip_PROBNN_PI : pip_PROBNN_PI/D                                    *
-*Entries :    13515 : Total  Size=     109005 bytes  File Size  =      48338 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.24     *
-*............................................................................*
-*Br   38 :pip_M     : pip_M/D                                                *
-*Entries :    13515 : Total  Size=     108941 bytes  File Size  =      14024 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   7.73     *
-*............................................................................*
-*Br   39 :pip_P     : pip_P/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      36085 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.50     *
-*............................................................................*
-*Br   40 :pip_PT    : pip_PT/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      35953 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.51     *
-*............................................................................*
-*Br   41 :pip_PX    : pip_PX/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      34715 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.56     *
-*............................................................................*
-*Br   42 :pip_PY    : pip_PY/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      34970 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.55     *
-*............................................................................*
-*Br   43 :pip_PZ    : pip_PZ/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      35845 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.51     *
-*............................................................................*
-*Br   44 :pip_ENERGY : pip_ENERGY/F                                          *
-*Entries :    13515 : Total  Size=      54741 bytes  File Size  =      36094 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.50     *
-*............................................................................*
-*Br   45 :pim_PID_E : pim_PID_E/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =      43229 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.51     *
-*............................................................................*
-*Br   46 :pim_PID_K : pim_PID_K/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =        925 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 117.24     *
-*............................................................................*
-*Br   47 :pim_PID_MU : pim_PID_MU/D                                          *
-*Entries :    13515 : Total  Size=     108981 bytes  File Size  =      43726 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.48     *
-*............................................................................*
-*Br   48 :pim_PID_P : pim_PID_P/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =        925 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 117.24     *
-*............................................................................*
-*Br   49 :pim_PID_PI : pim_PID_PI/D                                          *
-*Entries :    13515 : Total  Size=     108981 bytes  File Size  =        929 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 116.74     *
-*............................................................................*
-*Br   50 :pim_PROBNN_D : pim_PROBNN_D/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =       1087 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=  99.78     *
-*............................................................................*
-*Br   51 :pim_PROBNN_E : pim_PROBNN_E/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      45803 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.37     *
-*............................................................................*
-*Br   52 :pim_PROBNN_GHOST : pim_PROBNN_GHOST/D                              *
-*Entries :    13515 : Total  Size=     109029 bytes  File Size  =      35867 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   3.02     *
-*............................................................................*
-*Br   53 :pim_PROBNN_K : pim_PROBNN_K/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      45754 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.37     *
-*............................................................................*
-*Br   54 :pim_PROBNN_MU : pim_PROBNN_MU/D                                    *
-*Entries :    13515 : Total  Size=     109005 bytes  File Size  =       2632 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=  41.21     *
-*............................................................................*
-*Br   55 :pim_PROBNN_P : pim_PROBNN_P/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      45952 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.36     *
-*............................................................................*
-*Br   56 :pim_PROBNN_PI : pim_PROBNN_PI/D                                    *
-*Entries :    13515 : Total  Size=     109005 bytes  File Size  =      46969 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.31     *
-*............................................................................*
-*Br   57 :pim_M     : pim_M/D                                                *
-*Entries :    13515 : Total  Size=     108941 bytes  File Size  =      14539 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   7.46     *
-*............................................................................*
-*Br   58 :pim_P     : pim_P/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      35222 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-*Br   59 :pim_PT    : pim_PT/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      35149 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-*Br   60 :pim_PX    : pim_PX/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      34293 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.58     *
-*............................................................................*
-*Br   61 :pim_PY    : pim_PY/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      34585 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.57     *
-*............................................................................*
-*Br   62 :pim_PZ    : pim_PZ/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      35214 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-*Br   63 :pim_ENERGY : pim_ENERGY/F                                          *
-*Entries :    13515 : Total  Size=      54741 bytes  File Size  =      35206 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-NTupleSvc                              INFO NTuples saved successfully
-ApplicationMgr                         INFO Application Manager Finalized successfully
-ApplicationMgr                         INFO Application Manager Terminated successfully
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_data.ref.detdesc b/DaVinciExamples/tests/refs/test_davinci_tupling_from_data.ref.detdesc
deleted file mode 100644
index daab7ae91a894287fc0a3de79718df89951cfb25..0000000000000000000000000000000000000000
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_data.ref.detdesc
+++ /dev/null
@@ -1,476 +0,0 @@
-ApplicationMgr    SUCCESS
-====================================================================================================================================
-                                                   Welcome to DaVinci_Tests version 0
-                                          running on lxplus700.cern.ch on Thu Nov 10 20:07:10 2022
-====================================================================================================================================
-ApplicationMgr       INFO Application Manager Configured successfully
-ToolSvc.GitDDDB                        INFO opening Git repository '/cvmfs/lhcb.cern.ch/lib/lhcb/git-conddb/DDDB.git'
-ToolSvc.GitDDDB                        INFO using commit 'upgrade/master' corresponding to 183db2b407a65b09956f91577b0b3ed38cb27f9e
-ToolSvc.GitSIMCOND                     INFO opening Git repository '/cvmfs/lhcb.cern.ch/lib/lhcb/git-conddb/SIMCOND.git'
-ToolSvc.GitSIMCOND                     INFO using commit 'upgrade/md_VP_SciFi_macromicrosurvey_from20220923' corresponding to 5860a8cfe486f8b938c9a197c1e7c50d4c067aab
-DetectorPersistencySvc                 INFO Added successfully Conversion service:XmlCnvSvc
-DetectorDataSvc                     SUCCESS Detector description database: git:/lhcb.xml
-EventClockSvc.FakeEventTime            INFO Event times generated from 0 with steps of 0
-EventClockSvc.FakeEventTime            INFO Run numbers generated from 0 every 0 events
-MagneticFieldGridReader INFO  Opened magnetic field file:  /cvmfs/lhcbdev.cern.ch/nightlies/lhcb-head/3411/DBASE/FieldMap/v5r7/cdf//field.v5r0.c1.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  /cvmfs/lhcbdev.cern.ch/nightlies/lhcb-head/3411/DBASE/FieldMap/v5r7/cdf//field.v5r0.c2.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  /cvmfs/lhcbdev.cern.ch/nightlies/lhcb-head/3411/DBASE/FieldMap/v5r7/cdf//field.v5r0.c3.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  /cvmfs/lhcbdev.cern.ch/nightlies/lhcb-head/3411/DBASE/FieldMap/v5r7/cdf//field.v5r0.c4.down.cdf
-MagneticFieldSvc                       INFO Map scaled by factor 1 with polarity internally used: -1 signed relative current: -1
-NTupleSvc                              INFO Added stream file:Spruce_DV_Ks_example.root as FILE1
-HLTControlFlowMgr                      INFO Start initialization
-RootHistSvc                            INFO Writing ROOT histograms to: Spruce_DV_Ks_example.root
-HistogramPersistencySvc                INFO Added successfully Conversion service:RootHistSvc
-FSROutputStreamDstWriter               INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
-HiveDataBrokerSvc                   WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter
-HLTControlFlowMgr                      INFO Concurrency level information:
-HLTControlFlowMgr                      INFO  o Number of events slots: 1
-HLTControlFlowMgr                      INFO  o TBB thread pool size:  'ThreadPoolSize':1
-HLTControlFlowMgr                      INFO ---> End of Initialization. This took 15338 ms
-ApplicationMgr                         INFO Application Manager Initialized successfully
-FunctorFactory                         INFO Reusing functor library: "/tmp/pkoppenb/FunctorJitLib_0xaeaf010b513474cc_0x17f546e4b765be9.so"
-DeFTDetector                           INFO Current FT geometry version =   64
-ApplicationMgr                         INFO Application Manager Started successfully
-EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
-EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='/eos/lhcb/wg/dpa/wp1/data/Run251342/spruce_all_lines_data.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
-HLTControlFlowMgr                      INFO Will measure time between events 10 and 2147483647 (stop might be some events later)
-HLTControlFlowMgr                      INFO Starting loop on events
-EventSelector                       SUCCESS Reading Event record 1. Record number within stream 1: 1
-RFileCnv                               INFO opening Root file "Spruce_DV_Ks_example.root" for writing
-RCWNTupleCnv                           INFO Booked TTree with ID: DecayTree "DecayTree" in directory Spruce_DV_Ks_example.root:/Tuple_KS2PiPi
-HLTControlFlowMgr                      INFO Timing started at: 20:09:00
-EventSelector                       SUCCESS Reading Event record 101. Record number within stream 1: 101
-EventSelector                       SUCCESS Reading Event record 201. Record number within stream 1: 201
-EventSelector                       SUCCESS Reading Event record 301. Record number within stream 1: 301
-EventSelector                       SUCCESS Reading Event record 401. Record number within stream 1: 401
-EventSelector                       SUCCESS Reading Event record 501. Record number within stream 1: 501
-EventSelector                       SUCCESS Reading Event record 601. Record number within stream 1: 601
-EventSelector                       SUCCESS Reading Event record 701. Record number within stream 1: 701
-EventSelector                       SUCCESS Reading Event record 801. Record number within stream 1: 801
-EventSelector                       SUCCESS Reading Event record 901. Record number within stream 1: 901
-EventSelector                       SUCCESS Reading Event record 1001. Record number within stream 1: 1001
-EventSelector                       SUCCESS Reading Event record 1101. Record number within stream 1: 1101
-EventSelector                       SUCCESS Reading Event record 1201. Record number within stream 1: 1201
-EventSelector                       SUCCESS Reading Event record 1301. Record number within stream 1: 1301
-EventSelector                       SUCCESS Reading Event record 1401. Record number within stream 1: 1401
-EventSelector                       SUCCESS Reading Event record 1501. Record number within stream 1: 1501
-EventSelector                       SUCCESS Reading Event record 1601. Record number within stream 1: 1601
-EventSelector                       SUCCESS Reading Event record 1701. Record number within stream 1: 1701
-EventSelector                       SUCCESS Reading Event record 1801. Record number within stream 1: 1801
-EventSelector                       SUCCESS Reading Event record 1901. Record number within stream 1: 1901
-EventSelector                       SUCCESS Reading Event record 2001. Record number within stream 1: 2001
-EventSelector                       SUCCESS Reading Event record 2101. Record number within stream 1: 2101
-EventSelector                       SUCCESS Reading Event record 2201. Record number within stream 1: 2201
-EventSelector                       SUCCESS Reading Event record 2301. Record number within stream 1: 2301
-EventSelector                       SUCCESS Reading Event record 2401. Record number within stream 1: 2401
-EventSelector                       SUCCESS Reading Event record 2501. Record number within stream 1: 2501
-EventSelector                       SUCCESS Reading Event record 2601. Record number within stream 1: 2601
-EventSelector                       SUCCESS Reading Event record 2701. Record number within stream 1: 2701
-EventSelector                       SUCCESS Reading Event record 2801. Record number within stream 1: 2801
-EventSelector                       SUCCESS Reading Event record 2901. Record number within stream 1: 2901
-EventSelector                       SUCCESS Reading Event record 3001. Record number within stream 1: 3001
-EventSelector                       SUCCESS Reading Event record 3101. Record number within stream 1: 3101
-EventSelector                       SUCCESS Reading Event record 3201. Record number within stream 1: 3201
-EventSelector                       SUCCESS Reading Event record 3301. Record number within stream 1: 3301
-EventSelector                       SUCCESS Reading Event record 3401. Record number within stream 1: 3401
-EventSelector                       SUCCESS Reading Event record 3501. Record number within stream 1: 3501
-EventSelector                       SUCCESS Reading Event record 3601. Record number within stream 1: 3601
-EventSelector                       SUCCESS Reading Event record 3701. Record number within stream 1: 3701
-EventSelector                       SUCCESS Reading Event record 3801. Record number within stream 1: 3801
-EventSelector                       SUCCESS Reading Event record 3901. Record number within stream 1: 3901
-EventSelector                       SUCCESS Reading Event record 4001. Record number within stream 1: 4001
-EventSelector                       SUCCESS Reading Event record 4101. Record number within stream 1: 4101
-EventSelector                       SUCCESS Reading Event record 4201. Record number within stream 1: 4201
-EventSelector                       SUCCESS Reading Event record 4301. Record number within stream 1: 4301
-EventSelector                       SUCCESS Reading Event record 4401. Record number within stream 1: 4401
-EventSelector                       SUCCESS Reading Event record 4501. Record number within stream 1: 4501
-EventSelector                       SUCCESS Reading Event record 4601. Record number within stream 1: 4601
-EventSelector                       SUCCESS Reading Event record 4701. Record number within stream 1: 4701
-EventSelector                       SUCCESS Reading Event record 4801. Record number within stream 1: 4801
-EventSelector                       SUCCESS Reading Event record 4901. Record number within stream 1: 4901
-EventSelector                       SUCCESS Reading Event record 5001. Record number within stream 1: 5001
-EventSelector                       SUCCESS Reading Event record 5101. Record number within stream 1: 5101
-EventSelector                       SUCCESS Reading Event record 5201. Record number within stream 1: 5201
-EventSelector                       SUCCESS Reading Event record 5301. Record number within stream 1: 5301
-EventSelector                       SUCCESS Reading Event record 5401. Record number within stream 1: 5401
-EventSelector                       SUCCESS Reading Event record 5501. Record number within stream 1: 5501
-EventSelector                       SUCCESS Reading Event record 5601. Record number within stream 1: 5601
-EventSelector                       SUCCESS Reading Event record 5701. Record number within stream 1: 5701
-EventSelector                       SUCCESS Reading Event record 5801. Record number within stream 1: 5801
-EventSelector                       SUCCESS Reading Event record 5901. Record number within stream 1: 5901
-EventSelector                       SUCCESS Reading Event record 6001. Record number within stream 1: 6001
-EventSelector                       SUCCESS Reading Event record 6101. Record number within stream 1: 6101
-EventSelector                       SUCCESS Reading Event record 6201. Record number within stream 1: 6201
-EventSelector                       SUCCESS Reading Event record 6301. Record number within stream 1: 6301
-EventSelector                       SUCCESS Reading Event record 6401. Record number within stream 1: 6401
-EventSelector                       SUCCESS Reading Event record 6501. Record number within stream 1: 6501
-EventSelector                       SUCCESS Reading Event record 6601. Record number within stream 1: 6601
-EventSelector                       SUCCESS Reading Event record 6701. Record number within stream 1: 6701
-EventSelector                       SUCCESS Reading Event record 6801. Record number within stream 1: 6801
-EventSelector                       SUCCESS Reading Event record 6901. Record number within stream 1: 6901
-EventSelector                       SUCCESS Reading Event record 7001. Record number within stream 1: 7001
-EventSelector                       SUCCESS Reading Event record 7101. Record number within stream 1: 7101
-EventSelector                       SUCCESS Reading Event record 7201. Record number within stream 1: 7201
-EventSelector                       SUCCESS Reading Event record 7301. Record number within stream 1: 7301
-EventSelector                       SUCCESS Reading Event record 7401. Record number within stream 1: 7401
-EventSelector                       SUCCESS Reading Event record 7501. Record number within stream 1: 7501
-EventSelector                       SUCCESS Reading Event record 7601. Record number within stream 1: 7601
-EventSelector                       SUCCESS Reading Event record 7701. Record number within stream 1: 7701
-EventSelector                       SUCCESS Reading Event record 7801. Record number within stream 1: 7801
-EventSelector                       SUCCESS Reading Event record 7901. Record number within stream 1: 7901
-EventSelector                       SUCCESS Reading Event record 8001. Record number within stream 1: 8001
-EventSelector                       SUCCESS Reading Event record 8101. Record number within stream 1: 8101
-EventSelector                       SUCCESS Reading Event record 8201. Record number within stream 1: 8201
-EventSelector                       SUCCESS Reading Event record 8301. Record number within stream 1: 8301
-EventSelector                       SUCCESS Reading Event record 8401. Record number within stream 1: 8401
-EventSelector                       SUCCESS Reading Event record 8501. Record number within stream 1: 8501
-EventSelector                       SUCCESS Reading Event record 8601. Record number within stream 1: 8601
-EventSelector                       SUCCESS Reading Event record 8701. Record number within stream 1: 8701
-EventSelector                       SUCCESS Reading Event record 8801. Record number within stream 1: 8801
-EventSelector                       SUCCESS Reading Event record 8901. Record number within stream 1: 8901
-EventSelector                       SUCCESS Reading Event record 9001. Record number within stream 1: 9001
-EventSelector                       SUCCESS Reading Event record 9101. Record number within stream 1: 9101
-EventSelector                       SUCCESS Reading Event record 9201. Record number within stream 1: 9201
-EventSelector                       SUCCESS Reading Event record 9301. Record number within stream 1: 9301
-EventSelector                       SUCCESS Reading Event record 9401. Record number within stream 1: 9401
-EventSelector                       SUCCESS Reading Event record 9501. Record number within stream 1: 9501
-EventSelector                       SUCCESS Reading Event record 9601. Record number within stream 1: 9601
-EventSelector                       SUCCESS Reading Event record 9701. Record number within stream 1: 9701
-EventSelector                       SUCCESS Reading Event record 9801. Record number within stream 1: 9801
-EventSelector                       SUCCESS Reading Event record 9901. Record number within stream 1: 9901
-EventSelector                       SUCCESS Reading Event record 10001. Record number within stream 1: 10001
-EventSelector                       SUCCESS Reading Event record 10101. Record number within stream 1: 10101
-EventSelector                       SUCCESS Reading Event record 10201. Record number within stream 1: 10201
-EventSelector                       SUCCESS Reading Event record 10301. Record number within stream 1: 10301
-EventSelector                       SUCCESS Reading Event record 10401. Record number within stream 1: 10401
-EventSelector                       SUCCESS Reading Event record 10501. Record number within stream 1: 10501
-HLTControlFlowMgr                      INFO No more events in event selection
-HLTControlFlowMgr                      INFO ---> Loop over 10593 Events Finished -  WSS 1447.29, timed 10583 Events: 59954 ms, Evts/s = 176.519
-HDRFilter_KS2PiPi                      INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- |*"#passed"                                       |     10593 |      10593 |( 100.0000 +-  0.000000)% |
-ParticleUnpacker                       INFO Number of counters : 2
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# Linked BufferData"                           |     63558 |5.026234e+07 |     790.81 |
- | "# UnpackedData"                                |     21186 |    3026271 |     142.84 |
-RecVertexUnpacker                      INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# UnpackedData"                                |     21186 |    1684358 |     79.503 |
-ToolSvc.HltFactory                     INFO Number of counters : 1
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# loaded from PYTHON"                          |         1 |
-Tuple_KS2PiPi                          INFO Number of counters : 8
- |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# events with multiple candidates for field KS"|      1658 |
- | "# events with multiple candidates for field pim"|      1658 |
- | "# events with multiple candidates for field pip"|      1658 |
- | "# non-empty events for field KS"               |     10593 |
- | "# non-empty events for field pim"              |     10593 |
- | "# non-empty events for field pip"              |     10593 |
- | "# processed events"                            |     10593 |
- | "Lifetime fit did not converge. Aborting."      |     11985 |
-ApplicationMgr                         INFO Application Manager Stopped successfully
-FSROutputStreamDstWriter               INFO Set up File Summary Record
-FSROutputStreamDstWriter               INFO Events output: 1
-Tuple_KS2PiPi                       SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
-Tuple_KS2PiPi                       SUCCESS List of booked N-Tuples in directory "FILE1/Tuple_KS2PiPi"
-Tuple_KS2PiPi                       SUCCESS  ID=DecayTree     Title="DecayTree"                               #items=64 {BUNCHCROSSING_ID,BUNCHCROSSING_TYPE,EVENTNUMBER,GPSTIME,ODINTCK,PV_SIZE,RUNNUMBER}
-HLTControlFlowMgr                      INFO Memory pool: used 0.00530577 +/- 3.58757e-05 MiB (min: 0, max: 0) in 1 +/- 0 blocks (allocated >once in 0 +/- 0% events). Allocated capacity was 10 +/- 0 MiB (min: 10, max: 10) and 85.6539 +/- 0.578745 (min: 68, max: 1348) requests were served
-HLTControlFlowMgr                      INFO Timing table:
-HLTControlFlowMgr                      INFO
- | Name of Algorithm                               | Execution Count | Total Time / s  | Avg. Time / us   |
- | Sum of all Algorithms                           |           10593 |          58.840 |         5554.620 |
- | "Tuple_KS2PiPi"                                 |           10593 |          46.918 |         4429.155 |
- | "Gaudi__Hive__FetchDataFromFile#6"              |           10593 |           8.517 |          804.063 |
- | "ParticleUnpacker"                              |           10593 |           1.875 |          177.029 |
- | "HltPackedBufferDecoder"                        |           10593 |           0.555 |           52.380 |
- | "SpruceDecReportsDecoder"                       |           10593 |           0.275 |           25.947 |
- | "RecVertexUnpacker"                             |           10593 |           0.220 |           20.735 |
- | "RecV1ToPVConverter"                            |           10593 |           0.089 |            8.382 |
- | "reserveIOV"                                    |           10593 |           0.072 |            6.834 |
- | "HDRFilter_KS2PiPi"                             |           10593 |           0.072 |            6.753 |
- | "createODIN#1"                                  |           10593 |           0.063 |            5.912 |
- | "LHCb__UnpackRawEvent#2"                        |           10593 |           0.060 |            5.700 |
- | "DummyEventTime"                                |           10593 |           0.053 |            4.961 |
- | "LHCb__UnpackRawEvent#1"                        |           10593 |           0.042 |            3.933 |
- | "FSROutputStreamDstWriter"                      |           10593 |           0.030 |            2.829 |
-
-HLTControlFlowMgr                      INFO StateTree: CFNode   #executed  #passed
-LAZY_AND: DaVinci                         #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: FileSummaryRecords           #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-  LAZY_AND: GenFSR                        #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-   RecordStream/FSROutputStreamDstWriter  #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: UserAnalysis                 #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-  LAZY_AND: KS2PiPi                       #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-   LoKi__HDRFilter/HDRFilter_KS2PiPi      #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-   FunTupleBase_Particles/Tuple_KS2PiPi   #=10593   Sum=10593       Eff=|( 100.0000 +- 0.00000 )%|
-
-HLTControlFlowMgr                      INFO Histograms converted successfully according to request.
-ToolSvc                                INFO Removing all tools created by ToolSvc
-RootCnvSvc                             INFO Disconnected data IO:F145EF36-60DF-11ED-B616-FA163EF28092 [/eos/lhcb/wg/dpa/wp1/data/Run251342/spruce_all_lines_data.dst]
-RFileCnv                               INFO dumping contents of /NTUPLES/FILE1
-TFile: name=Spruce_DV_Ks_example.root, title=Gaudi Trees, option=CREATE
-******************************************************************************
-*Tree    :DecayTree : DecayTree                                              *
-*Entries :    13515 : Total =         5063226 bytes  File  Size =    1904952 *
-*        :          : Tree compression factor =   2.65                       *
-******************************************************************************
-*Br    0 :BUNCHCROSSING_ID : BUNCHCROSSING_ID/s                              *
-*Entries :    13515 : Total  Size=      27651 bytes  File Size  =      17612 *
-*Baskets :        1 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-*Br    1 :BUNCHCROSSING_TYPE : BUNCHCROSSING_TYPE/b                          *
-*Entries :    13515 : Total  Size=      14144 bytes  File Size  =        186 *
-*Baskets :        1 : Basket Size=      32000 bytes  Compression=  73.15     *
-*............................................................................*
-*Br    2 :EVENTNUMBER : EVENTNUMBER/l                                        *
-*Entries :    13515 : Total  Size=     108989 bytes  File Size  =      30100 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   3.60     *
-*............................................................................*
-*Br    3 :GPSTIME   : GPSTIME/l                                              *
-*Entries :    13515 : Total  Size=     108957 bytes  File Size  =      17253 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   6.29     *
-*............................................................................*
-*Br    4 :ODINTCK   : ODINTCK/i                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =        458 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression= 118.38     *
-*............................................................................*
-*Br    5 :PV_SIZE   : PV_SIZE/I                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =       7525 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   7.21     *
-*............................................................................*
-*Br    6 :RUNNUMBER : RUNNUMBER/i                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =        504 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression= 107.58     *
-*............................................................................*
-*Br    7 :KS_BPVFDCHI2 : KS_BPVFDCHI2/F                                      *
-*Entries :    13515 : Total  Size=      54753 bytes  File Size  =      38649 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.40     *
-*............................................................................*
-*Br    8 :KS_BPVFD  : KS_BPVFD/F                                             *
-*Entries :    13515 : Total  Size=      54729 bytes  File Size  =      38065 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.42     *
-*............................................................................*
-*Br    9 :KS_BPVLTIME : KS_BPVLTIME/F                                        *
-*Entries :    13515 : Total  Size=      54747 bytes  File Size  =      33566 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.62     *
-*............................................................................*
-*Br   10 :KS_BPVIP  : KS_BPVIP/F                                             *
-*Entries :    13515 : Total  Size=      54729 bytes  File Size  =      37885 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.43     *
-*............................................................................*
-*Br   11 :KS_BPVIPCHI2 : KS_BPVIPCHI2/F                                      *
-*Entries :    13515 : Total  Size=      54753 bytes  File Size  =      38541 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.41     *
-*............................................................................*
-*Br   12 :KS_CHI2   : KS_CHI2/D                                              *
-*Entries :    13515 : Total  Size=     108957 bytes  File Size  =      51357 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.11     *
-*............................................................................*
-*Br   13 :KS_END_VX : KS_END_VX/F                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =      34409 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.58     *
-*............................................................................*
-*Br   14 :KS_END_VY : KS_END_VY/F                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =      35940 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.51     *
-*............................................................................*
-*Br   15 :KS_END_VZ : KS_END_VZ/F                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =      38864 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.40     *
-*............................................................................*
-*Br   16 :KS_BPVX   : KS_BPVX/F                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =      26175 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   2.07     *
-*............................................................................*
-*Br   17 :KS_BPVY   : KS_BPVY/F                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =      27618 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.96     *
-*............................................................................*
-*Br   18 :KS_BPVZ   : KS_BPVZ/F                                              *
-*Entries :    13515 : Total  Size=      54723 bytes  File Size  =      33235 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.63     *
-*............................................................................*
-*Br   19 :KS_M      : KS_M/D                                                 *
-*Entries :    13515 : Total  Size=     108933 bytes  File Size  =      75135 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   1.44     *
-*............................................................................*
-*Br   20 :KS_P      : KS_P/F                                                 *
-*Entries :    13515 : Total  Size=      54705 bytes  File Size  =      37389 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.45     *
-*............................................................................*
-*Br   21 :KS_PT     : KS_PT/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      37069 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.46     *
-*............................................................................*
-*Br   22 :KS_PX     : KS_PX/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      36833 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.47     *
-*............................................................................*
-*Br   23 :KS_PY     : KS_PY/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      36863 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.47     *
-*............................................................................*
-*Br   24 :KS_PZ     : KS_PZ/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      37317 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.45     *
-*............................................................................*
-*Br   25 :KS_ENERGY : KS_ENERGY/F                                            *
-*Entries :    13515 : Total  Size=      54735 bytes  File Size  =      37374 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.45     *
-*............................................................................*
-*Br   26 :pip_PID_E : pip_PID_E/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =      47006 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.31     *
-*............................................................................*
-*Br   27 :pip_PID_K : pip_PID_K/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =        925 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 117.24     *
-*............................................................................*
-*Br   28 :pip_PID_MU : pip_PID_MU/D                                          *
-*Entries :    13515 : Total  Size=     108981 bytes  File Size  =      49101 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.21     *
-*............................................................................*
-*Br   29 :pip_PID_P : pip_PID_P/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =        925 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 117.24     *
-*............................................................................*
-*Br   30 :pip_PID_PI : pip_PID_PI/D                                          *
-*Entries :    13515 : Total  Size=     108981 bytes  File Size  =        929 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 116.74     *
-*............................................................................*
-*Br   31 :pip_PROBNN_D : pip_PROBNN_D/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =       1087 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=  99.78     *
-*............................................................................*
-*Br   32 :pip_PROBNN_E : pip_PROBNN_E/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      46829 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.32     *
-*............................................................................*
-*Br   33 :pip_PROBNN_GHOST : pip_PROBNN_GHOST/D                              *
-*Entries :    13515 : Total  Size=     109029 bytes  File Size  =      36554 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.97     *
-*............................................................................*
-*Br   34 :pip_PROBNN_K : pip_PROBNN_K/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      46807 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.32     *
-*............................................................................*
-*Br   35 :pip_PROBNN_MU : pip_PROBNN_MU/D                                    *
-*Entries :    13515 : Total  Size=     109005 bytes  File Size  =       2619 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=  41.41     *
-*............................................................................*
-*Br   36 :pip_PROBNN_P : pip_PROBNN_P/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      46847 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.32     *
-*............................................................................*
-*Br   37 :pip_PROBNN_PI : pip_PROBNN_PI/D                                    *
-*Entries :    13515 : Total  Size=     109005 bytes  File Size  =      48338 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.24     *
-*............................................................................*
-*Br   38 :pip_M     : pip_M/D                                                *
-*Entries :    13515 : Total  Size=     108941 bytes  File Size  =      14024 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   7.73     *
-*............................................................................*
-*Br   39 :pip_P     : pip_P/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      36085 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.50     *
-*............................................................................*
-*Br   40 :pip_PT    : pip_PT/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      35953 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.51     *
-*............................................................................*
-*Br   41 :pip_PX    : pip_PX/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      34715 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.56     *
-*............................................................................*
-*Br   42 :pip_PY    : pip_PY/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      34970 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.55     *
-*............................................................................*
-*Br   43 :pip_PZ    : pip_PZ/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      35845 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.51     *
-*............................................................................*
-*Br   44 :pip_ENERGY : pip_ENERGY/F                                          *
-*Entries :    13515 : Total  Size=      54741 bytes  File Size  =      36094 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.50     *
-*............................................................................*
-*Br   45 :pim_PID_E : pim_PID_E/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =      43229 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.51     *
-*............................................................................*
-*Br   46 :pim_PID_K : pim_PID_K/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =        925 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 117.24     *
-*............................................................................*
-*Br   47 :pim_PID_MU : pim_PID_MU/D                                          *
-*Entries :    13515 : Total  Size=     108981 bytes  File Size  =      43726 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.48     *
-*............................................................................*
-*Br   48 :pim_PID_P : pim_PID_P/D                                            *
-*Entries :    13515 : Total  Size=     108973 bytes  File Size  =        925 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 117.24     *
-*............................................................................*
-*Br   49 :pim_PID_PI : pim_PID_PI/D                                          *
-*Entries :    13515 : Total  Size=     108981 bytes  File Size  =        929 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression= 116.74     *
-*............................................................................*
-*Br   50 :pim_PROBNN_D : pim_PROBNN_D/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =       1087 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=  99.78     *
-*............................................................................*
-*Br   51 :pim_PROBNN_E : pim_PROBNN_E/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      45803 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.37     *
-*............................................................................*
-*Br   52 :pim_PROBNN_GHOST : pim_PROBNN_GHOST/D                              *
-*Entries :    13515 : Total  Size=     109029 bytes  File Size  =      35867 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   3.02     *
-*............................................................................*
-*Br   53 :pim_PROBNN_K : pim_PROBNN_K/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      45754 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.37     *
-*............................................................................*
-*Br   54 :pim_PROBNN_MU : pim_PROBNN_MU/D                                    *
-*Entries :    13515 : Total  Size=     109005 bytes  File Size  =       2632 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=  41.21     *
-*............................................................................*
-*Br   55 :pim_PROBNN_P : pim_PROBNN_P/D                                      *
-*Entries :    13515 : Total  Size=     108997 bytes  File Size  =      45952 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.36     *
-*............................................................................*
-*Br   56 :pim_PROBNN_PI : pim_PROBNN_PI/D                                    *
-*Entries :    13515 : Total  Size=     109005 bytes  File Size  =      46969 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   2.31     *
-*............................................................................*
-*Br   57 :pim_M     : pim_M/D                                                *
-*Entries :    13515 : Total  Size=     108941 bytes  File Size  =      14539 *
-*Baskets :        4 : Basket Size=      32000 bytes  Compression=   7.46     *
-*............................................................................*
-*Br   58 :pim_P     : pim_P/F                                                *
-*Entries :    13515 : Total  Size=      54711 bytes  File Size  =      35222 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-*Br   59 :pim_PT    : pim_PT/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      35149 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-*Br   60 :pim_PX    : pim_PX/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      34293 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.58     *
-*............................................................................*
-*Br   61 :pim_PY    : pim_PY/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      34585 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.57     *
-*............................................................................*
-*Br   62 :pim_PZ    : pim_PZ/F                                               *
-*Entries :    13515 : Total  Size=      54717 bytes  File Size  =      35214 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-*Br   63 :pim_ENERGY : pim_ENERGY/F                                          *
-*Entries :    13515 : Total  Size=      54741 bytes  File Size  =      35206 *
-*Baskets :        2 : Basket Size=      32000 bytes  Compression=   1.54     *
-*............................................................................*
-NTupleSvc                              INFO NTuples saved successfully
-ApplicationMgr                         INFO Application Manager Finalized successfully
-ApplicationMgr                         INFO Application Manager Terminated successfully
diff --git a/DaVinciTests/python/DaVinciTests/filters.py b/DaVinciTests/python/DaVinciTests/filters.py
index 180d6ffb1e1c6dd27f28557dc8abe7db9e661820..c71aa6f255235d246275aeb67e846f615aceb247 100644
--- a/DaVinciTests/python/DaVinciTests/filters.py
+++ b/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]}
diff --git a/DaVinciTests/python/DaVinciTests/funtuple_array.py b/DaVinciTests/python/DaVinciTests/funtuple_array.py
index fcce0363eccc5ce0d9eda6e2b1fcefa5ec0222fe..05162b0348bb4f09ee79bffde2085e806c40e74e 100644
--- a/DaVinciTests/python/DaVinciTests/funtuple_array.py
+++ b/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
diff --git a/DaVinciTests/python/DaVinciTests/recVertices.py b/DaVinciTests/python/DaVinciTests/recVertices.py
index 30432219bb980329567596706799d03d992a3230..ee4f8ac2ee9c78ebc1ec8991493e4150eae23527 100644
--- a/DaVinciTests/python/DaVinciTests/recVertices.py
+++ b/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 = {
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial0_basic_DVjob.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial0_basic_DVjob.py
index 79d198d6026ab13e84ba3260e08c35ee2cdb9cd3..56345ea5d14982d92bede9a47725e69e4c08663a 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial0_basic_DVjob.py
+++ b/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
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial1_functors_specialfield.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial1_functors_specialfield.py
index b9ca858a098b270a405bab28fe7c9e95efb70d4c..c04c0774ce1936d02c2e533dd3851b4d2ef49150 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial1_functors_specialfield.py
+++ b/DaVinciTutorials/python/DaVinciTutorials/tutorial1_functors_specialfield.py
@@ -91,7 +91,7 @@ def main(options: Options):
     print(F.PT.code_repr())
 
     # Define the TES location (see previous example for explanation)
-    turbo_line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    turbo_line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     input_data = get_particles(f"/Event/HLT2/{turbo_line}/Particles")
 
     # Define a filter (see previous example for explanation)
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial2_LoKi.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial2_LoKi.py
index 0c93b6b0ae7754b437955aae04d2a910a66c98b2..1a1cda227f1b8d43ec94fa7d7f4889327696b688 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial2_LoKi.py
+++ b/DaVinciTutorials/python/DaVinciTutorials/tutorial2_LoKi.py
@@ -96,7 +96,7 @@ def main(options: Options):
     }
 
     # Load data from dst onto a TES
-    turbo_line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    turbo_line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     input_data = get_particles(f"/Event/HLT2/{turbo_line}/Particles")
 
     # Add a filter
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial3_ThOrfunctors.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial3_ThOrfunctors.py
index fd6866b89fe622061583003b890705ebd86897c3..09d90d17e86ff58fa5361e3dc7108eb3d2729e21 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial3_ThOrfunctors.py
+++ b/DaVinciTutorials/python/DaVinciTutorials/tutorial3_ThOrfunctors.py
@@ -94,7 +94,7 @@ def main(options: Options):
     }
 
     # Load data from dst onto a TES
-    turbo_line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    turbo_line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     input_data = get_particles(f"/Event/HLT2/{turbo_line}/Particles")
 
     # Add a filter
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial4_trigger_eventinfo.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial4_trigger_eventinfo.py
index 6d357410f27482d6dc8ac50e824c4b803c1e8806..c2b042a98880d268d9e032dab13e4703b268b5a6 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial4_trigger_eventinfo.py
+++ b/DaVinciTutorials/python/DaVinciTutorials/tutorial4_trigger_eventinfo.py
@@ -116,8 +116,8 @@ def main(options: Options):
     selection_type = (
         "Hlt2"  # User defined and will be used as prefix for TBranch in the root file
     )
-    turbo_line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
-    turbo_line2 = "Hlt2BsToJpsiPhi_JPsi2ee_PhiToKK_Line"
+    turbo_line = "Hlt2B2CC_BsToJpsiPhi_Detached"
+    turbo_line2 = "Hlt2B2CC_BuToJpsiKplus_JpsiToMuMu_Prompt"
     line_names = [f"{turbo_line}Decision", f"{turbo_line2}"]
     selinfo = FC.SelectionInfo(selection_type=selection_type, trigger_lines=line_names)
     print(selinfo)
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial5_MCTruth.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial5_MCTruth.py
index 541ee0adbc3189b054f72cd217f3baaf6e3a3dfe..82672df626e33e9e9eba72a290050fbd93882871 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial5_MCTruth.py
+++ b/DaVinciTutorials/python/DaVinciTutorials/tutorial5_MCTruth.py
@@ -52,7 +52,7 @@ def main(options: Options):
     from DaVinciMCTools import MCTruthAndBkgCat
 
     # Load data from dst onto a TES
-    turbo_line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    turbo_line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     input_data = get_particles(f"/Event/HLT2/{turbo_line}/Particles")
     # Define an algorithm that builds a map i.e. one-to-one relation b/w Reco Particle -> Truth MC Particle.
     MCTRUTH = MCTruthAndBkgCat(input_data, name="MCTruthAndBkgCat_tuto")
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial6_DecayTreeFit.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial6_DecayTreeFit.py
index e5f255bf240b0decd36512946c7503c9a64fc6ae..ae387f3c4b0726f72249b9b543aa54fba4d0ec79 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial6_DecayTreeFit.py
+++ b/DaVinciTutorials/python/DaVinciTutorials/tutorial6_DecayTreeFit.py
@@ -65,7 +65,7 @@ def main(options: Options):
     }
 
     # Load data from dst onto a TES (See Example7)
-    turbo_line = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    turbo_line = "Hlt2B2CC_BsToJpsiPhi_Detached"
     input_data = get_particles(f"/Event/HLT2/{turbo_line}/Particles")
 
     # get kinematic functors
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial7_multiple_sel_lines.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial7_multiple_sel_lines.py
index cd592d7131906e8d783ad149569d35a9c3215be1..a683d5631f46630499591b60ccf02d343e8afeff 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial7_multiple_sel_lines.py
+++ b/DaVinciTutorials/python/DaVinciTutorials/tutorial7_multiple_sel_lines.py
@@ -29,16 +29,16 @@ def main(options: Options):
         "mum": "B_s0 -> (J/psi(1S) -> mu+ ^mu-) (phi(1020) ->K+ K-)",
     }
     fields2 = {
-        "Bs": "B_s0 -> (J/psi(1S) ->  e+  e-) (phi(1020) ->K+ K-)",
-        "ep": "B_s0 -> (J/psi(1S) -> ^e+  e-) (phi(1020) ->K+ K-)",
-        "em": "B_s0 -> (J/psi(1S) ->  e+ ^e-) (phi(1020) ->K+ K-)",
+        "B": "[B+ -> (J/psi(1S) -> mu+ mu- ) K+]CC",
+        "Jpsi": "[B+ -> ^(J/psi(1S) -> mu+ mu- ) K+]CC",
+        "Kp": "[B+ -> (J/psi(1S) -> mu+ mu- ) ^K+]CC",
     }
 
     # Define variables dictionary "field name" -> Collections of functor
     variables = {"ALL": FC.Kinematics()}
 
     # Load data from dst onto a TES
-    turbo_line1 = "Hlt2BsToJpsiPhi_JPsi2MuMu_PhiToKK_Line"
+    turbo_line1 = "Hlt2B2CC_BsToJpsiPhi_Detached"
     input_data1 = get_particles(f"/Event/HLT2/{turbo_line1}/Particles")
     my_filter1 = create_lines_filter("HDRFilter_SeeNoEvil1", lines=[f"{turbo_line1}"])
     mytuple1 = Funtuple(
@@ -50,7 +50,7 @@ def main(options: Options):
     )
 
     # If running over several sprucing lines (e.g. for calibration) one can define multiple instances of FunTuple
-    turbo_line2 = "Hlt2BsToJpsiPhi_JPsi2ee_PhiToKK_Line"
+    turbo_line2 = "Hlt2B2CC_BuToJpsiKplus_JpsiToMuMu_Prompt"
     input_data2 = get_particles(f"/Event/HLT2/{turbo_line2}/Particles")
     my_filter2 = create_lines_filter("HDRFilter_SeeNoEvil2", lines=[f"{turbo_line2}"])
     mytuple2 = Funtuple(
diff --git a/DaVinciTutorials/tests/qmtest/test_tutorial1_functors_specialfield.qmt b/DaVinciTutorials/tests/qmtest/test_tutorial1_functors_specialfield.qmt
index 09702432951ac8de59198c5ac67e7f667564fa9b..6a50663438b25d3d42f2a07e4e1bfddd41212806 100644
--- a/DaVinciTutorials/tests/qmtest/test_tutorial1_functors_specialfield.qmt
+++ b/DaVinciTutorials/tests/qmtest/test_tutorial1_functors_specialfield.qmt
@@ -44,7 +44,7 @@ df = get_pandas_dataframe(ntuple, 'TDirectoryName/TTreeName')
 # Check ntuple structure
 if df.empty:
     raise Exception(f"File {ntuple}: ntuple does not contain any branches")
-if df.shape != (30, 22):
+if df.shape != (41, 22):
     causes.append("Ntuple not with expected number of entries and/or branches")
 
 # Check there are no NaN values in the ntuple
diff --git a/DaVinciTutorials/tests/qmtest/test_tutorial2_LoKi.qmt b/DaVinciTutorials/tests/qmtest/test_tutorial2_LoKi.qmt
index 78d8ed1ad6a10f20b52b3dbaea84d925819146fa..7d27442cdad4bf74fe2068cdd68aa928e546ea00 100644
--- a/DaVinciTutorials/tests/qmtest/test_tutorial2_LoKi.qmt
+++ b/DaVinciTutorials/tests/qmtest/test_tutorial2_LoKi.qmt
@@ -45,7 +45,7 @@ df = get_pandas_dataframe(ntuple, 'TDirectoryName/TTreeName')
 # Check ntuple structure
 if df.empty:
     causes.append(f"File {ntuple}: ntuple does not contain any branches")
-if df.shape != (30, 50):
+if df.shape != (41, 50):
     causes.append("Ntuple not with expected number of entries and/or branches")
 
 # Check there are no NaN values in the ntuple
diff --git a/DaVinciTutorials/tests/qmtest/test_tutorial3_ThOrfunctors.qmt b/DaVinciTutorials/tests/qmtest/test_tutorial3_ThOrfunctors.qmt
index 5bc26568527cdb8c5f343151cc81151365c6c133..746c621b2a1266b029975f639d42e301f654dd81 100644
--- a/DaVinciTutorials/tests/qmtest/test_tutorial3_ThOrfunctors.qmt
+++ b/DaVinciTutorials/tests/qmtest/test_tutorial3_ThOrfunctors.qmt
@@ -45,12 +45,18 @@ df = get_pandas_dataframe(ntuple, 'TDirectoryName/TTreeName')
 # Check ntuple structure
 if df.empty:
     causes.append(f"File {ntuple}: ntuple does not contain any branches")
-if df.shape != (30, 26):
+if df.shape != (41, 26):
     causes.append("Ntuple not with expected number of entries and/or branches")
 
-# Check there are no NaN values in the ntuple
-if df_has_nan(df):
-    causes.append("Ntuple contains NaN entries")
+# 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 = ['Bs_phi_mass_kk', 'Bs_phi_mass_kpi']  # MASSWITHHYPOTHESES variables
+
+l_test = list_fields_with_nan(ntuple, "TDirectoryName/TTreeName")
+if sorted(l_test) != sorted(l_branches_with_nans):
+    causes.append("Unexpected list of branches with NaN values")
+
 
 # Checks PIDs are correctly assigned
 if not ( (df["Bs_Kp_ID"].abs() == 321).all() and (df["Bs_jpsi_ID"].abs() == 443).all() and (df["Bs_phi_ID"].abs() == 333).all() ):
diff --git a/DaVinciTutorials/tests/qmtest/test_tutorial4_trigger_eventinfo.qmt b/DaVinciTutorials/tests/qmtest/test_tutorial4_trigger_eventinfo.qmt
index 430c644366e048bc11b4d9d2013e3f5277e365e2..89313153a53f503ff9417a5c8769be01c49e2c8b 100644
--- a/DaVinciTutorials/tests/qmtest/test_tutorial4_trigger_eventinfo.qmt
+++ b/DaVinciTutorials/tests/qmtest/test_tutorial4_trigger_eventinfo.qmt
@@ -45,7 +45,7 @@ df = get_pandas_dataframe(ntuple, 'TDirectoryName/TTreeName')
 # Check ntuple structure
 if df.empty:
     causes.append(f"File {ntuple}: ntuple does not contain any branches")
-if df.shape != (30, 12):
+if df.shape != (41, 12):
     causes.append("Ntuple not with expected number of entries and/or branches")
 
 # Check there are no NaN values in the ntuple
diff --git a/DaVinciTutorials/tests/qmtest/test_tutorial5_MCTruth.qmt b/DaVinciTutorials/tests/qmtest/test_tutorial5_MCTruth.qmt
index d890f93e3590991658a414fb284fde1bd6f73806..7741f6b4dfda0fc3527d28ad5d2b50ef0e8cf420 100644
--- a/DaVinciTutorials/tests/qmtest/test_tutorial5_MCTruth.qmt
+++ b/DaVinciTutorials/tests/qmtest/test_tutorial5_MCTruth.qmt
@@ -45,28 +45,27 @@ df = get_pandas_dataframe(ntuple, 'TDirectoryName/TTreeName')
 # Check ntuple structure
 if df.empty:
     causes.append(f"File {ntuple}: ntuple does not contain any branches")
-if df.shape != (30, 39):
+if df.shape != (41, 39):
     causes.append("Ntuple not with expected number of entries and/or branches")
 
 # 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 = ['Bs_TRUEP', 'Jpsi_TRUEP', 'Phi_TRUEP', 'Mup_TRUEP', 'Mum_TRUEP', 'Kp_TRUEEPHI', 'Kp_TRUEP', 'Km_TRUEP']
+l_branches_with_nans = ['Bs_TRUEP', 'Phi_TRUEP']
 l_test = list_fields_with_nan(ntuple, 'TDirectoryName/TTreeName')
 if sorted(l_test) != sorted(l_branches_with_nans):
     causes.append("Unexpected list of branches with NaN values")
 
 # Checks PIDs are correctly assigned
-if not ((df.filter(regex=("[B|J|P].*TRUEID"))==0).all().all()  # no matched MC
-        and ( (df["Km_TRUEID"].abs()==0).sum() + (df["Kp_TRUEID"].abs()==0).sum() == 14 )
-        and ( (df["Mum_TRUEID"].abs()==0).sum() + (df["Mup_TRUEID"].abs()==0).sum() == 3 )
-       ):
-    causes.append("Ntuple contains unexpected TRUEID values")
+if ((df.filter(regex=("[B|J|P].*TRUEID"))==0).all().all() or (df.filter(regex=("[K|Mu].*TRUEID"))==0).all().all()):  # If all TRUEIDS are 0 something is wrong
+  causes.append("Ntuple contains unexpected TRUEID values")  # no matched MC
+
+if not ((df["Km_TRUEID"]).sum() + (df["Kp_TRUEID"]).sum() + (df["Mum_TRUEID"]).sum() + (df["Mup_TRUEID"]).sum() == 0 ):  # ABS(TRUEID) should be consistent for particles and particles in final state
+  causes.append("Ntuple contains unexpected TRUEID values")
 
 # Check background categories
-if not ((df.filter(regex=("[B|J|P].*BKGCAT"))!=0).all().all()
-         and (df.filter(regex=("[K|Mu].*BKGCAT"))==-1).all().all()  # for kaons and muons, all entries are -1
-       ):
-    causes.append("Ntuple contains unexpected BKGCAT values")
+if not (df.filter(regex=("[K|Mu].*BKGCAT"))==-1).all().all() or ((df.filter(regex=("[B|J|P].*BKGCAT"))!=0).all().all()): #Should have some true signal and K and Mu have BKGCAT=-1
+  causes.append("Ntuple contains unexpected BKGCAT values")
+
 
 print('Test successfully completed!')
 os.system(f"rm {ntuple}")
diff --git a/DaVinciTutorials/tests/qmtest/test_tutorial6_DecayTreeFit.qmt b/DaVinciTutorials/tests/qmtest/test_tutorial6_DecayTreeFit.qmt
index 5dcd292718e26f303f9ce9003a9255217043ed35..35a222fb837e9ea7d7c22195919cac95b61fb331 100644
--- a/DaVinciTutorials/tests/qmtest/test_tutorial6_DecayTreeFit.qmt
+++ b/DaVinciTutorials/tests/qmtest/test_tutorial6_DecayTreeFit.qmt
@@ -43,7 +43,7 @@ df = get_pandas_dataframe(ntuple, 'TDirectoryName/TTreeName')
 
 # Check ntuple structure
 if df.empty: raise Exception(f"File {ntuple}: ntuple does not contain any branches. Please check.")
-assert df.shape == (30, 48)
+assert df.shape == (41, 48)
 
 # Check there are no NaN values in the ntuple
 if df_has_nan(df):
diff --git a/DaVinciTutorials/tests/qmtest/test_tutorial7_multiple_sel_lines.qmt b/DaVinciTutorials/tests/qmtest/test_tutorial7_multiple_sel_lines.qmt
index 17e907f81579cde768876f2fcfe5da19c3f1cb86..eef5253f2197aff40db3f03f80bab3eef1680573 100644
--- a/DaVinciTutorials/tests/qmtest/test_tutorial7_multiple_sel_lines.qmt
+++ b/DaVinciTutorials/tests/qmtest/test_tutorial7_multiple_sel_lines.qmt
@@ -48,9 +48,9 @@ if df1.empty:
     causes.append(f"File {ntuple}: ntuple 'TDirectoryName1/TTreeName1' does not contain any branches")
 if df2.empty:
     causes.append(f"File {ntuple}: ntuple 'TDirectoryName2/TTreeName2' does not contain any branches")
-if df1.shape != (30, 23):
+if df1.shape != (41, 23):
     causes.append("Ntuple 'TDirectoryName1/TTreeName1' not with expected number of entries and/or branches")
-if df2.shape != (13, 23):
+if df2.shape != (26, 23):
     causes.append("Ntuple 'TDirectoryName2/TTreeName2' not with expected number of entries and/or branches")
 
 # Check there are no NaN values in the ntuples