Skip to content
Snippets Groups Projects
Commit 62664d3f authored by Eduardo Rodrigues's avatar Eduardo Rodrigues
Browse files

Merge branch 'Am_pyconf_fix' into 'master' 

Update tests and examples following fix to pyConf for data dependencies

Closes #33

See merge request !637
parents 37923b30 3d32ce0f
No related branches found
No related tags found
2 merge requests!1103Draft: Add AnalysisHelpers to DaVinci Stack,!637Update tests and examples following fix to pyConf for data dependencies
Pipeline #3532045 passed
Stage: test
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 96 additions and 100 deletions
    DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-AllFunctors.py
    + 2
    − 2
    View file @ 62664d3f
    ###############################################################################
    # (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
    # (c) Copyright 2021-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". #
    ......@@ -169,4 +169,4 @@ def alg_config():
    #
    # Algorithms to be run
    #
    return {"UserAlgs": [v2_pvs, my_filter, DTF, my_tuple]}, []
    return {"UserAlgs": [my_filter, my_tuple]}, []
    DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-DTF-run-mc.py
    + 2
    − 2
    View file @ 62664d3f
    ###############################################################################
    # (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
    # (c) Copyright 2021-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". #
    ......@@ -111,5 +111,5 @@ tuple_dimuons = Funtuple(
    def main():
    tools = []
    algs = upfront_reconstruction() + [dimuons, DTF, DTF_pv, tuple_dimuons]
    algs = upfront_reconstruction() + [tuple_dimuons]
    return algs, tools
    DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py
    + 2
    − 2
    View file @ 62664d3f
    ......@@ -117,8 +117,8 @@ def main():
    tools = []
    algs = {
    "Reco": upfront_reconstruction(),
    "DiMuons": [dimuons, tuple_dimuons],
    "KShorts": [kshorts, tuple_kshorts]
    "DiMuons": [tuple_dimuons],
    "KShorts": [tuple_kshorts]
    }
    #Algorithms will be run following the insertion order.
    ......
    DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.py
    + 2
    − 2
    View file @ 62664d3f
    ###############################################################################
    # (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
    # (c) Copyright 2021-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". #
    ......@@ -77,5 +77,5 @@ tuple_dimuons = Funtuple(
    def main():
    tools = []
    algs = upfront_reconstruction() + [dimuons, tuple_dimuons]
    algs = upfront_reconstruction() + [tuple_dimuons]
    return algs, tools
    DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic.py
    + 3
    − 3
    View file @ 62664d3f
    ###############################################################################
    # (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
    # (c) Copyright 2021-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". #
    ......@@ -105,8 +105,8 @@ tuple_kshorts = Funtuple(
    inputs=kshorts)
    algs = {
    'DiMuons': upfront_reconstruction() + [dimuons, tuple_dimuons],
    'KShorts': upfront_reconstruction() + [kshorts, tuple_kshorts]
    'DiMuons': upfront_reconstruction() + [tuple_dimuons],
    'KShorts': upfront_reconstruction() + [tuple_kshorts]
    }
    run_davinci(options, algs)
    DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2.py
    + 1
    − 1
    View file @ 62664d3f
    ......@@ -108,4 +108,4 @@ def main():
    variables=variables,
    inputs=d02kpi_data)
    return {"UserAlgs": [v2_pvs, my_filter, mctruth, my_tuple]}, []
    return {"UserAlgs": [my_filter, my_tuple]}, []
    DaVinciExamples/python/DaVinciExamples/tupling/option_davinci_tupling_from_hlt2_gaudirun.py
    + 2
    − 2
    View file @ 62664d3f
    ###############################################################################
    # (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
    # (c) Copyright 2021-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". #
    ......@@ -59,7 +59,7 @@ def main():
    variables=variables,
    inputs=d02kpi_data)
    return {"UserAlgs": [v2_pvs, my_filter, my_tuple]}, []
    return {"UserAlgs": [my_filter, my_tuple]}, []
    options.ntuple_file = "tuple_D0_Kpi_10evts.root"
    ......
    DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
    + 8
    − 9
    View file @ 62664d3f
    ......@@ -13,14 +13,12 @@ FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SV
    EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0
    UnpackChargedProtos.ChargedProto... INFO Using retuned RICH el and mu DLL values in combined DLLs
    FunctionalParticleMaker.LoKi::Hy... INFO CUT: ' ( (TrTYPE==3) &TrALL) '
    MagneticFieldSvc INFO Map scaled by factor 1 with polarity internally used: -1 signed relative current: -1
    FunctorFactory INFO Cache miss for functor: ::Functors::Track::Momentum{}, now trying cling with headers [Event/Particle.h, Functors/TrackLike.h]
    FunctorFactory INFO Cache miss for functor: ::Functors::Track::TransverseMomentum{}, now trying cling with headers [Event/Particle.h, Functors/TrackLike.h]
    ApplicationMgr INFO Application Manager Initialized successfully
    DeFTDetector INFO Current FT geometry version = 63
    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/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
    EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1
    ToolSvc.LoKi::VertexFitter INFO Option for Optimised Kalman Filter fit is activated
    RFileCnv INFO opening Root file "DV-example-tupling-basic-ntp.root" for writing
    ......@@ -31,12 +29,12 @@ 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}
    LAZY_AND: DaVinci #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%|
    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 )%|
    RecordStream/FSROutputStreamDstWriter #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    NONLAZY_OR: UserAnalysis #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%|
    LAZY_AND: UserAlgorithms #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%|
    NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackRecVertex/UnpackRecVertices #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloElectrons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    ......@@ -48,8 +46,7 @@ LAZY_AND: DaVinci #=10 Sum=3 Eff=|( 30.
    UnpackTrack/UnpackMuonTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackNeutralProtos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackChargedProtos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    CombineParticles/CombineParticles #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%|
    FunTupleBase_Particles/DimuonsTuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%|
    FunTupleBase_Particles/DimuonsTuple #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%|
    ToolSvc INFO Removing all tools created by ToolSvc
    RFileCnv INFO dumping contents of /NTUPLES/FILE1
    TFile: name=DV-example-tupling-basic-ntp.root, title=Gaudi Trees, option=CREATE
    ......@@ -69,11 +66,13 @@ CombineParticles INFO Number of counters : 11
    |*"#accept" | 10 | 3 |( 30.00000 +- 14.49138)% |
    | "#pass combcut" | 3 | 3 | 1.0000 |
    | "#pass mother cut" | 3 | 3 | 1.0000 |
    DimuonsTuple INFO Number of counters : 3
    DimuonsTuple INFO Number of counters : 5
    | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
    | "# events without candidate for branch Jpsi" | 7 |
    | "# events without candidate for branch MuPlus" | 7 |
    | "# non-empty events for branch Jpsi" | 3 |
    | "# non-empty events for branch MuPlus" | 3 |
    | "# processed events" | 3 |
    | "# processed events" | 10 |
    FunctionalParticleMaker INFO Number of counters : 4
    | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
    |*"# passed ProtoParticle filter" | 1106 | 1106 |( 100.0000 +- 0.000000)% |
    ......
    DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2.ref
    + 25
    − 26
    View file @ 62664d3f
    ......@@ -40,9 +40,9 @@ ApplicationMgr INFO Application Manager Initialized succ
    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/wg/dpa/wp3/NovemberFEST/hlt2_D0_Kpi_10evts.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
    EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1
    MCTruthAndBkgCatAlg.DaVinciSmart... WARNING BackgroundCategory:: Common mother is stable. StatusCode=FAILURE
    MCTruthAndBkgCatAlg.BackgroundCa... WARNING BackgroundCategory:: Common mother is stable. StatusCode=FAILURE
    RFileCnv INFO opening Root file "tuple_D0_Kpi_10evts.root" for writing
    RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory tuple_D0_Kpi_10evts.root:/Tuple
    ApplicationMgr INFO Application Manager Stopped successfully
    ......@@ -51,32 +51,31 @@ 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=76 {D0_ID,D0_KEY,D0_PT,D0_PX,D0_PY,D0_PZ,D0_ENERGY,D0_P,D0_FOURMOMENTUME,D0_FOURMOMEN}
    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: UserAlgs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LHCb__UnpackRawEvent/LHCb__UnpackRawEvent #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    HltPackedDataDecoder/HltPackedDataDecoder #=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 )%|
    UnpackTrack/UnpackTracks #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackRecVertex/UnpackPVs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackChargedProtos #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackNeutralProtos #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloElectrons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloPhotons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloMergedPi0s #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloSplitPhotons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    MuonPIDUnpacker/UnpackMuonPIDs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    RichPIDUnpacker/UnpackRichPIDs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackParticlesAndVertices/UnpackParticlesAndVertices #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LHCb__Converters__RecVertices__LHCbRecVerticesToVectorV2RecVertex/LHCb__Converters__RecVertices__LHCbRecVerticesToVectorV2RecVertex #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LoKi__HDRFilter/HDRFilter_D0Kpi #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    MCTruthAndBkgCatAlg/MCTruthAndBkgCatAlg #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    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: UserAlgs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LHCb__UnpackRawEvent/LHCb__UnpackRawEvent #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    HltPackedDataDecoder/HltPackedDataDecoder #=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 )%|
    UnpackTrack/UnpackTracks #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackRecVertex/UnpackPVs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackChargedProtos #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackNeutralProtos #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloElectrons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloPhotons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloMergedPi0s #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloSplitPhotons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    MuonPIDUnpacker/UnpackMuonPIDs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    RichPIDUnpacker/UnpackRichPIDs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackParticlesAndVertices/UnpackParticlesAndVertices #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LoKi__HDRFilter/HDRFilter_D0Kpi #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    ToolSvc INFO Removing all tools created by ToolSvc
    MCTruthAndBkgCatAlg.BackgroundCa... SUCCESS #WARNINGS = 1 Message = 'Common mother is stable.'
    MCTruthAndBkgCatAlg.DaVinciSmart... SUCCESS #WARNINGS = 1 Message = 'Common mother is stable.'
    RFileCnv INFO dumping contents of /NTUPLES/FILE1
    TFile: name=tuple_D0_Kpi_10evts.root, title=Gaudi Trees, option=CREATE
    ......
    DaVinciExamples/tests/refs/test_davinci_tupling_from_hlt2_gaudirun.ref
    + 20
    − 21
    View file @ 62664d3f
    ......@@ -28,27 +28,26 @@ ApplicationMgr INFO Application Manager Stopped successf
    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 {D0_PT,D0_BPVDIRA,D0_BPVFDCHI2,D0_BPVIPCHI2,Kminus_PT,piplus_PT}
    LAZY_AND: DaVinci #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    NONLAZY_OR: UserAnalysis #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LAZY_AND: UserAlgs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LHCb__UnpackRawEvent/LHCb__UnpackRawEvent #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    HltPackedDataDecoder/HltPackedDataDecoder #=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 )%|
    UnpackTrack/UnpackTracks #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackRecVertex/UnpackPVs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackChargedProtos #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackNeutralProtos #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloElectrons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloPhotons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloMergedPi0s #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloSplitPhotons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    MuonPIDUnpacker/UnpackMuonPIDs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    RichPIDUnpacker/UnpackRichPIDs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackParticlesAndVertices/UnpackParticlesAndVertices #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LHCb__Converters__RecVertices__LHCbRecVerticesToVectorV2RecVertex/LHCb__Converters__RecVertices__LHCbRecVerticesToVectorV2RecVertex #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LoKi__HDRFilter/HDRFilter_D0Kpi #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LAZY_AND: DaVinci #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    NONLAZY_OR: UserAnalysis #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LAZY_AND: UserAlgs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LHCb__UnpackRawEvent/LHCb__UnpackRawEvent #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    HltPackedDataDecoder/HltPackedDataDecoder #=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 )%|
    UnpackTrack/UnpackTracks #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackRecVertex/UnpackPVs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackChargedProtos #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackNeutralProtos #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloElectrons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloPhotons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloMergedPi0s #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloSplitPhotons #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    MuonPIDUnpacker/UnpackMuonPIDs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    RichPIDUnpacker/UnpackRichPIDs #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackParticlesAndVertices/UnpackParticlesAndVertices #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    LoKi__HDRFilter/HDRFilter_D0Kpi #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    FunTupleBase_Particles/Tuple #=7 Sum=7 Eff=|( 100.0000 +- 0.00000 )%|
    ToolSvc INFO Removing all tools created by ToolSvc
    RFileCnv INFO dumping contents of /NTUPLES/FILE1
    TFile: name=tuple_D0_Kpi_10evts.root, title=Gaudi Trees, option=CREATE
    ......
    DaVinciExamples/tests/refs/test_davinci_tupling_from_xgen.ref
    + 0
    − 2
    View file @ 62664d3f
    ......@@ -15,7 +15,6 @@ ApplicationMgr INFO Application Manager Initialized succ
    DeFTDetector INFO Current FT geometry version = 63
    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/wg/dpa/wp3/testDV_read_xgen/Gauss-12143001-100ev-20211117.xgen' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
    EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1
    RFileCnv INFO opening Root file "DV_tuple_xgen.root" for writing
    RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory DV_tuple_xgen.root:/BuJpsiK_MCTuple
    ......@@ -25,7 +24,6 @@ FSROutputStreamDstWriter INFO Events output: 1
    BuJpsiK_MCTuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections
    BuJpsiK_MCTuple SUCCESS List of booked N-Tuples in directory "FILE1/BuJpsiK_MCTuple"
    BuJpsiK_MCTuple SUCCESS ID=DecayTree Title="DecayTree" #items=24 {Bu_ETA,Bu_PHI,Bu_PT,Bu_E,Bu_P,Bu_PX,Bu_PY,Bu_PZ,Jpsi_P,Jpsi_PX,Jpsi_PY,Jpsi_PZ,Kp}
    BuJpsiK_MCTuple SUCCESS #WARNINGS = 185 Message = 'update_counters: No candidates found in this event. Skipping this event'
    LAZY_AND: DaVinci #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
    NONLAZY_OR: FileSummaryRecords #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
    LAZY_AND: GenFSR #=100 Sum=100 Eff=|( 100.0000 +- 0.00000 )%|
    ......
    DaVinciTests/tests/options/option_davinci_recVertices.py
    + 2
    − 2
    View file @ 62664d3f
    ###############################################################################
    # (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
    # (c) Copyright 2021-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". #
    ......@@ -49,4 +49,4 @@ def alg_config():
    variables=variables_dsk,
    inputs=bd2dsk_data)
    return {"UserAlgs": [v2_pvs, my_filter, my_tuple]}, []
    return {"UserAlgs": [my_filter, my_tuple]}, []
    DaVinciTests/tests/qmtest/davinci.qms/test_davinci_recVertices.qmt
    + 25
    − 25
    View file @ 62664d3f
    <?xml version="1.0" ?>
    <!--
    ###############################################################################
    # (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration #
    # (c) Copyright 2021-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". #
    ......@@ -37,30 +37,30 @@
    <text>../options/option_davinci_recVertices:alg_config</text>
    </set></argument>
    <argument name="validator"><text>
    findReferenceBlock("""LAZY_AND: DaVinci #=110 Sum=79 Eff=|( 71.81818 +- 4.28949 )%|
    NONLAZY_OR: FileSummaryRecords #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    LAZY_AND: GenFSR #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    RecordStream/FSROutputStreamDstWriter #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    NONLAZY_OR: UserAnalysis #=110 Sum=79 Eff=|( 71.81818 +- 4.28949 )%|
    LAZY_AND: UserAlgs #=110 Sum=79 Eff=|( 71.81818 +- 4.28949 )%|
    LHCb__UnpackRawEvent/LHCb__UnpackRawEvent #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    HltPackedDataDecoder/HltPackedDataDecoder #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackMCParticle/UnpackMCParticle #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackMCVertex/UnpackMCVertex #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackTrack/UnpackTracks #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackRecVertex/UnpackPVs #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackChargedProtos #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackNeutralProtos #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloElectrons #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloPhotons #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloMergedPi0s #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloSplitPhotons #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    MuonPIDUnpacker/UnpackMuonPIDs #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    RichPIDUnpacker/UnpackRichPIDs #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackParticlesAndVertices/UnpackParticlesAndVertices #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    LHCb__Converters__RecVertices__LHCbRecVerticesToVectorV2RecVertex/LHCb__Converters__RecVertices__LHCbRecVerticesToVectorV2RecVertex #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    LoKi__HDRFilter/HDRFilter_B0DsK #=110 Sum=79 Eff=|( 71.81818 +- 4.28949 )%|
    FunTupleBase_Particles/B0DsK_Tuple #=79 Sum=79 Eff=|( 100.0000 +- 0.00000 )%|
    findReferenceBlock("""
    LAZY_AND: DaVinci #=110 Sum=79 Eff=|( 71.81818 +- 4.28949 )%|
    NONLAZY_OR: FileSummaryRecords #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    LAZY_AND: GenFSR #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    RecordStream/FSROutputStreamDstWriter #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    NONLAZY_OR: UserAnalysis #=110 Sum=79 Eff=|( 71.81818 +- 4.28949 )%|
    LAZY_AND: UserAlgs #=110 Sum=79 Eff=|( 71.81818 +- 4.28949 )%|
    LHCb__UnpackRawEvent/LHCb__UnpackRawEvent #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    HltPackedDataDecoder/HltPackedDataDecoder #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackMCParticle/UnpackMCParticle #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackMCVertex/UnpackMCVertex #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackTrack/UnpackTracks #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackRecVertex/UnpackPVs #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackChargedProtos #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackProtoParticle/UnpackNeutralProtos #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloElectrons #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloPhotons #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloMergedPi0s #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackCaloHypo/UnpackCaloSplitPhotons #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    MuonPIDUnpacker/UnpackMuonPIDs #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    RichPIDUnpacker/UnpackRichPIDs #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    UnpackParticlesAndVertices/UnpackParticlesAndVertices #=110 Sum=110 Eff=|( 100.0000 +- 0.00000 )%|
    LoKi__HDRFilter/HDRFilter_B0DsK #=110 Sum=79 Eff=|( 71.81818 +- 4.28949 )%|
    FunTupleBase_Particles/B0DsK_Tuple #=79 Sum=79 Eff=|( 100.0000 +- 0.00000 )%|
    """, stdout, result, causes, signature_offset = 0, id = "Stream3")
    countErrorLines({"FATAL":0, "ERROR":0})
    </text></argument>
    ......
    Phys/DaVinci/python/DaVinci/truth_matching.py
    + 2
    − 1
    View file @ 62664d3f
    ......@@ -73,7 +73,8 @@ def ConfiguredMCTruthAndBkgCatAlg(
    OutputLevel=output_level)
    mcrel_assc = MCMatchObjP2MCRelator(
    RelTableLocations=relations_locs,
    RootInTES=root_in_tes,
    #Setting RootInTES for this tool gives a segfaul (why?), we anyway use DaVinciSmartAssociator for association.
    #RootInTES=root_in_tes,
    OutputLevel=output_level)
    part_desc = ParticleDescendants(
    RootInTES=root_in_tes, OutputLevel=output_level)
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment