Merge branch 'AM_evtnum_runnum' into 'master'

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

Closes #47

See merge request !784

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>

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"

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 )%|

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 )%|

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.

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 )%|

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 )%|

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 )%|

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 )%|

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 )%|

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 )%|

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"])