diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py index 739adae45281740dea192cade32c010d2afd9a31..a1789d6041412cd05fa943959681123132271f04 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_eventinfo.py @@ -43,7 +43,7 @@ def main(options: Options): }) #Get RunNUmber and EventNumber odin = get_odin(options) - evt_vars += EventInfo(odin) + evt_vars += EventInfo(odin, extra_info=True) #get particles to run over line_name = 'Hlt2SLB_LbToLcMuNu_LcToPKPi_Line' diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_eventinfo.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_eventinfo.qmt index 520a42bd75e7b427a1f241baf4f0a08832be72d3..6ea7c7670621eab2026ac823e16cfdcf62ceeec5 100644 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_eventinfo.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_eventinfo.qmt @@ -31,7 +31,7 @@ validateWithReference(preproc = preprocessor) import sys, os, glob from ROOT import TFile -B_vars_stored = ['nTracks', 'nPVs', 'nFTClusters', 'EVENTNUMBER', 'RUNNUMBER', 'Lb_PT'] +B_vars_stored = ['nTracks', 'nPVs', 'nFTClusters', 'EVENTNUMBER', 'RUNNUMBER', 'Lb_PT', 'GPSTIME', 'BUNCHCROSSING_TYPE', 'ODINTCK', 'BUNCHCROSSING_ID'] #sort the expected vars B_vars_stored = sorted(B_vars_stored) diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref index 46b7461f4ca4645d97f983ff1f83aa2f0781b3e5..f66ad30e15b2405a0cb220b3909fa5891d599a5e 100644 --- a/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref +++ b/DaVinciExamples/tests/refs/test_davinci_tupling_eventinfo.ref @@ -25,16 +25,69 @@ FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 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=6 {EVENTNUMBER,RUNNUMBER,nFTClusters,nPVs,nTracks,Lb_PT} -LAZY_AND: DaVinci #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: FileSummaryRecords #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: default #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| - LHCb__UnpackRawEvent/LHCb__UnpackRawEvent#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__HDRFilter/Myfilter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| +Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=10 {BUNCHCROSSING_ID,BUNCHCROSSING_TYPE,EVENTNUMBER,GPSTIME,ODINTCK,RUNNUMBER,nFTClus} +LAZY_AND: DaVinci #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: FileSummaryRecords #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: default #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + LHCb__UnpackRawEvent/LHCb__UnpackRawEvent #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedBufferDecoder/HltPackedBufferDecoder #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RecVertexUnpacker/RecVertexUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RecVertexUnpacker/RecVertexUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RecVertexUnpacker/RecVertexUnpacker#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RecVertexUnpacker/RecVertexUnpacker#3 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RecVertexUnpacker/RecVertexUnpacker#4 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + VertexUnpacker/VertexUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + VertexUnpacker/VertexUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + VertexUnpacker/VertexUnpacker#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + VertexUnpacker/VertexUnpacker#3 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + VertexUnpacker/VertexUnpacker#4 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + VertexUnpacker/VertexUnpacker#5 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + VertexUnpacker/VertexUnpacker#6 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + VertexUnpacker/VertexUnpacker#7 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#3 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#4 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#5 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#6 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#7 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#8 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + TrackUnpacker/TrackUnpacker#9 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/RichPIDUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/RichPIDUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/MuonPIDUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/MuonPIDUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + CaloHypoUnpacker/CaloHypoUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + CaloHypoUnpacker/CaloHypoUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + CaloHypoUnpacker/CaloHypoUnpacker#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + CaloHypoUnpacker/CaloHypoUnpacker#3 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ProtoParticleUnpacker/ProtoParticleUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ProtoParticleUnpacker/ProtoParticleUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker#3 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker#4 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker#5 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker#6 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker#7 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + ParticleUnpacker/ParticleUnpacker#8 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + RecSummaryUnpacker/RecSummaryUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + P2VRelationUnpacker/P2VRelationUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + P2VRelationUnpacker/P2VRelationUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + P2VRelationUnpacker/P2VRelationUnpacker#2 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + P2VRelationUnpacker/P2VRelationUnpacker#3 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + P2VRelationUnpacker/P2VRelationUnpacker#4 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + PP2MCPRelationUnpacker/PP2MCPRelationUnpacker #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + PP2MCPRelationUnpacker/PP2MCPRelationUnpacker#1 #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__HDRFilter/Myfilter #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%| RFileCnv INFO dumping contents of /NTUPLES/FILE1 TFile: name=tuple_LbToLcmunu.root, title=Gaudi Trees, option=CREATE NTupleSvc INFO NTuples saved successfully