diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py b/DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py
index 86e0480ca94a0dbcab4a690f58d7975a260fb7bb..6acf6c95207c990168c7943fe338e82e9c5fba15 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py
+++ b/DaVinciExamples/python/DaVinciExamples/tupling/AllFunctors.py
@@ -262,15 +262,11 @@ def event_variables(PVs, ODIN, decreports):
Lines=[bd2dsk_line + "Decision"], DecReports=decreports)
# DECREPORTS_RE_FILTER
if ODIN:
- evt_vars['EVENTNUMBER'] = F.EVENTNUMBER(
- ODIN
- ) # WARNING FunTupleBase<Gaudi::NamedRange_<std::vector<LHCb::Particle const*,std::allocator<LHCb::Particle const*> >,__gnu_cxx::__normal_iterator<LHCb::Particle const* const*,std::vector<LHCb::Particle const*,std::allocator<LHCb::Particle const*> > > > >:: Tuple 'DecayTree' 'unsigned long' has different sizes on 32/64 bit systems. Casting 'EVENTNUMBER' to 'unsigned long long'
evt_vars['EVENTTYPE'] = F.EVENTTYPE(ODIN)
evt_vars['GPSTIME'] = F.GPSTIME(
ODIN
) # WARNING FunTupleBase<Gaudi::NamedRange_<std::vector<LHCb::Particle const*,std::allocator<LHCb::Particle const*> >,__gnu_cxx::__normal_iterator<LHCb::Particle const* const*,std::vector<LHCb::Particle const*,std::allocator<LHCb::Particle const*> > > > >:: Tuple 'DecayTree' 'unsigned long' has different sizes on 32/64 bit systems. Casting 'EVENTNUMBER' to 'unsigned long long'
evt_vars['ODINTCK'] = F.ODINTCK(ODIN)
- evt_vars['RUNNUMBER'] = F.RUNNUMBER(ODIN)
evt_vars['PV_SIZE'] = F.SIZE(
PVs) # no matching function for call to 'invoke'
if decreports: evt_vars['TCK'] = F.TCK(decreports)
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py
index 93bcca9b1af2f3b448a93714b1f24efbf80b6ad5..cb076806c0dadddee19f6b9e5faf9dbfd8e64e20 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py
+++ b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py
@@ -16,8 +16,8 @@ import Functors as F
from FunTuple import FunctorCollection as FC
from FunTuple import FunTuple_Particles as Funtuple
from DaVinci.algorithms import add_filter
-from DaVinci import make_config, Options
from FunTuple.functorcollections import EventInfo
+from DaVinci import make_config, Options
from PyConf.reading import get_particles, get_rec_summary
@@ -39,8 +39,7 @@ def main(options: Options):
'nPVs': F.VALUE_OR(-1) @ F.NPVS(rec_summary),
'nFTClusters': F.VALUE_OR(-1) @ F.NFTCLUSTERS(rec_summary)
})
- #Get RunNUmber and EventNumber
- evt_vars += EventInfo(extra_info=True)
+ evt_vars += EventInfo()
#get particles to run over
line_name = 'Hlt2SLB_LbToLcMuNu_LcToPKPi_Line'
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_data.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_data.py
index 36664d186a404c4a5fb90ac33fdacab047c3ca2a..e696dfd11649a204ff73276e758da9e1431368a5 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_data.py
+++ b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_data.py
@@ -92,7 +92,7 @@ def main(options: Options):
#
# Event variables
#
- evt_vars = EventInfo(extra_info=True)
+ evt_vars = EventInfo()
evt_vars['PV_SIZE'] = F.SIZE(v2_pvs)
tuple_KS2PiPi = Funtuple(
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2.py
index ccefa189fad4d83355d78f904952edbd9b7d04e7..90bd6c830b23694bcf7183ffd0fc45eb8d43376e 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2.py
+++ b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2.py
@@ -14,7 +14,7 @@ Read an HLT2 file and create an ntuple with the new DaVinci configuration.
import Functors as F
from FunTuple import FunctorCollection as FC
from FunTuple import FunTuple_Particles as Funtuple
-from PyConf.reading import get_particles, get_pvs, get_odin
+from PyConf.reading import get_particles, get_pvs
from DaVinci.algorithms import add_filter
from DaVinci import Options, make_config
from DaVinci.truth_matching import configured_MCTruthAndBkgCatAlg
@@ -93,17 +93,11 @@ def main(options: Options):
#sort of related issue (https://gitlab.cern.ch/lhcb/Rec/-/issues/356)
#variables['D0'] += FC({'TRUEPT_Kaon': MCTRUTH(F.CHILD(1, F.PT))})
- #get odin which hold the event information
- odin = get_odin()
-
- #define event level variables
- evt_variables = FC({
- "RUNNUMBER": F.RUNNUMBER(odin),
- "EVENTNUMBER": F.EVENTNUMBER(odin)
- })
- evt_variables += SelectionInfo(
+ #define event level variables (just as an example)
+ evt_variables = SelectionInfo(
selection_type="Hlt2", trigger_lines=[line_name])
- #For now remove: The 'Hlt2' line decision tuples fine but breaks unit test with an error. (Why?)
+ #For now remove: The 'Hlt2' line decision is written okay but breaks unit test with an error.
+ #This is possibly related to having long TBranch names.
#see linked issue here: https://gitlab.cern.ch/lhcb/DaVinci/-/merge_requests/654#note_5320732
evt_variables.pop('Hlt2')
diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py
index 7839279a3118a7556ab576e5ebe48ce670b925eb..e830a7de9dad5146129d32d0909d5458cdb26f15 100644
--- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py
+++ b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_substitutePID.py
@@ -74,7 +74,7 @@ def main(options: Options):
variables = {'ALL': variables_all}
# Get event information
- evt_vars = EventInfo(extra_info=True)
+ evt_vars = EventInfo()
#
# Configure Funtuple algorithms
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_trigger_decisions.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_trigger_decisions.qmt
index 9fb75425aedb9c58dd1ea1788ded43cd1e262a00..c8b5334c115a21e85ff8d6453dc05d456f50d452 100644
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_trigger_decisions.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_trigger_decisions.qmt
@@ -45,7 +45,9 @@ B_vars_stored =['B0_ID',
'Hlt1_Hlt1D2KPiDecision',
'Hlt1_Hlt1D2PiPiDecision',
'Hlt1_Hlt1TrackMVADecision',
-'Hlt1_TCK'
+'Hlt1_TCK',
+'RUNNUMBER',
+'EVENTNUMBER'
]
#sort the expected vars
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF.qmt
index 0dc14a6fc940d662fa256e409b2003c5e9a16069..3c875bf9f3f5f5b80108337e932a3f26f38e6927 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF.qmt
@@ -23,10 +23,9 @@
histo_file: DV-example-tupling-DTF-his.root
input_raw_format: 4.3
ntuple_file: DV-example-tupling-DTF-ntp.root
- input_process: Turbo
</text></argument>
<argument name="validator"><text>
-findReferenceBlock("""DimuonsTuple SUCCESS ID=DecayTree Title="DecayTree" #items=16 {Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm_PT,Jpsi_LOKI_MAXPT,Jp}""")
+findReferenceBlock("""DimuonsTuple SUCCESS ID=DecayTree Title="DecayTree" #items=18 {EVENTNUMBER,RUNNUMBER,Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm}""")
countErrorLines({"FATAL":0, "ERROR":0})
</text></argument>
</extension>
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt
index b90910348603a280a3c4c8acb15dcfe70544dbc8..fc81b742c5a1c5730a486783ad33b1b8a78a80df 100644
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_DTF_SubsPID.qmt
@@ -30,6 +30,7 @@ from ROOT import TFile
B_vars_stored = ['Bs_DTF_JpsiKst_CHI2DOF', 'Bs_DTF_JpsiKst_ENERGY', 'Bs_DTF_JpsiKst_ID', 'Bs_DTF_JpsiKst_M', 'Bs_DTF_JpsiKst_P', 'Bs_DTF_JpsiPhi_CHI2DOF', 'Bs_DTF_JpsiPhi_ENERGY', 'Bs_DTF_JpsiPhi_ID', 'Bs_DTF_JpsiPhi_M', 'Bs_DTF_JpsiPhi_P', 'Bs_ORIGINAL_CHI2DOF', 'Bs_ORIGINAL_ENERGY', 'Bs_ORIGINAL_ID', 'Bs_ORIGINAL_M', 'Bs_ORIGINAL_P', 'Jpsi_DTF_JpsiKst_CHI2DOF', 'Jpsi_DTF_JpsiKst_ENERGY', 'Jpsi_DTF_JpsiKst_ID', 'Jpsi_DTF_JpsiKst_M', 'Jpsi_DTF_JpsiKst_P', 'Jpsi_DTF_JpsiPhi_CHI2DOF', 'Jpsi_DTF_JpsiPhi_ENERGY', 'Jpsi_DTF_JpsiPhi_ID', 'Jpsi_DTF_JpsiPhi_M', 'Jpsi_DTF_JpsiPhi_P', 'Jpsi_ORIGINAL_CHI2DOF', 'Jpsi_ORIGINAL_ENERGY', 'Jpsi_ORIGINAL_ID', 'Jpsi_ORIGINAL_M', 'Jpsi_ORIGINAL_P', 'KM_DTF_JpsiKst_CHI2DOF', 'KM_DTF_JpsiKst_ENERGY', 'KM_DTF_JpsiKst_ID', 'KM_DTF_JpsiKst_M', 'KM_DTF_JpsiKst_P', 'KM_DTF_JpsiPhi_CHI2DOF', 'KM_DTF_JpsiPhi_ENERGY', 'KM_DTF_JpsiPhi_ID', 'KM_DTF_JpsiPhi_M', 'KM_DTF_JpsiPhi_P', 'KM_ORIGINAL_CHI2DOF', 'KM_ORIGINAL_ENERGY', 'KM_ORIGINAL_ID', 'KM_ORIGINAL_M', 'KM_ORIGINAL_P', 'KP_DTF_JpsiKst_CHI2DOF', 'KP_DTF_JpsiKst_ENERGY', 'KP_DTF_JpsiKst_ID', 'KP_DTF_JpsiKst_M', 'KP_DTF_JpsiKst_P', 'KP_DTF_JpsiPhi_CHI2DOF', 'KP_DTF_JpsiPhi_ENERGY', 'KP_DTF_JpsiPhi_ID', 'KP_DTF_JpsiPhi_M', 'KP_DTF_JpsiPhi_P', 'KP_ORIGINAL_CHI2DOF', 'KP_ORIGINAL_ENERGY', 'KP_ORIGINAL_ID', 'KP_ORIGINAL_M', 'KP_ORIGINAL_P', 'MuM_DTF_JpsiKst_CHI2DOF', 'MuM_DTF_JpsiKst_ENERGY', 'MuM_DTF_JpsiKst_ID', 'MuM_DTF_JpsiKst_M', 'MuM_DTF_JpsiKst_P', 'MuM_DTF_JpsiPhi_CHI2DOF', 'MuM_DTF_JpsiPhi_ENERGY', 'MuM_DTF_JpsiPhi_ID', 'MuM_DTF_JpsiPhi_M', 'MuM_DTF_JpsiPhi_P', 'MuM_ORIGINAL_CHI2DOF', 'MuM_ORIGINAL_ENERGY', 'MuM_ORIGINAL_ID', 'MuM_ORIGINAL_M', 'MuM_ORIGINAL_P', 'MuP_DTF_JpsiKst_CHI2DOF', 'MuP_DTF_JpsiKst_ENERGY', 'MuP_DTF_JpsiKst_ID', 'MuP_DTF_JpsiKst_M', 'MuP_DTF_JpsiKst_P', 'MuP_DTF_JpsiPhi_CHI2DOF', 'MuP_DTF_JpsiPhi_ENERGY', 'MuP_DTF_JpsiPhi_ID', 'MuP_DTF_JpsiPhi_M', 'MuP_DTF_JpsiPhi_P', 'MuP_ORIGINAL_CHI2DOF', 'MuP_ORIGINAL_ENERGY', 'MuP_ORIGINAL_ID', 'MuP_ORIGINAL_M', 'MuP_ORIGINAL_P', 'Phi_DTF_JpsiKst_CHI2DOF', 'Phi_DTF_JpsiKst_ENERGY', 'Phi_DTF_JpsiKst_ID', 'Phi_DTF_JpsiKst_M', 'Phi_DTF_JpsiKst_P', 'Phi_DTF_JpsiPhi_CHI2DOF', 'Phi_DTF_JpsiPhi_ENERGY', 'Phi_DTF_JpsiPhi_ID', 'Phi_DTF_JpsiPhi_M', 'Phi_DTF_JpsiPhi_P', 'Phi_ORIGINAL_CHI2DOF', 'Phi_ORIGINAL_ENERGY', 'Phi_ORIGINAL_ID', 'Phi_ORIGINAL_M', 'Phi_ORIGINAL_P']
+B_vars_stored += ['RUNNUMBER', 'EVENTNUMBER']
#sort the expected vars
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_advanced.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_advanced.qmt
index 43d6245717b7e7e6a329098bb06592cdc21d12de..8bb4f9bb239665d9ca58ad348cf6fef48fbb2f68 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_advanced.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_advanced.qmt
@@ -46,7 +46,9 @@ Jpsi_vars_stored = ['Jpsi_MAXPT',
'MuPlus_PT',
'MuPlus_PX',
'MuPlus_PY',
- 'MuPlus_PZ']
+ 'MuPlus_PZ',
+ 'RUNNUMBER',
+ 'EVENTNUMBER']
Ks_vars_stored = ['KS_MAXPT',
'KS_PX',
@@ -59,7 +61,9 @@ Ks_vars_stored = ['KS_MAXPT',
'KS_ENERGY',
'KS_P',
'KS_M',
- 'KS_PT']
+ 'KS_PT',
+ 'RUNNUMBER',
+ 'EVENTNUMBER']
#sort the expected vars
Jpsi_vars_stored = sorted(Jpsi_vars_stored)
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_tistos.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_tistos.qmt
index dfea5b95d3a59634c0b003d5640d01b18add2234..b3bf5858ad15d4eae45369fcf4f20c9f059e0847 100644
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_tistos.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_tistos.qmt
@@ -19,8 +19,7 @@
</set></argument>
<argument name="options_yaml_fn"><text>$DAVINCIEXAMPLESROOT/example_data/test_tistos.yaml</text></argument>
<argument name="extra_options_yaml"><text>
- histo_file: tistos_histos.root
- ntuple_file: tistos_ntuple.root
+ ntuple_file: tuple_tistos.root
print_freq: 1
</text></argument>
<argument name="reference"><text>../refs/test_davinci_tupling_tistos.ref</text></argument>
@@ -34,6 +33,7 @@ import sys, os, glob
from ROOT import TFile
B_vars_stored =['phi2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Km2_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km2_PT', 'Kp2_PT', 'Bs_Hlt1_Hlt1TrackMVADecision_TOS', 'Bs_PT', 'Kp2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Km1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'phi1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Kp2_Hlt1_Hlt1TrackMVADecision_TOS', 'Kp2_Hlt1_Hlt1TrackMVADecision_TIS', 'Kp2_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Bs_Hlt1_Hlt1TrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TrackMVADecision_TOS', 'phi2_Hlt1_Hlt1TrackMVADecision_TOS', 'Kp1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km2_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'Kp1_Hlt1_Hlt1TrackMVADecision_TOS', 'Km1_Hlt1_Hlt1TrackMVADecision_TIS', 'Km1_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'phi2_PT', 'Kp1_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi1_Hlt1_Hlt1TrackMVADecision_TIS', 'phi2_Hlt1_Hlt1TrackMVADecision_TIS', 'phi1_PT', 'Hlt1_Hlt1TrackMVADecision', 'Hlt1_TCK', 'Kp1_Hlt1_Hlt1TrackMVADecision_TIS', 'Hlt1_Hlt1TwoTrackMVADecision', 'Kp1_PT', 'Km2_Hlt1_Hlt1TrackMVADecision_TIS', 'Bs_Hlt1_Hlt1TwoTrackMVADecision_TOS', 'Km1_Hlt1_Hlt1TrackMVADecision_TOS', 'Km2_Hlt1_Hlt1TrackMVADecision_TOS', 'Km1_PT', 'Bs_Hlt1_Hlt1TwoTrackMVADecision_TIS', 'phi2_Hlt1_Hlt1TwoTrackMVADecision_TOS']
+B_vars_stored += ['RUNNUMBER', 'EVENTNUMBER']
#sort the expected vars
B_vars_stored = sorted(B_vars_stored)
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_weightedrelation_trackvariables.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_weightedrelation_trackvariables.qmt
index 7f38ef9dc4d418bfd9fe1951776524e17a4b6605..f26015bf67ea1a7c32056251c6eb6b0226c03fdc 100644
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_weightedrelation_trackvariables.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_weightedrelation_trackvariables.qmt
@@ -30,7 +30,7 @@
<argument name="timeout"><integer>3600</integer></argument>
<argument name="reference"><text>$DAVINCIEXAMPLESROOT/tests/refs/test_davinci_tupling_weightedrelation_trackvariables.ref</text></argument>
<argument name="validator"><text>
-findReferenceBlock("""Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=32 {B_THOR_P,B_THOR_PT,B_THOR_MASS,B_First_P,B_First_PT,B_Sum_P,B_Sum_PT,B_Max_P,B_Ma}""")
+findReferenceBlock("""Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=34 {EVENTNUMBER,RUNNUMBER,B_THOR_P,B_THOR_PT,B_THOR_MASS,B_First_P,B_First_PT,B_Sum_P}""")
countErrorLines({"FATAL":0, "ERROR":0})
</text></argument>
</extension>
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
index b4e0c1a3fb9530d984e96077373184a23b8c7e91..c3ee1d6b6baee49d942260d2f0f3cd1a59c3b067 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_v2_composites.qmt
@@ -29,8 +29,8 @@
import sys, os, glob
from ROOT import TFile
-B_vars_stored =['B_PX', 'B_PY', 'B_PZ']
-K_vars_stored =['K_PX', 'K_PY', 'K_PZ']
+B_vars_stored =['B_PX', 'B_PY', 'B_PZ', 'RUNNUMBER', 'EVENTNUMBER']
+K_vars_stored =['K_PX', 'K_PY', 'K_PZ', 'RUNNUMBER', 'EVENTNUMBER']
#sort the expected vars
B_vars_stored = sorted(B_vars_stored)
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic-run-mc.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic-run-mc.qmt
index e8060eafb77cf98d25b22b871bebc99220cfd814..3e20965f96aac2471dcdf7293689a44995ecd7ea 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic-run-mc.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic-run-mc.qmt
@@ -23,7 +23,7 @@
histo_file: DV-example-tupling-basic-his-run-mc.root
input_raw_format: 4.3
ntuple_file: DV-example-tupling-basic-ntp-run-mc.root
- input_process: Turbo
+ input_process: Hlt2
</text></argument>
<argument name="reference"><text>../refs/test_davinci_tupling-basic-run-mc.ref</text></argument>
<argument name="error_reference"><text>../refs/empty.ref</text></argument>
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic.qmt
index c58c91578f8180ef2524629e6c172bb503a3ec93..5e59298cdc0c0465745d8a2b1834dbaba3253c47 100644
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_example-tupling-basic.qmt
@@ -21,7 +21,7 @@
histo_file: DV-example-tupling-basic-his.root
evt_max: 10
input_raw_format: 4.3
- input_process: Spruce
+ input_process: Hlt2
</text></argument>
<argument name="timeout"><integer>3600</integer></argument>
<argument name="args"><set>
diff --git a/DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref b/DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref
index 2fa018b52df1c40e6e39f900df7cb7229896cd43..f94cb659e9db03c0535b31eda64b47b89cef2821 100644
--- a/DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_configFuntuple.ref
@@ -136,7 +136,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
Tuple_B0Dspi SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
Tuple_B0Dspi SUCCESS List of booked N-Tuples in directory "FILE1/Tuple_B0Dspi"
-Tuple_B0Dspi SUCCESS ID=DecayTree Title="DecayTree" #items=25 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_M,B}
+Tuple_B0Dspi SUCCESS ID=DecayTree Title="DecayTree" #items=27 {EVENTNUMBER,RUNNUMBER,B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTR}
LAZY_AND: DaVinci #=118 Sum=1 Eff=|(0.8474576 +- 0.843859)%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
index abbd8fdf265a64016a11881c3d5419d28425bde9..0c5f72ab4fd5a38caa2da95c413a1d5eae3555c6 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
@@ -18,7 +18,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
DimuonsTuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
DimuonsTuple SUCCESS List of booked N-Tuples in directory "FILE1/DimuonsTuple"
-DimuonsTuple SUCCESS ID=DecayTree Title="DecayTree" #items=10 {Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm_PT,Jpsi_LOKI_MAXPT,Jp}
+DimuonsTuple SUCCESS ID=DecayTree Title="DecayTree" #items=12 {EVENTNUMBER,RUNNUMBER,Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm}
LAZY_AND: DaVinci #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: FileSummaryRecords #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
index 19472682332a044fd4c6b6eee11558bfee3d2489..eca255f566725f2fcb93ec559941875618b4318b 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
@@ -25,7 +25,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
B0DsK_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
B0DsK_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0DsK_Tuple"
-B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=23 {B0_THOR_MASS,B0_PT,B0_TRUEID,indx,B0_TagTr_P[1]/V,nTags,B0_TagTr_PT[1]/V,B0_TagTr}
+B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=25 {EVENTNUMBER,RUNNUMBER,B0_THOR_MASS,B0_PT,B0_TRUEID,indx,B0_TagTr_P[1]/V,nTags,B0_}
LAZY_AND: DaVinci #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%|
NONLAZY_OR: FileSummaryRecords #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
index 5ca366903538218755888e2973a4319cb217705f..3983f48074cd886e36e00bab5e7a5a72e766be00 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_passthrough.ref
@@ -20,7 +20,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
Bs2JpsiPhi_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
Bs2JpsiPhi_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/Bs2JpsiPhi_Tuple"
-Bs2JpsiPhi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=21 {Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,Jpsi_M,Jpsi_P,Jpsi_PT,Jpsi_PX,Jpsi_PY}
+Bs2JpsiPhi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=23 {EVENTNUMBER,RUNNUMBER,Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,Jpsi_M,Jpsi_P,J}
LAZY_AND: DaVinci #=1978 Sum=298 Eff=|( 15.06572 +- 0.804310)%|
NONLAZY_OR: FileSummaryRecords #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=1978 Sum=1978 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref
index 9ca71f64f2074335aa738c1e0a68166f950c65bb..d4000df163b9099613e89ad86a14effa6763fc4c 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_from_spruce.ref
@@ -137,10 +137,10 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
B0DsK_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
B0DsK_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0DsK_Tuple"
-B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=27 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_M,B}
+B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=29 {EVENTNUMBER,RUNNUMBER,B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTR}
B0Dspi_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
B0Dspi_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0Dspi_Tuple"
-B0Dspi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=27 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_M,B}
+B0Dspi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=29 {EVENTNUMBER,RUNNUMBER,B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTR}
LAZY_AND: DaVinci #=118 Sum=48 Eff=|( 40.67797 +- 4.52217 )%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_tistos.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_tistos.ref
index 360d5a4eed84dc67090bdb1826e39d5a3850fe24..da3fbe3ae53afa25085a6724700b25965e12e802 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_tistos.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_tistos.ref
@@ -1,8 +1,7 @@
-# WARNING: Created new key fc063a81 - to publish the corresponding decoding table, please do `git -C /disk/users/amathad/stack_moore/lhcb-metainfo/.git push origin key-fc063a81`
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to DaVinci version 63.2
- running on grid-ui.physik.uzh.ch on Wed Nov 30 16:20:48 2022
+ Welcome to DaVinci version 63.3
+ running on grid-ui.physik.uzh.ch on Thu Jan 12 18:41:11 2023
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
ToolSvc.GitDDDB INFO opening Git repository '/cvmfs/lhcb.cern.ch/lib/lhcb/git-conddb/DDDB.git'
@@ -18,21 +17,20 @@ MagneticFieldGridReader INFO Opened magnetic field file: /cvmfs/lhcb.cern.ch/l
MagneticFieldGridReader INFO Opened magnetic field file: /cvmfs/lhcb.cern.ch/lib/lhcb/DBASE/FieldMap/v5r7/cdf//field.v5r0.c3.up.cdf
MagneticFieldGridReader INFO Opened magnetic field file: /cvmfs/lhcb.cern.ch/lib/lhcb/DBASE/FieldMap/v5r7/cdf//field.v5r0.c4.up.cdf
MagneticFieldSvc INFO Map scaled by factor 1 with polarity internally used: 1 signed relative current: 1
-NTupleSvc INFO Added stream file:outputDV_selrep_bs2phiphi.root as FILE1
+NTupleSvc INFO Added stream file:tuple_tistos.root as FILE1
HLTControlFlowMgr INFO Start initialization
-RootHistSvc INFO Writing ROOT histograms to: outputDV_selrep_bs2phiphi.root
+RootHistSvc INFO Writing ROOT histograms to: tuple_tistos.root
HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc
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 15288 ms
+HLTControlFlowMgr INFO ---> End of Initialization. This took 12014 ms
ApplicationMgr INFO Application Manager Initialized successfully
-FunctorFactory INFO New functor library will be created.
-FunctorFactory INFO Compilation of functor library took 25 seconds
+FunctorFactory INFO Reusing functor library: "/tmp/FunctorJitLib_0xe081e371dcc50067_0xb187bef70cf91c4.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='root://eoslhcb.cern.ch//eos/lhcb/user/o/oozcelik/tistos/moore_bs2phiphi_Hlt2filter.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
+EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/moore_bs2phiphi_Hlt2filter.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
@@ -40,258 +38,268 @@ HltANNSvc WARNING key 0x2b4c499d has an explicitly con
HltANNSvc WARNING key 0xfc063a81 has an explicitly configured overrule -- using that...
HltANNSvc WARNING key 0x86a1c9c0 has an explicitly configured overrule -- using that...
HltANNSvc WARNING key 0x86a1c9c0 has an explicitly configured overrule -- using that...
-RFileCnv INFO opening Root file "outputDV_selrep_bs2phiphi.root" for writing
-RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory outputDV_selrep_bs2phiphi.root:/Tuple
-HLTControlFlowMgr INFO Timing started at: 16:22:30
+RFileCnv INFO opening Root file "tuple_tistos.root" for writing
+RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory tuple_tistos.root:/Tuple
+HLTControlFlowMgr INFO Timing started at: 18:42:22
HLTControlFlowMgr INFO No more events in event selection
-HLTControlFlowMgr INFO ---> Loop over 39 Events Finished - WSS 1559.77, timed 29 Events: 1070 ms, Evts/s = 27.1028
+HLTControlFlowMgr INFO ---> Loop over 71 Events Finished - WSS 1555.53, timed 61 Events: 640 ms, Evts/s = 95.3125
HDRFilter_test INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"#passed" | 39 | 39 |( 100.0000 +- 0.000000)% |
+ |*"#passed" | 71 | 71 |( 100.0000 +- 0.000000)% |
ParticleUnpacker INFO Number of counters : 2
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Linked BufferData" | 351 | 4651666 | 13253.0 |
- | "# UnpackedData" | 78 | 64286 | 824.18 |
+ | "# Linked BufferData" | 639 | 8459678 | 13239.0 |
+ | "# UnpackedData" | 142 | 114526 | 806.52 |
ToolSvc.HltFactory INFO Number of counters : 1
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
| "# loaded from PYTHON" | 1 |
Tuple INFO Number of counters : 15
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# events with multiple candidates for field Bs"| 39 |
- | "# events with multiple candidates for field Km1"| 39 |
- | "# events with multiple candidates for field Km2"| 39 |
- | "# events with multiple candidates for field Kp1"| 39 |
- | "# events with multiple candidates for field Kp2"| 39 |
- | "# events with multiple candidates for field phi1"| 39 |
- | "# events with multiple candidates for field phi2"| 39 |
- | "# non-empty events for field Bs" | 39 |
- | "# non-empty events for field Km1" | 39 |
- | "# non-empty events for field Km2" | 39 |
- | "# non-empty events for field Kp1" | 39 |
- | "# non-empty events for field Kp2" | 39 |
- | "# non-empty events for field phi1" | 39 |
- | "# non-empty events for field phi2" | 39 |
- | "# processed events" | 39 |
+ | "# events with multiple candidates for field Bs"| 71 |
+ | "# events with multiple candidates for field Km1"| 71 |
+ | "# events with multiple candidates for field Km2"| 71 |
+ | "# events with multiple candidates for field Kp1"| 71 |
+ | "# events with multiple candidates for field Kp2"| 71 |
+ | "# events with multiple candidates for field phi1"| 71 |
+ | "# events with multiple candidates for field phi2"| 71 |
+ | "# non-empty events for field Bs" | 71 |
+ | "# non-empty events for field Km1" | 71 |
+ | "# non-empty events for field Km2" | 71 |
+ | "# non-empty events for field Kp1" | 71 |
+ | "# non-empty events for field Kp2" | 71 |
+ | "# non-empty events for field phi1" | 71 |
+ | "# non-empty events for field phi2" | 71 |
+ | "# processed events" | 71 |
ApplicationMgr INFO Application Manager Stopped successfully
Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
Tuple SUCCESS List of booked N-Tuples in directory "FILE1/Tuple"
-Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=38 {Hlt1_Hlt1TrackMVADecision,Hlt1_Hlt1TwoTrackMVADecision,Hlt1_TCK,Bs_PT,Bs_Hlt1_Hlt}
-HLTControlFlowMgr INFO Memory pool: used 0.00851832 +/- 0.000275936 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 139.564 +/- 4.52094 (min: 133, max: 261) requests were served
+Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=40 {EVENTNUMBER,Hlt1_Hlt1TrackMVADecision,Hlt1_Hlt1TwoTrackMVADecision,Hlt1_TCK,RUNNU}
+HLTControlFlowMgr INFO Memory pool: used 0.00940285 +/- 0.000172582 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 154.056 +/- 2.82758 (min: 150, max: 294) requests were served
HLTControlFlowMgr INFO Timing table:
HLTControlFlowMgr INFO
| Name of Algorithm | Execution Count | Total Time / s | Avg. Time / us |
- | Sum of all Algorithms | 39 | 2.499 | 64077.564 |
- | "Tuple" | 39 | 1.373 | 35207.936 |
- | "Gaudi__Hive__FetchDataFromFile" | 39 | 1.018 | 26104.642 |
- | "ParticleUnpacker" | 39 | 0.040 | 1015.964 |
- | "HltTisTosAlgName#1" | 39 | 0.029 | 735.246 |
- | "reserveIOV" | 39 | 0.017 | 426.193 |
- | "HltPackedBufferDecoder" | 39 | 0.016 | 408.237 |
- | "HltSelReportsDecoder#1" | 39 | 0.003 | 73.079 |
- | "Hlt2DecReportsDecoder#1" | 39 | 0.002 | 39.401 |
- | "Hlt1DecReportsDecoder#1" | 39 | 0.001 | 26.599 |
- | "LHCb__UnpackRawEvent#3" | 39 | 0.001 | 20.979 |
- | "HDRFilter_test" | 39 | 0.000 | 7.183 |
- | "LHCb__UnpackRawEvent#5" | 39 | 0.000 | 4.865 |
- | "DummyEventTime" | 39 | 0.000 | 4.290 |
- | "LHCb__UnpackRawEvent#4" | 39 | 0.000 | 3.097 |
+ | Sum of all Algorithms | 71 | 1.786 | 25158.887 |
+ | "Gaudi__Hive__FetchDataFromFile" | 71 | 1.059 | 14909.041 |
+ | "Tuple" | 71 | 0.562 | 7917.827 |
+ | "ParticleUnpacker" | 71 | 0.067 | 949.339 |
+ | "HltTisTosAlgName#1" | 71 | 0.051 | 718.334 |
+ | "HltPackedBufferDecoder" | 71 | 0.028 | 397.027 |
+ | "reserveIOV" | 71 | 0.009 | 127.583 |
+ | "HltSelReportsDecoder#1" | 71 | 0.005 | 64.282 |
+ | "Hlt1DecReportsDecoder#1" | 71 | 0.002 | 25.710 |
+ | "LHCb__UnpackRawEvent#3" | 71 | 0.001 | 16.816 |
+ | "Hlt2DecReportsDecoder#1" | 71 | 0.001 | 11.334 |
+ | "LHCb__UnpackRawEvent#5" | 71 | 0.000 | 4.955 |
+ | "HDRFilter_test" | 71 | 0.000 | 4.554 |
+ | "createODIN" | 71 | 0.000 | 4.209 |
+ | "DummyEventTime" | 71 | 0.000 | 2.881 |
+ | "LHCb__UnpackRawEvent" | 71 | 0.000 | 2.746 |
+ | "LHCb__UnpackRawEvent#4" | 71 | 0.000 | 2.379 |
HLTControlFlowMgr INFO StateTree: CFNode #executed #passed
-LAZY_AND: DaVinci #=39 Sum=39 Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: UserAnalysis #=39 Sum=39 Eff=|( 100.0000 +- 0.00000 )%|
- LAZY_AND: default #=39 Sum=39 Eff=|( 100.0000 +- 0.00000 )%|
- LoKi__HDRFilter/HDRFilter_test #=39 Sum=39 Eff=|( 100.0000 +- 0.00000 )%|
- FunTupleBase_Particles/Tuple #=39 Sum=39 Eff=|( 100.0000 +- 0.00000 )%|
+LAZY_AND: DaVinci #=71 Sum=71 Eff=|( 100.0000 +- 0.00000 )%|
+ NONLAZY_OR: UserAnalysis #=71 Sum=71 Eff=|( 100.0000 +- 0.00000 )%|
+ LAZY_AND: default #=71 Sum=71 Eff=|( 100.0000 +- 0.00000 )%|
+ LoKi__HDRFilter/HDRFilter_test #=71 Sum=71 Eff=|( 100.0000 +- 0.00000 )%|
+ FunTupleBase_Particles/Tuple #=71 Sum=71 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:BA6260D4-6CCA-11ED-825C-FA163E74EFE7 [root://eoslhcb.cern.ch//eos/lhcb/user/o/oozcelik/tistos/moore_bs2phiphi_Hlt2filter.dst]
+RootCnvSvc INFO Disconnected data IO:2C9CE5B2-91BE-11ED-B922-FA163E785C30 [root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/moore_bs2phiphi_Hlt2filter.dst]
RFileCnv INFO dumping contents of /NTUPLES/FILE1
-TFile: name=outputDV_selrep_bs2phiphi.root, title=Gaudi Trees, option=CREATE
+TFile: name=tuple_tistos.root, title=Gaudi Trees, option=CREATE
******************************************************************************
*Tree :DecayTree : DecayTree *
-*Entries : 328 : Total = 76485 bytes File Size = 13606 *
-* : : Tree compression factor = 4.83 *
+*Entries : 584 : Total = 123620 bytes File Size = 18761 *
+* : : Tree compression factor = 6.20 *
******************************************************************************
-*Br 0 :Hlt1_Hlt1TrackMVADecision : Hlt1_Hlt1TrackMVADecision/i *
-*Entries : 328 : Total Size= 1982 bytes File Size = 175 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.05 *
+*Br 0 :EVENTNUMBER : EVENTNUMBER/l *
+*Entries : 584 : Total Size= 5280 bytes File Size = 400 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 11.89 *
*............................................................................*
-*Br 1 :Hlt1_Hlt1TwoTrackMVADecision : Hlt1_Hlt1TwoTrackMVADecision/i *
-*Entries : 328 : Total Size= 1997 bytes File Size = 145 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 9.74 *
+*Br 1 :Hlt1_Hlt1TrackMVADecision : Hlt1_Hlt1TrackMVADecision/i *
+*Entries : 584 : Total Size= 3006 bytes File Size = 203 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 11.99 *
*............................................................................*
-*Br 2 :Hlt1_TCK : Hlt1_TCK/i *
-*Entries : 328 : Total Size= 1897 bytes File Size = 113 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 12.32 *
+*Br 2 :Hlt1_Hlt1TwoTrackMVADecision : Hlt1_Hlt1TwoTrackMVADecision/i *
+*Entries : 584 : Total Size= 3021 bytes File Size = 156 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 15.62 *
*............................................................................*
-*Br 3 :Bs_PT : Bs_PT/F *
-*Entries : 328 : Total Size= 1882 bytes File Size = 327 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 4.25 *
+*Br 3 :Hlt1_TCK : Hlt1_TCK/i *
+*Entries : 584 : Total Size= 2921 bytes File Size = 123 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 19.64 *
*............................................................................*
-*Br 4 :Bs_Hlt1_Hlt1TrackMVADecision_TIS : *
+*Br 4 :RUNNUMBER : RUNNUMBER/i *
+*Entries : 584 : Total Size= 2926 bytes File Size = 144 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 16.78 *
+*............................................................................*
+*Br 5 :Bs_PT : Bs_PT/F *
+*Entries : 584 : Total Size= 2906 bytes File Size = 477 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 5.06 *
+*............................................................................*
+*Br 6 :Bs_Hlt1_Hlt1TrackMVADecision_TIS : *
* | Bs_Hlt1_Hlt1TrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2017 bytes File Size = 147 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 9.63 *
+*Entries : 584 : Total Size= 3041 bytes File Size = 166 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 14.70 *
*............................................................................*
-*Br 5 :Bs_Hlt1_Hlt1TrackMVADecision_TOS : *
+*Br 7 :Bs_Hlt1_Hlt1TrackMVADecision_TOS : *
* | Bs_Hlt1_Hlt1TrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2017 bytes File Size = 184 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 7.70 *
+*Entries : 584 : Total Size= 3041 bytes File Size = 204 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 11.96 *
*............................................................................*
-*Br 6 :Bs_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
+*Br 8 :Bs_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
* | Bs_Hlt1_Hlt1TwoTrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2032 bytes File Size = 163 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.71 *
+*Entries : 584 : Total Size= 3056 bytes File Size = 188 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 12.99 *
*............................................................................*
-*Br 7 :Bs_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
+*Br 9 :Bs_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
* | Bs_Hlt1_Hlt1TwoTrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2032 bytes File Size = 152 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 9.34 *
+*Entries : 584 : Total Size= 3056 bytes File Size = 166 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 14.72 *
*............................................................................*
-*Br 8 :phi1_PT : phi1_PT/F *
-*Entries : 328 : Total Size= 1892 bytes File Size = 585 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 2.38 *
+*Br 10 :phi1_PT : phi1_PT/F *
+*Entries : 584 : Total Size= 2916 bytes File Size = 938 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 2.57 *
*............................................................................*
-*Br 9 :phi1_Hlt1_Hlt1TrackMVADecision_TIS : *
+*Br 11 :phi1_Hlt1_Hlt1TrackMVADecision_TIS : *
* | phi1_Hlt1_Hlt1TrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2027 bytes File Size = 226 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.27 *
+*Entries : 584 : Total Size= 3051 bytes File Size = 294 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.31 *
*............................................................................*
-*Br 10 :phi1_Hlt1_Hlt1TrackMVADecision_TOS : *
+*Br 12 :phi1_Hlt1_Hlt1TrackMVADecision_TOS : *
* | phi1_Hlt1_Hlt1TrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2027 bytes File Size = 227 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.25 *
+*Entries : 584 : Total Size= 3051 bytes File Size = 282 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.66 *
*............................................................................*
-*Br 11 :phi1_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
+*Br 13 :phi1_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
* | phi1_Hlt1_Hlt1TwoTrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2042 bytes File Size = 256 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 5.55 *
+*Entries : 584 : Total Size= 3066 bytes File Size = 329 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 7.43 *
*............................................................................*
-*Br 12 :phi1_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
+*Br 14 :phi1_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
* | phi1_Hlt1_Hlt1TwoTrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2042 bytes File Size = 263 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 5.40 *
+*Entries : 584 : Total Size= 3066 bytes File Size = 341 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 7.17 *
*............................................................................*
-*Br 13 :phi2_PT : phi2_PT/F *
-*Entries : 328 : Total Size= 1892 bytes File Size = 588 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 2.37 *
+*Br 15 :phi2_PT : phi2_PT/F *
+*Entries : 584 : Total Size= 2916 bytes File Size = 947 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 2.55 *
*............................................................................*
-*Br 14 :phi2_Hlt1_Hlt1TrackMVADecision_TIS : *
+*Br 16 :phi2_Hlt1_Hlt1TrackMVADecision_TIS : *
* | phi2_Hlt1_Hlt1TrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2027 bytes File Size = 229 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.19 *
+*Entries : 584 : Total Size= 3051 bytes File Size = 291 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.39 *
*............................................................................*
-*Br 15 :phi2_Hlt1_Hlt1TrackMVADecision_TOS : *
+*Br 17 :phi2_Hlt1_Hlt1TrackMVADecision_TOS : *
* | phi2_Hlt1_Hlt1TrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2027 bytes File Size = 221 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.42 *
+*Entries : 584 : Total Size= 3051 bytes File Size = 278 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.78 *
*............................................................................*
-*Br 16 :phi2_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
+*Br 18 :phi2_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
* | phi2_Hlt1_Hlt1TwoTrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2042 bytes File Size = 255 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 5.57 *
+*Entries : 584 : Total Size= 3066 bytes File Size = 330 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 7.41 *
*............................................................................*
-*Br 17 :phi2_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
+*Br 19 :phi2_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
* | phi2_Hlt1_Hlt1TwoTrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2042 bytes File Size = 264 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 5.38 *
+*Entries : 584 : Total Size= 3066 bytes File Size = 343 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 7.13 *
*............................................................................*
-*Br 18 :Kp1_PT : Kp1_PT/F *
-*Entries : 328 : Total Size= 1887 bytes File Size = 839 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 1.66 *
+*Br 20 :Kp1_PT : Kp1_PT/F *
+*Entries : 584 : Total Size= 2911 bytes File Size = 1389 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 1.74 *
*............................................................................*
-*Br 19 :Kp1_Hlt1_Hlt1TrackMVADecision_TIS : *
+*Br 21 :Kp1_Hlt1_Hlt1TrackMVADecision_TIS : *
* | Kp1_Hlt1_Hlt1TrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2022 bytes File Size = 218 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.50 *
+*Entries : 584 : Total Size= 3046 bytes File Size = 272 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.97 *
*............................................................................*
-*Br 20 :Kp1_Hlt1_Hlt1TrackMVADecision_TOS : *
+*Br 22 :Kp1_Hlt1_Hlt1TrackMVADecision_TOS : *
* | Kp1_Hlt1_Hlt1TrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2022 bytes File Size = 221 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.41 *
+*Entries : 584 : Total Size= 3046 bytes File Size = 276 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.84 *
*............................................................................*
-*Br 21 :Kp1_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
+*Br 23 :Kp1_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
* | Kp1_Hlt1_Hlt1TwoTrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2037 bytes File Size = 233 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.09 *
+*Entries : 584 : Total Size= 3061 bytes File Size = 288 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.49 *
*............................................................................*
-*Br 22 :Kp1_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
+*Br 24 :Kp1_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
* | Kp1_Hlt1_Hlt1TwoTrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2037 bytes File Size = 141 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 10.07 *
+*Entries : 584 : Total Size= 3061 bytes File Size = 151 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 16.19 *
*............................................................................*
-*Br 23 :Km1_PT : Km1_PT/F *
-*Entries : 328 : Total Size= 1887 bytes File Size = 840 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 1.65 *
+*Br 25 :Km1_PT : Km1_PT/F *
+*Entries : 584 : Total Size= 2911 bytes File Size = 1396 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 1.73 *
*............................................................................*
-*Br 24 :Km1_Hlt1_Hlt1TrackMVADecision_TIS : *
+*Br 26 :Km1_Hlt1_Hlt1TrackMVADecision_TIS : *
* | Km1_Hlt1_Hlt1TrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2022 bytes File Size = 212 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.68 *
+*Entries : 584 : Total Size= 3046 bytes File Size = 279 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.75 *
*............................................................................*
-*Br 25 :Km1_Hlt1_Hlt1TrackMVADecision_TOS : *
+*Br 27 :Km1_Hlt1_Hlt1TrackMVADecision_TOS : *
* | Km1_Hlt1_Hlt1TrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2022 bytes File Size = 218 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.50 *
+*Entries : 584 : Total Size= 3046 bytes File Size = 271 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 9.01 *
*............................................................................*
-*Br 26 :Km1_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
+*Br 28 :Km1_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
* | Km1_Hlt1_Hlt1TwoTrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2037 bytes File Size = 236 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.02 *
+*Entries : 584 : Total Size= 3061 bytes File Size = 279 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.76 *
*............................................................................*
-*Br 27 :Km1_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
+*Br 29 :Km1_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
* | Km1_Hlt1_Hlt1TwoTrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2037 bytes File Size = 141 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 10.07 *
+*Entries : 584 : Total Size= 3061 bytes File Size = 151 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 16.19 *
*............................................................................*
-*Br 28 :Kp2_PT : Kp2_PT/F *
-*Entries : 328 : Total Size= 1887 bytes File Size = 846 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 1.64 *
+*Br 30 :Kp2_PT : Kp2_PT/F *
+*Entries : 584 : Total Size= 2911 bytes File Size = 1393 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 1.73 *
*............................................................................*
-*Br 29 :Kp2_Hlt1_Hlt1TrackMVADecision_TIS : *
+*Br 31 :Kp2_Hlt1_Hlt1TrackMVADecision_TIS : *
* | Kp2_Hlt1_Hlt1TrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2022 bytes File Size = 209 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.78 *
+*Entries : 584 : Total Size= 3046 bytes File Size = 261 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 9.35 *
*............................................................................*
-*Br 30 :Kp2_Hlt1_Hlt1TrackMVADecision_TOS : *
+*Br 32 :Kp2_Hlt1_Hlt1TrackMVADecision_TOS : *
* | Kp2_Hlt1_Hlt1TrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2022 bytes File Size = 220 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.44 *
+*Entries : 584 : Total Size= 3046 bytes File Size = 277 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.81 *
*............................................................................*
-*Br 31 :Kp2_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
+*Br 33 :Kp2_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
* | Kp2_Hlt1_Hlt1TwoTrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2037 bytes File Size = 230 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.17 *
+*Entries : 584 : Total Size= 3061 bytes File Size = 282 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.67 *
*............................................................................*
-*Br 32 :Kp2_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
+*Br 34 :Kp2_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
* | Kp2_Hlt1_Hlt1TwoTrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2037 bytes File Size = 141 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 10.07 *
+*Entries : 584 : Total Size= 3061 bytes File Size = 151 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 16.19 *
*............................................................................*
-*Br 33 :Km2_PT : Km2_PT/F *
-*Entries : 328 : Total Size= 1887 bytes File Size = 845 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 1.64 *
+*Br 35 :Km2_PT : Km2_PT/F *
+*Entries : 584 : Total Size= 2911 bytes File Size = 1393 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 1.73 *
*............................................................................*
-*Br 34 :Km2_Hlt1_Hlt1TrackMVADecision_TIS : *
+*Br 36 :Km2_Hlt1_Hlt1TrackMVADecision_TIS : *
* | Km2_Hlt1_Hlt1TrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2022 bytes File Size = 216 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.56 *
+*Entries : 584 : Total Size= 3046 bytes File Size = 272 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.97 *
*............................................................................*
-*Br 35 :Km2_Hlt1_Hlt1TrackMVADecision_TOS : *
+*Br 37 :Km2_Hlt1_Hlt1TrackMVADecision_TOS : *
* | Km2_Hlt1_Hlt1TrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2022 bytes File Size = 217 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.53 *
+*Entries : 584 : Total Size= 3046 bytes File Size = 276 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.84 *
*............................................................................*
-*Br 36 :Km2_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
+*Br 38 :Km2_Hlt1_Hlt1TwoTrackMVADecision_TIS : *
* | Km2_Hlt1_Hlt1TwoTrackMVADecision_TIS/I *
-*Entries : 328 : Total Size= 2037 bytes File Size = 233 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 6.09 *
+*Entries : 584 : Total Size= 3061 bytes File Size = 290 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 8.43 *
*............................................................................*
-*Br 37 :Km2_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
+*Br 39 :Km2_Hlt1_Hlt1TwoTrackMVADecision_TOS : *
* | Km2_Hlt1_Hlt1TwoTrackMVADecision_TOS/I *
-*Entries : 328 : Total Size= 2037 bytes File Size = 141 *
-*Baskets : 1 : Basket Size= 32000 bytes Compression= 10.07 *
+*Entries : 584 : Total Size= 3061 bytes File Size = 151 *
+*Baskets : 1 : Basket Size= 32000 bytes Compression= 16.19 *
*............................................................................*
NTupleSvc INFO NTuples saved successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_DTF.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_DTF.qmt
index bec2d4966ae49535f9afed47aba9f753961b0bea..af1c59196005fcab12637440826b8e9e2b8fc141 100755
--- a/DaVinciTests/tests/qmtest/davinci.qms/test_DTF.qmt
+++ b/DaVinciTests/tests/qmtest/davinci.qms/test_DTF.qmt
@@ -29,7 +29,7 @@ See https://gitlab.cern.ch/lhcb/Rec/-/issues/408
histo_file: DV-example-tupling-DTF-his.root
input_raw_format: 4.3
ntuple_file: DV-example-tupling-DTF-ntp.root
- input_process: Turbo
+ input_process: Hlt2
</text></argument>
<argument name="exit_code"><integer>3</integer></argument>
<argument name="exit_value"><text>Failed</text></argument>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_funtuple_array.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_funtuple_array.qmt
index 8fea196492e0675a91c84efaea359a7e107d8ac8..60bc9bf6951719ed831c29e3072315a276b815aa 100644
--- a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_funtuple_array.qmt
+++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_funtuple_array.qmt
@@ -34,7 +34,7 @@ validateWithReference(preproc = preprocessor, counter_preproc = counter_preproce
import os
from ROOT import TFile
-list_vars = ["B0_THOR_MASS", "B0_TagTr_P", "B0_TagTr_PT", "nTags", "indx"]
+list_vars = ["B0_THOR_MASS", "B0_TagTr_P", "B0_TagTr_PT", "nTags", "indx", "EVENTNUMBER", "RUNNUMBER"]
vars_stored = []
ntuple = "DV-test-array-ntp.root"
diff --git a/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref b/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
index b7d3f437b24892e8c12df5d71e910d37612a869c..246dbf804bc7c021d5706c44445a80301955f064 100644
--- a/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
+++ b/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
@@ -19,7 +19,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
B0DsK_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
B0DsK_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0DsK_Tuple"
-B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=5 {B0_THOR_MASS,indx,B0_TagTr_P[1]/V,nTags,B0_TagTr_PT[1]/V}
+B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=7 {EVENTNUMBER,RUNNUMBER,B0_THOR_MASS,indx,B0_TagTr_P[1]/V,nTags,B0_TagTr_PT[1]/V}
LAZY_AND: DaVinci #=100 Sum=62 Eff=|( 62.00000 +- 4.85386 )%|
NONLAZY_OR: FileSummaryRecords #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTests/tests/refs/test_davinci_recVertices.ref b/DaVinciTests/tests/refs/test_davinci_recVertices.ref
index f38294ed0e8f88f26688b6d6b49cceb44ca91af4..4772b8ba057945a2a98f3a1edf3dcf942090b64d 100644
--- a/DaVinciTests/tests/refs/test_davinci_recVertices.ref
+++ b/DaVinciTests/tests/refs/test_davinci_recVertices.ref
@@ -136,7 +136,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
B0DsK_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
B0DsK_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0DsK_Tuple"
-B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=3 {B0_BPVDIRA,B0_BPVFDCHI2,B0_BPVIPCHI2}
+B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=5 {EVENTNUMBER,RUNNUMBER,B0_BPVDIRA,B0_BPVFDCHI2,B0_BPVIPCHI2}
LAZY_AND: DaVinci #=118 Sum=75 Eff=|( 63.55932 +- 4.43039 )%|
NONLAZY_OR: FileSummaryRecords #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=118 Sum=118 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTutorials/python/DaVinciTutorials/tutorial4_trigger_eventinfo.py b/DaVinciTutorials/python/DaVinciTutorials/tutorial4_trigger_eventinfo.py
index 7264bf0f90f5545e71424bec4d43e316f10ff166..6aeda2456477b07ee1c10729d4b75efe5cb55650 100644
--- a/DaVinciTutorials/python/DaVinciTutorials/tutorial4_trigger_eventinfo.py
+++ b/DaVinciTutorials/python/DaVinciTutorials/tutorial4_trigger_eventinfo.py
@@ -53,7 +53,8 @@ def main(options: Options):
#Now import two other pre-defined FunctorCollections: SelectionInfo and EventInfo
# - SelectionInfo: Contains functors related to storing Hlt1, Hlt2 or Sprucing trigger line decision and Trigger Configuration Key (TCK).
- # - EventInfo: Contains functors related to storing event information EVENTNUMBER, RUNNUMBER, GPSTIME, etc.
+ # - EventInfo: Contains functors related to storing event information BUNCHCROSSING_ID, etc. Note the RUNNUMBER and EVENTNUMBER
+ # are stored by default in FunTuple.
#
#As before you can call help with "print(help(EventInfo))" or "print(help(SelectionInfo))" (you have to press "q" to exit after calling)
from FunTuple.functorcollections import SelectionInfo, EventInfo
@@ -62,7 +63,7 @@ def main(options: Options):
# These are stored in "LHCb::ODIN" C++ object which the ThOr functors take as input (like PVs in Example7), load it onto TES using "get_odin".
# The attribute extra_info is False by default, if set to "True" you get info on
# bunchcrossing id, ODIN TCK, GPS Time, etc
- evtinfo = EventInfo(extra_info=False)
+ evtinfo = EventInfo()
print(evtinfo)
#Get selection line decision and HlT2 TCK.
diff --git a/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref b/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
index 53fc927e74422f57fb9f14adddaf58ce92328734..97585831440005969b65dc02d2665e9a06f9b862 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial1_Functors_specialfield.ref
@@ -120,7 +120,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
TDirectoryName SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
TDirectoryName SUCCESS List of booked N-Tuples in directory "FILE1/TDirectoryName"
-TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=20 {Bs_PT_THOR,Bs_PX,Bs_PY,Bs_THOR_P,Bs_ID,Jpsi_PT_THOR,Jpsi_PX,Jpsi_PY,Jpsi_THOR_P,J}
+TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=22 {EVENTNUMBER,RUNNUMBER,Bs_PT_THOR,Bs_PX,Bs_PY,Bs_THOR_P,Bs_ID,Jpsi_PT_THOR,Jpsi_PX}
LAZY_AND: DaVinci #=100 Sum=12 Eff=|( 12.00000 +- 3.24962 )%|
NONLAZY_OR: FileSummaryRecords #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref b/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
index 945c1bf432cde1338f785c3ba12364b7022bed15..c83570680a11d8ee6bb4efe97da005ec0566a755 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial2_LoKi.ref
@@ -118,7 +118,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
TDirectoryName SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
TDirectoryName SUCCESS List of booked N-Tuples in directory "FILE1/TDirectoryName"
-TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=48 {Bs_MAX_PT_LOKI,Bs_LOKI_PT,Bs_LOKI_PX,Bs_LOKI_PY,Bs_MAX_PT_THOR,Bs_THOR_PT,Bs_THOR}
+TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=50 {EVENTNUMBER,RUNNUMBER,Bs_MAX_PT_LOKI,Bs_LOKI_PT,Bs_LOKI_PX,Bs_LOKI_PY,Bs_MAX_PT_T}
LAZY_AND: DaVinci #=100 Sum=12 Eff=|( 12.00000 +- 3.24962 )%|
NONLAZY_OR: FileSummaryRecords #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref b/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
index 1d28db30fbd07c19ddcd1f2edbf52732e217620d..7fea3a36f3cb77168e340965d06ba93b25d23ada 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial3_ThOrfunctors.ref
@@ -118,7 +118,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
TDirectoryName SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
TDirectoryName SUCCESS List of booked N-Tuples in directory "FILE1/TDirectoryName"
-TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=24 {Bs_BPVFDVEC_X,Bs_BPVFDVEC_Y,Bs_BPVFDVEC_Z,Bs_FOURMOM_PE,Bs_FOURMOM_PX,Bs_FOURMOM_}
+TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=26 {EVENTNUMBER,RUNNUMBER,Bs_BPVFDVEC_X,Bs_BPVFDVEC_Y,Bs_BPVFDVEC_Z,Bs_FOURMOM_PE,Bs_}
LAZY_AND: DaVinci #=100 Sum=12 Eff=|( 12.00000 +- 3.24962 )%|
NONLAZY_OR: FileSummaryRecords #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref b/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
index 84894839e5816d2b05475bdb2b99776070f4403d..58088bd675ced213d1fd49d64c22296b170ae7e5 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial5_MCTruth.ref
@@ -121,7 +121,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
TDirectoryName SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
TDirectoryName SUCCESS List of booked N-Tuples in directory "FILE1/TDirectoryName"
-TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=37 {Bs_M,Bs_P,Bs_TRUEP,Bs_TRUEID,Bs_BKGCAT,Jpsi_M,Jpsi_P,Jpsi_TRUEP,Jpsi_TRUEID,Jpsi_}
+TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=39 {EVENTNUMBER,RUNNUMBER,Bs_M,Bs_P,Bs_TRUEP,Bs_TRUEID,Bs_BKGCAT,Jpsi_M,Jpsi_P,Jpsi_T}
LAZY_AND: DaVinci #=100 Sum=12 Eff=|( 12.00000 +- 3.24962 )%|
NONLAZY_OR: FileSummaryRecords #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref b/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
index 473fee726f5166506e655482ae3beffaa996a88a..3727f16fac6413d57793deb19ea5371483474374 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial6_DecayTreeFit.ref
@@ -118,7 +118,7 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
TDirectoryName SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
TDirectoryName SUCCESS List of booked N-Tuples in directory "FILE1/TDirectoryName"
-TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=46 {Bs_BPVLTIME,Bs_BPVIPCHI2,Bs_DTFPV_BPVLTIME,Bs_DTFPV_BPVIPCHI2,Bs_M,Bs_P,Bs_PT,Bs_}
+TDirectoryName SUCCESS ID=TTreeName Title="TTreeName" #items=48 {EVENTNUMBER,RUNNUMBER,Bs_BPVLTIME,Bs_BPVIPCHI2,Bs_DTFPV_BPVLTIME,Bs_DTFPV_BPVIPCH}
LAZY_AND: DaVinci #=100 Sum=12 Eff=|( 12.00000 +- 3.24962 )%|
NONLAZY_OR: FileSummaryRecords #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref b/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
index ae53358945afbae76f0da6117358a5d40851cb7b..1f1fbc0b281098481d1f823e1b9a1e064c037397 100644
--- a/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
+++ b/DaVinciTutorials/tests/refs/test_tutorial7_multiple_sel_lines.ref
@@ -119,10 +119,10 @@ FSROutputStreamDstWriter INFO Set up File Summary Record
FSROutputStreamDstWriter INFO Events output: 1
TDirectoryName1 SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
TDirectoryName1 SUCCESS List of booked N-Tuples in directory "FILE1/TDirectoryName1"
-TDirectoryName1 SUCCESS ID=TTreeName1 Title="TTreeName1" #items=21 {Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,mup_M,mup_P,mup_PT,mup_PX,mup_PY,mup_}
+TDirectoryName1 SUCCESS ID=TTreeName1 Title="TTreeName1" #items=23 {EVENTNUMBER,RUNNUMBER,Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,mup_M,mup_P,mup}
TDirectoryName2 SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
TDirectoryName2 SUCCESS List of booked N-Tuples in directory "FILE1/TDirectoryName2"
-TDirectoryName2 SUCCESS ID=TTreeName2 Title="TTreeName2" #items=21 {Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,ep_M,ep_P,ep_PT,ep_PX,ep_PY,ep_PZ,ep_}
+TDirectoryName2 SUCCESS ID=TTreeName2 Title="TTreeName2" #items=23 {EVENTNUMBER,RUNNUMBER,Bs_M,Bs_P,Bs_PT,Bs_PX,Bs_PY,Bs_PZ,Bs_ENERGY,ep_M,ep_P,ep_PT}
LAZY_AND: DaVinci #=100 Sum=14 Eff=|( 14.00000 +- 3.46987 )%|
NONLAZY_OR: FileSummaryRecords #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
LAZY_AND: GenFSR #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
diff --git a/Phys/DaVinci/tests/config/test_algorithms.py b/Phys/DaVinci/tests/config/test_algorithms.py
index dd78f0939c45200a222561fc046d297d623d4678..4c97aadd53df096753cd97b161e1a2b2784f61a2 100644
--- a/Phys/DaVinci/tests/config/test_algorithms.py
+++ b/Phys/DaVinci/tests/config/test_algorithms.py
@@ -143,7 +143,9 @@ def test_configured_funtuple():
)
with default_raw_event.bind(raw_event_format=options.input_raw_format),\
upfront_decoder.bind(input_process=options.input_process, stream=options.stream),\
- get_hlt_reports.bind(input_process=options.input_process, stream=options.stream):
+ get_hlt_reports.bind(input_process=options.input_process, stream=options.stream),\
+ get_odin.bind(input_process=options.input_process,
+ stream=options.stream):
test_dict = configured_FunTuple(config)
assert any("FunTupleBase_Particles/Tuple_TestTuple" in alg.fullname
for alg in test_dict["TestTuple"])