From 57ad9b30d08503eab32052c3ead709fb2d554bee Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Thu, 16 Sep 2021 18:47:13 +0200 Subject: [PATCH 01/38] adding event prefilters --- .../tests/options/option_davinci_filters.py | 101 ++++ .../davinci.qms/test_davinci_filters.qmt | 46 ++ .../tests/refs/test_davinci_filters.ref | 515 ++++++++++++++++++ .../options/application-option-defaults.yaml | 3 + .../python/DaVinci/ConfigurationUpgrade.py | 3 + Phys/DaVinci/python/DaVinci/algorithms.py | 45 +- .../DaVinci/python/DaVinci/options_default.py | 4 + 7 files changed, 713 insertions(+), 4 deletions(-) create mode 100644 DaVinciTests/tests/options/option_davinci_filters.py create mode 100644 DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt create mode 100644 DaVinciTests/tests/refs/test_davinci_filters.ref diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py new file mode 100644 index 000000000..542b3b4f1 --- /dev/null +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -0,0 +1,101 @@ +############################################################################### +# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration # +# # +# This software is distributed under the terms of the GNU General Public # +# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # +# # +# In applying this licence, CERN does not waive the privileges and immunities # +# granted to it by virtue of its status as an Intergovernmental Organization # +# or submit itself to any jurisdiction. # +############################################################################### +""" +Read the output of an Sprucing job with the new DaVinci configuration. +""" +from FunTuple import FunctorCollection +from FunTuple import FunTuple_Particles as Funtuple +from FunTuple.NewTupleTools import Kinematics +from PyConf.application import make_data_with_FetchDataFromFile +from PyConf.Algorithms import LoKi__HDRFilter as Filter + +bd2dsk_line = make_data_with_FetchDataFromFile( + "/Event/Spruce/SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line/Particles") +bd2d0pipi_line = make_data_with_FetchDataFromFile( + "/Event/Spruce/SpruceB2OC_BdToD0PiPi_D0ToHHHH_Line/Particles") + +branches_dsk = { + 'B0': "[B0 -> D_s- K+]CC", + 'Ds': "[B0 -> ^D_s- K+]CC", + 'Kp': "[B0 -> D_s- ^K+]CC" +} + +branches_d0pipi = { + 'B0': "[B0 -> D0 pi+ pi-]CC", + 'D0': "[B0 -> ^D0 pi+ pi-]CC", + 'pip': "[B0 -> D0 ^pi+ pi-]CC", + 'pim': "[B0 -> D0 pi+ ^pi-]CC" +} + + +variables = FunctorCollection({ + 'LOKI_MAXPT': 'TRACK_MAX_PT', + 'LOKI_Muonp_PT': 'CHILD(PT, 1)', + 'LOKI_Muonm_PT': 'CHILD(PT, 2)', +}) + +variables_extra = FunctorCollection({ + 'LOKI_NTRCKS_ABV_THRSHLD': + 'NINTREE(ISBASIC & (PT > 15*MeV))' +}) +variables += variables_extra + +#FunTuple: make functor collection from the imported functor library Kinematics +variables_all = FunctorCollection(Kinematics) + +#FunTuple: associate functor collections to branch name +variables_dsk = { + 'ALL': variables_all, #adds variables to all branches + 'B0': variables, + 'Ds': variables_extra, + 'Kp': variables_extra +} + +variables_d0pipi = { + 'ALL': variables_all, #adds variables to all branches + 'B0': variables, + 'D0': variables_extra, + 'pip': variables_extra, + 'pim': variables_extra +} + +loki_preamble = ['TRACK_MAX_PT = MAXTREE(ISBASIC & HASTRACK, PT, -1)'] + +tuple_B0DsK = Funtuple( + name="B0DsK_Tuple", + tree_name="DecayTree", + branches=branches_dsk, + variables=variables_dsk, + loki_preamble=loki_preamble, + inputs=bd2dsk_line) + +tuple_B0D0pipi = Funtuple( + name="B0D0pipi_Tuple", + tree_name="DecayTree", + branches=branches_d0pipi, + variables=variables_d0pipi, + loki_preamble=loki_preamble, + inputs=bd2d0pipi_line) + +#code_filter = "EXISTS('%s') | EXISTS('%s')" %(bd2dsk_line.location, bs2dsk_line.location) +code_filter = "HLT_PASS('%s') | HLT_PASS('%s')" %(bd2dsk_line.location, bd2d0pipi_line.location) +evt_filter = Filter(name="EventPreFilter", Code=code_filter, Location=make_data_with_FetchDataFromFile("/Event/Spruce")) + +def main(): + from DaVinci import options + options.evt_max = -1 + options.evt_pre_filters = [evt_filter] + + tools = [] + algs = {"B0DsK": [tuple_B0DsK], + "B0D0pipi": [tuple_B0D0pipi]} + + return algs, tools diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt new file mode 100644 index 000000000..3c178752f --- /dev/null +++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt @@ -0,0 +1,46 @@ + + + + + + davinci + + run-mc + --inputfiledb + FEST_June_2021_dst + ../../../Phys/DaVinci/options/DaVinciDB-Example.yaml + --joboptfile + ../options/option_davinci_sprucing.yaml + --user_algorithms + ../options/option_davinci_filters:main + + ../refs/test_davinci_filters.ref + ../refs/empty.ref + +from DaVinciTests.QMTest.DaVinciExclusions import preprocessor +validateWithReference(preproc = preprocessor) +countErrorLines({"FATAL":0}) + + diff --git a/DaVinciTests/tests/refs/test_davinci_filters.ref b/DaVinciTests/tests/refs/test_davinci_filters.ref new file mode 100644 index 000000000..d79aad1ba --- /dev/null +++ b/DaVinciTests/tests/refs/test_davinci_filters.ref @@ -0,0 +1,515 @@ +INFO No MainOptions specified. DaVinci() will import no options file! +INFO User algorithm option_davinci_filters.main imported successfully! +[FunTupleBase_Particles/B0DsK_Tuple] +input_location +/Event/Spruce/SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line/Particles +[FunTupleBase_Particles/B0D0pipi_Tuple] +input_location +/Event/Spruce/SpruceB2OC_BdToD0PiPi_D0ToHHHH_Line/Particles +/***** User DVAppOptions/DVAppOptions ************************************************************** +|-auditors = [] (default: []) +|-buffer_events = 20000 (default: 20000) +|-callgrind_profile = False (default: False) +|-conddb_tag = 'sim-20210505-vc-md100' (default: '') +|-control_flow_file = '' (default: '') +|-data_flow_file = '' (default: '') +|-data_type = 'Upgrade' (default: '') +|-dddb_tag = 'dddb-20210218' (default: '') +|-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] +| (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) +|-dqflags_tag = '' (default: '') +|-enable_unpack = True (default: True) +|-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') +|-evt_max = -1 (default: -1) +|-evt_pre_filters = [LoKi__HDRFilter/EventPreFilter] (default: []) +|-first_evt = 0 (default: 0) +|-histo_file = 'sprucing_histos.root' (default: '') +|-hlt2_annsvc_location = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/sprucert.all_lines.annsvc.pol.json' +| (default: '') +|-hlt2_annsvc_selid = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/00135282_00000001_1.annsvc.selid.json' +| (default: '') +|-ignore_dq_flags = False (default: False) +|-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst'] +| (default: []) +|-input_raw_format = 0.3 (default: 0.3) +|-input_type = 'ROOT' (default: 'DST') +|-lines_maker = None +|-lumi = False (default: False) +|-main_options = '' (default: '') +|-memory_pool_size = 10485760 (default: 10485760) +|-merge_genfsr = False (default: False) +|-msg_svc_format = '% F%35W%S %7W%R%T %0W%M' (default: '% F%35W%S %7W%R%T %0W%M') +|-msg_svc_time_format = '%Y-%m-%d %H:%M:%S UTC' (default: '%Y-%m-%d %H:%M:%S UTC') +|-n_event_slots = 1 (default: -1) +|-n_threads = 1 (default: 1) +|-ntuple_file = 'sprucing_tuple.root' (default: '') +|-output_file = '' (default: '') +|-output_level = 3 (default: 3) +|-output_type = '' (default: '') +|-overwrite_data_options = False (default: False) +|-print_freq = 1 (default: 1000) +|-python_logging_level = 30 (default: 30) +|-root_compression_level = 'LZMA:6' (default: 'LZMA:6') +|-scheduler_legacy_mode = True (default: True) +|-simulation = True (default: False) +|-skip_events = 0 (default: 0) +|-tck = 0 (default: 0) +|-unpack_stream = '/Event/Spruce' (default: '/Event/Spruce') +|-use_iosvc = False (default: False) +|-user_algorithms = '../options/option_davinci_filters:main' (default: '') +|-write_fsr = True (default: True) +\----- (End of User DVAppOptions/DVAppOptions) ----------------------------------------------------- +ApplicationMgr SUCCESS +==================================================================================================================================== +==================================================================================================================================== +ApplicationMgr INFO Application Manager Configured successfully +DetectorPersistencySvc INFO Added successfully Conversion service:XmlCnvSvc +DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml +NTupleSvc INFO Added stream file:sprucing_tuple.root as FILE1 +RootHistSvc INFO Writing ROOT histograms to: sprucing_histos.root +HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc +FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' +B0DsK_Tuple INFO Initialising the FunTupleBase algorithm +B0DsK_Tuple INFO Conducting checks with LoKi +B0DsK_Tuple INFO Conducting checks with ThOr +B0DsK_Tuple INFO Setting the properties of ParticleTupleProp objects! +B0DsK_Tuple INFO Instatiating LoKi functors! +B0DsK_Tuple INFO Instatiating ThOr functors! +FunctorFactory INFO Cache miss for functor: ::Functors::Composite::Mass{}, now trying cling with headers [Event/Particle.h, Functors/Composite.h] +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] +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} +B0DsK_Tuple INFO Finished initialisation: +B0D0pipi_Tuple INFO Initialising the FunTupleBase algorithm +B0D0pipi_Tuple INFO Conducting checks with LoKi +B0D0pipi_Tuple INFO Conducting checks with ThOr +B0D0pipi_Tuple INFO Setting the properties of ParticleTupleProp objects! +B0D0pipi_Tuple INFO Instatiating LoKi functors! +B0D0pipi_Tuple INFO Instatiating ThOr functors! +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} +FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} +B0D0pipi_Tuple INFO Finished initialisation: +EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 +HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackMCParticle +HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackMCVertex +HiveDataBrokerSvc WARNING non-reentrant algorithm: LHCb::Hlt::PackedData::Decoder/HltPackedDataDecoder +HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackRecVertex/UnpackPVs +HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackChargedProtos +HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackNeutralProtos +HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackMuonPIDs +HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackRichPIDs +HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackParticlesAndVertices +HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter +HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos +HiveDataBrokerSvc WARNING non-reentrant algorithm: LoKi::VoidFilter/B0DsK_Tuple_checkLocation +HiveDataBrokerSvc WARNING non-reentrant algorithm: LoKi::VoidFilter/B0D0pipi_Tuple_checkLocation +ApplicationMgr INFO Application Manager Initialized successfully +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/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' +EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 +EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. +EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter +HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... +HltDecReportsDecoder WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... +UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. +UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent +RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine +RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 +RndmGenSvc INFO Using Random engine:HepRndm::Engine +SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! +RFileCnv INFO opening Root file "sprucing_tuple.root" for writing +RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple +HLTControlFlowMgr FATAL *** Event 0 on slot 0 failed! *** + [slot: 0, incident: AlgFail]: + + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS + + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS + + UnpackTracks e: d f: 1 sc: Filter decision: PASSED + + UnpackMuonPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS + + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS + + EventPreFilter e: d f: 1 sc: FAILURE + + B0D0pipi_Tuple e: n + + B0D0pipi_Tuple_checkLocation e: d f: 0 sc: SUCCESS + + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED + + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS + + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED + + UnpackMCParticle e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS + + UnpackRawEvent e: d f: 1 sc: FAILURE + + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS + + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#1 e: n + + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS + + HltPackedDataDecoder e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#16 e: n + + Gaudi__Hive__FetchDataFromFile#18 e: n + + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS + + SimpleHistos e: d f: 1 sc: SUCCESS + + UnpackPVs e: d f: 1 sc: SUCCESS + + DummyEventTime e: n + + UnpackChargedProtos e: d f: 1 sc: SUCCESS + + UnpackRichPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS + + UnpackNeutralProtos e: d f: 1 sc: SUCCESS + + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED + + reserveIOV e: n + + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS + + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS + + UnpackMCVertex e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS +HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 0 +EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 +EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. +EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter +UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. +UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +HLTControlFlowMgr FATAL *** Event 1 on slot 0 failed! *** + [slot: 0, incident: AlgFail]: + + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS + + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS + + UnpackTracks e: d f: 1 sc: Filter decision: PASSED + + UnpackMuonPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS + + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS + + EventPreFilter e: d f: 1 sc: FAILURE + + B0D0pipi_Tuple e: n + + B0D0pipi_Tuple_checkLocation e: d f: 0 sc: SUCCESS + + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED + + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS + + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED + + UnpackMCParticle e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS + + UnpackRawEvent e: d f: 1 sc: FAILURE + + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS + + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#1 e: n + + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS + + HltPackedDataDecoder e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#16 e: n + + Gaudi__Hive__FetchDataFromFile#18 e: n + + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS + + SimpleHistos e: d f: 1 sc: SUCCESS + + UnpackPVs e: d f: 1 sc: SUCCESS + + DummyEventTime e: n + + UnpackChargedProtos e: d f: 1 sc: SUCCESS + + UnpackRichPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS + + UnpackNeutralProtos e: d f: 1 sc: SUCCESS + + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED + + reserveIOV e: n + + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS + + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS + + UnpackMCVertex e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS +HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 1 +EventSelector SUCCESS Reading Event record 3. Record number within stream 1: 3 +EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. +EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter +UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. +UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +HLTControlFlowMgr FATAL *** Event 2 on slot 0 failed! *** + [slot: 0, incident: AlgFail]: + + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS + + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS + + UnpackTracks e: d f: 1 sc: Filter decision: PASSED + + UnpackMuonPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS + + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS + + EventPreFilter e: d f: 1 sc: FAILURE + + B0D0pipi_Tuple e: n + + B0D0pipi_Tuple_checkLocation e: d f: 0 sc: SUCCESS + + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED + + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS + + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED + + UnpackMCParticle e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS + + UnpackRawEvent e: d f: 1 sc: FAILURE + + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS + + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#1 e: n + + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS + + HltPackedDataDecoder e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#16 e: n + + Gaudi__Hive__FetchDataFromFile#18 e: n + + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS + + SimpleHistos e: d f: 1 sc: SUCCESS + + UnpackPVs e: d f: 1 sc: SUCCESS + + DummyEventTime e: n + + UnpackChargedProtos e: d f: 1 sc: SUCCESS + + UnpackRichPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS + + UnpackNeutralProtos e: d f: 1 sc: SUCCESS + + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED + + reserveIOV e: n + + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS + + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS + + UnpackMCVertex e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS +HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 2 +EventSelector SUCCESS Reading Event record 4. Record number within stream 1: 4 +EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. +EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter +UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. +UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0D0pipi_Tuple +HLTControlFlowMgr FATAL *** Event 3 on slot 0 failed! *** + [slot: 0, incident: AlgFail]: + + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS + + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS + + UnpackTracks e: d f: 1 sc: Filter decision: PASSED + + UnpackMuonPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS + + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS + + EventPreFilter e: d f: 1 sc: FAILURE + + B0D0pipi_Tuple e: d f: 1 sc: Filter decision: PASSED + + B0D0pipi_Tuple_checkLocation e: d f: 1 sc: SUCCESS + + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED + + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS + + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED + + UnpackMCParticle e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS + + UnpackRawEvent e: d f: 1 sc: FAILURE + + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS + + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#1 e: d f: 1 sc: SUCCESS + + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS + + HltPackedDataDecoder e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#16 e: n + + Gaudi__Hive__FetchDataFromFile#18 e: n + + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS + + SimpleHistos e: d f: 1 sc: SUCCESS + + UnpackPVs e: d f: 1 sc: SUCCESS + + DummyEventTime e: n + + UnpackChargedProtos e: d f: 1 sc: SUCCESS + + UnpackRichPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS + + UnpackNeutralProtos e: d f: 1 sc: SUCCESS + + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED + + reserveIOV e: n + + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS + + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS + + UnpackMCVertex e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS +HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 3 +EventSelector SUCCESS Reading Event record 5. Record number within stream 1: 5 +EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. +EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter +UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. +UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. +HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +HLTControlFlowMgr FATAL *** Event 4 on slot 0 failed! *** + [slot: 0, incident: AlgFail]: + + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS + + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS + + UnpackTracks e: d f: 1 sc: Filter decision: PASSED + + UnpackMuonPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS + + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS + + EventPreFilter e: d f: 1 sc: FAILURE + + B0D0pipi_Tuple e: d f: 1 sc: Filter decision: PASSED + + B0D0pipi_Tuple_checkLocation e: d f: 0 sc: SUCCESS + + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED + + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS + + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED + + UnpackMCParticle e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS + + UnpackRawEvent e: d f: 1 sc: FAILURE + + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS + + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED + + Gaudi__Hive__FetchDataFromFile#1 e: d f: 1 sc: SUCCESS + + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS + + HltPackedDataDecoder e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#16 e: n + + Gaudi__Hive__FetchDataFromFile#18 e: n + + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS + + SimpleHistos e: d f: 1 sc: SUCCESS + + UnpackPVs e: d f: 1 sc: SUCCESS + + DummyEventTime e: n + + UnpackChargedProtos e: d f: 1 sc: SUCCESS + + UnpackRichPIDs e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS + + UnpackNeutralProtos e: d f: 1 sc: SUCCESS + + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED + + reserveIOV e: n + + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS + + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS + + UnpackMCVertex e: d f: 1 sc: SUCCESS + + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS +HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 4 +ApplicationMgr INFO Application Manager Stopped successfully +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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} +B0D0pipi_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections +B0D0pipi_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0D0pipi_Tuple" +B0D0pipi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=47 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} +LAZY_AND: DaVinci #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| + NONLAZY_OR: UserAnalysis #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| + LAZY_AND: DVAnalysisNode #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| + LoKi__HDRFilter/EventPreFilter #=0 Sum=0 Eff=|(-100.0000 +- -100.000)%| + UnpackMCParticle/UnpackMCParticle #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackMuonPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackRichPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + HltDecReportsDecoder/HltDecReportsDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=0 Sum=0 Eff=|(-100.0000 +- -100.000)%| + LAZY_AND: DVAlgNode #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| + LAZY_AND: FSRNode #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: StandardAlgs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + GaudiHistoAlgorithm/SimpleHistos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0DsK #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/B0DsK_Tuple_checkLocation #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0D0pipi #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| + LoKi__VoidFilter/B0D0pipi_Tuple_checkLocation #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| + FunTupleBase_Particles/B0D0pipi_Tuple #=1 Sum=1 Eff=|( 100.0000 +- 0.00000 )%| +ToolSvc INFO Removing all tools created by ToolSvc +RFileCnv INFO dumping contents of /NTUPLES/FILE1 +TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE +NTupleSvc INFO NTuples saved successfully +ChronoStatSvc.finalize() INFO Service finalized successfully +ApplicationMgr INFO Application Manager Finalized successfully +ApplicationMgr ERROR Application Manager Terminated with error code 3 +B0D0pipi_Tuple_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 1 | +B0DsK_Tuple_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 5 | +ToolSvc.CoreFactory INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "# loaded from PYTHON" | 2 | +ToolSvc.HltFactory INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "# loaded from PYTHON" | 1 | +ToolSvc.HybridFactory INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "# loaded from PYTHON" | 62 | +UnpackParticlesAndVertices INFO Number of counters : 8 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "# UnPacked FlavourTags" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked MuonPIDs" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Particles" | 5 | 580 | 116.00 | 177.54 | 6.0000 | 470.00 | + | "# UnPacked ProtoParticles" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RecVertices" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RichPIDs" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Tracks" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Vertices" | 5 | 507 | 101.40 | 170.06 | 2.0000 | 441.00 | +SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 + | ID | Title | # | Mean | RMS | Skewness | Kurtosis | + | 101 | "Exponential" | 5 | 1.5585 | 1.3686 | 1.3169 | 0.007671 | + | 102 | "Breit" | 5 | -0.47848 | 1.7231 | -0.73721 | -1.4101 | + | 1111 | "Forced Numeric ID time test" | 5 | 0.60102 | 0.77219 | 0.25676 | -1.8814 | + | AutoID time test | "AutoID time test" | 5 | 0.60102 | 0.77219 | 0.25676 | -1.8814 | + | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 5 | 0.60102 | 0.77219 | 0.25676 | -1.8814 | + | poisson | "Poisson" | 5 | 1.6 | 0.8 | 1.0315 | -0.68748 | + | subdir1/bino | "Binominal" | 5 | 3.25 | 0.82916 | -0.31226 | -1.4691 | + | subdir2/bino | "Binominal" | 5 | 3.25 | 0.82916 | -0.31226 | -1.4691 | + | test1 | "Forced Alpha ID time test" | 5 | 0.60102 | 0.77219 | 0.25676 | -1.8814 | + | varBinning/x | "1D Variable Binning" | 5 | -0.38037 | 2.9517 | 0.43753 | -0.17942 | +SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 + | ID | Title | # | Mean | RMS | Skewness | Kurtosis | + | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 5 | 0.60102 | 0.77219 | -0.31781 | -2.117 | + | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 5 | 0.60102 | 0.77219 | -0.31781 | -2.117 | + | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 5 | -2.0703 | 4.2888 | 2.4585 | 0.24075 | + | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 5 | -2.0703 | 4.2888 | 2.4585 | 0.24075 | + | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 4 | -0.38037 | 2.9517 | 0.86863 | 5.1451 | + | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 4 | -0.38037 | 2.9517 | 0.86863 | 5.1451 | + | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 1 | -8.8302 | 0 | 0 | 0 | + | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 1 | -8.8302 | 0 | 0 | 0 | + | varBinning/a | "1D Profile Variable Binning" | 5 | -0.38037 | 2.9517 | 0.71962 | 2.3791 | diff --git a/Phys/DaVinci/options/application-option-defaults.yaml b/Phys/DaVinci/options/application-option-defaults.yaml index f0c487f24..d7df3d7c7 100644 --- a/Phys/DaVinci/options/application-option-defaults.yaml +++ b/Phys/DaVinci/options/application-option-defaults.yaml @@ -44,6 +44,9 @@ dqflags_tag: enable_unpack: text: '"""Explicitly enable/disable unpacking for input data (if specified)"""' value: True +evt_pre_filters: + text: '"""Set of event filtering algorithms to be run before DaVinci initializaton sequence. Only events passing these filters will be processed. Default = []."""' + value: [] evt_max: text: '"""Number of events to analyse. Default = -1 to run over all events."""' value: -1 diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index a1dea3180..4e1e05897 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -39,6 +39,9 @@ def add_davinci_configurables(options): config = configure_input(options) dvMainFlow[dvAnaNode] = [] + + if options.evt_pre_filters: + dvMainFlow[dvAnaNode] += options.evt_pre_filters if options.enable_unpack: dvMainFlow[dvAnaNode] += unpack_locations(config, options) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index 9f0239250..57bd6656b 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -57,14 +57,45 @@ def setup_algorithms(options): ) else: userAlgs, publicTools = setup_user_algorithms(userAlgName) + if type(userAlgs) == list: userAlgs = {"UserAlgorithms": userAlgs} - dvAlgs.update(userAlgs) return dvAlgs, publicTools +def add_safe_filters(options, algs_dict): + """ + Adding void filter to all algorithms with an input location checking it exists in TES. + """ + from PyConf.Algorithms import LoKi__VoidFilter as DValgFilter + + alg_filterd_dict = {} + for name, algs in algs_dict.items(): + algs_list = [] + location_list = [] + print(algs) + for alg in algs: + try: + alg.inputs + except: + algs_list += [alg] + else: + for name_location, data_location in alg.inputs.items(): + location = alg.inputs[name_location].location + print(name_location) + if not location in location_list: + print(location) + algFilter_code = "EXISTS('%s')" %location + algFilter = DValgFilter(name="%s_checkLocation" %alg.name, Code=algFilter_code) + algs_list += [algFilter, alg] + location_list.append(location) + + alg_filterd_dict[name] = algs_list + return alg_filterd_dict + + def define_fsr_writer(options): """ Define Generator FSR writer. @@ -171,12 +202,11 @@ def unpack_locations(config, options): Configures algorithms for reading HLT2 output. Location are found using stream as prefix. """ from GaudiConf import reading - from PyConf.Algorithms import HltDecReportsDecoder + from PyConf.Algorithms import HltDecReportsDecoder, LHCb__UnpackRawEvent from PyConf.application import make_data_with_FetchDataFromFile from PyConf.dataflow import force_location from RawEventFormat import Raw_location_db - reading_algs = [] hlt2_annsvc_location = get_option_value(options, "hlt2_annsvc_location") hlt2_annsvc_selid = get_option_value(options, "hlt2_annsvc_selid") raw_event_format = get_option_value(options, "input_raw_format") @@ -193,7 +223,14 @@ def unpack_locations(config, options): "OutputHltDecReportsLocation": force_location(os.path.join("/Event", "Hlt2/DecReports")) }) - reading_algs += [dec_reports] + + odin_alg = LHCb__UnpackRawEvent( + name='UnpackRawEvent', + BankTypes=['ODIN'], + RawEventLocation=make_data_with_FetchDataFromFile( + os.path.join("/Event",'DAQ/RawBanks/ODIN'))) + + reading_algs = [dec_reports, odin_alg] reading_algs = [reading.decoder( stream=stream, configurables=False)] + reading.unpackers( diff --git a/Phys/DaVinci/python/DaVinci/options_default.py b/Phys/DaVinci/python/DaVinci/options_default.py index 3e2c09a0e..31311d858 100644 --- a/Phys/DaVinci/python/DaVinci/options_default.py +++ b/Phys/DaVinci/python/DaVinci/options_default.py @@ -74,6 +74,10 @@ __optsDict__ = { "value": True }, + "evt_pre_filters": { + "text": '"""Set of event filtering algorithms to be run before DaVinci initializaton sequence. Only events passing these filters will be processed."""', + "value": [] + }, "evt_max": { "text": '"""Number of events to analyse. Default = -1 to run over all events."""', -- GitLab From e9ad4b13a14d4729a74e16e9885b6b580bc97af4 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Thu, 16 Sep 2021 16:57:17 +0000 Subject: [PATCH 02/38] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/DaVinci/-/jobs/16326082 --- .../tests/options/option_davinci_filters.py | 29 ++++++++++--------- .../python/DaVinci/ConfigurationUpgrade.py | 2 +- .../DaVinci/python/DaVinci/options_default.py | 3 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index 542b3b4f1..12ba2368a 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -29,13 +29,12 @@ branches_dsk = { } branches_d0pipi = { - 'B0': "[B0 -> D0 pi+ pi-]CC", - 'D0': "[B0 -> ^D0 pi+ pi-]CC", + 'B0': "[B0 -> D0 pi+ pi-]CC", + 'D0': "[B0 -> ^D0 pi+ pi-]CC", 'pip': "[B0 -> D0 ^pi+ pi-]CC", 'pim': "[B0 -> D0 pi+ ^pi-]CC" } - variables = FunctorCollection({ 'LOKI_MAXPT': 'TRACK_MAX_PT', 'LOKI_Muonp_PT': 'CHILD(PT, 1)', @@ -54,15 +53,15 @@ variables_all = FunctorCollection(Kinematics) #FunTuple: associate functor collections to branch name variables_dsk = { 'ALL': variables_all, #adds variables to all branches - 'B0': variables, - 'Ds': variables_extra, - 'Kp': variables_extra + 'B0': variables, + 'Ds': variables_extra, + 'Kp': variables_extra } variables_d0pipi = { 'ALL': variables_all, #adds variables to all branches - 'B0': variables, - 'D0': variables_extra, + 'B0': variables, + 'D0': variables_extra, 'pip': variables_extra, 'pim': variables_extra } @@ -86,8 +85,13 @@ tuple_B0D0pipi = Funtuple( inputs=bd2d0pipi_line) #code_filter = "EXISTS('%s') | EXISTS('%s')" %(bd2dsk_line.location, bs2dsk_line.location) -code_filter = "HLT_PASS('%s') | HLT_PASS('%s')" %(bd2dsk_line.location, bd2d0pipi_line.location) -evt_filter = Filter(name="EventPreFilter", Code=code_filter, Location=make_data_with_FetchDataFromFile("/Event/Spruce")) +code_filter = "HLT_PASS('%s') | HLT_PASS('%s')" % (bd2dsk_line.location, + bd2d0pipi_line.location) +evt_filter = Filter( + name="EventPreFilter", + Code=code_filter, + Location=make_data_with_FetchDataFromFile("/Event/Spruce")) + def main(): from DaVinci import options @@ -95,7 +99,6 @@ def main(): options.evt_pre_filters = [evt_filter] tools = [] - algs = {"B0DsK": [tuple_B0DsK], - "B0D0pipi": [tuple_B0D0pipi]} - + algs = {"B0DsK": [tuple_B0DsK], "B0D0pipi": [tuple_B0D0pipi]} + return algs, tools diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index 4e1e05897..cc85c8c7a 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -39,7 +39,7 @@ def add_davinci_configurables(options): config = configure_input(options) dvMainFlow[dvAnaNode] = [] - + if options.evt_pre_filters: dvMainFlow[dvAnaNode] += options.evt_pre_filters if options.enable_unpack: diff --git a/Phys/DaVinci/python/DaVinci/options_default.py b/Phys/DaVinci/python/DaVinci/options_default.py index 31311d858..c51ee0cba 100644 --- a/Phys/DaVinci/python/DaVinci/options_default.py +++ b/Phys/DaVinci/python/DaVinci/options_default.py @@ -75,7 +75,8 @@ __optsDict__ = { True }, "evt_pre_filters": { - "text": '"""Set of event filtering algorithms to be run before DaVinci initializaton sequence. Only events passing these filters will be processed."""', + "text": + '"""Set of event filtering algorithms to be run before DaVinci initializaton sequence. Only events passing these filters will be processed."""', "value": [] }, "evt_max": { -- GitLab From e7582a51078c89f5f987e2788dc9fb12d6a812af Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Thu, 16 Sep 2021 19:42:12 +0200 Subject: [PATCH 03/38] Fixed linting --- Phys/DaVinci/python/DaVinci/algorithms.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index 57bd6656b..60d83c4d1 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -75,7 +75,6 @@ def add_safe_filters(options, algs_dict): for name, algs in algs_dict.items(): algs_list = [] location_list = [] - print(algs) for alg in algs: try: alg.inputs @@ -84,9 +83,7 @@ def add_safe_filters(options, algs_dict): else: for name_location, data_location in alg.inputs.items(): location = alg.inputs[name_location].location - print(name_location) - if not location in location_list: - print(location) + if location not in location_list: algFilter_code = "EXISTS('%s')" %location algFilter = DValgFilter(name="%s_checkLocation" %alg.name, Code=algFilter_code) algs_list += [algFilter, alg] -- GitLab From a6ac96880ce3366174b28e0d91454e897b7668a7 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sat, 18 Sep 2021 16:32:26 +0200 Subject: [PATCH 04/38] Implementing event pre-filters --- .../tests/options/option_davinci_filters.py | 12 +- .../tests/refs/test_davinci_filters.ref | 547 ++++++------------ .../options/application-option-defaults.yaml | 2 +- .../python/DaVinci/ConfigurationUpgrade.py | 15 +- Phys/DaVinci/python/DaVinci/algorithms.py | 91 ++- .../DaVinci/python/DaVinci/options_default.py | 2 +- 6 files changed, 252 insertions(+), 417 deletions(-) diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index 12ba2368a..517dd1036 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -84,19 +84,13 @@ tuple_B0D0pipi = Funtuple( loki_preamble=loki_preamble, inputs=bd2d0pipi_line) -#code_filter = "EXISTS('%s') | EXISTS('%s')" %(bd2dsk_line.location, bs2dsk_line.location) -code_filter = "HLT_PASS('%s') | HLT_PASS('%s')" % (bd2dsk_line.location, - bd2d0pipi_line.location) -evt_filter = Filter( - name="EventPreFilter", - Code=code_filter, - Location=make_data_with_FetchDataFromFile("/Event/Spruce")) - +evt_filter = "HLT_PASS('Hlt2Topo2BodyLineDecision')" def main(): from DaVinci import options options.evt_max = -1 - options.evt_pre_filters = [evt_filter] + options.evt_pre_filters = {"HltLineFilter": evt_filter} + options.output_level = 3 tools = [] algs = {"B0DsK": [tuple_B0DsK], "B0D0pipi": [tuple_B0D0pipi]} diff --git a/DaVinciTests/tests/refs/test_davinci_filters.ref b/DaVinciTests/tests/refs/test_davinci_filters.ref index d79aad1ba..4506482d5 100644 --- a/DaVinciTests/tests/refs/test_davinci_filters.ref +++ b/DaVinciTests/tests/refs/test_davinci_filters.ref @@ -1,11 +1,5 @@ INFO No MainOptions specified. DaVinci() will import no options file! INFO User algorithm option_davinci_filters.main imported successfully! -[FunTupleBase_Particles/B0DsK_Tuple] -input_location -/Event/Spruce/SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line/Particles -[FunTupleBase_Particles/B0D0pipi_Tuple] -input_location -/Event/Spruce/SpruceB2OC_BdToD0PiPi_D0ToHHHH_Line/Particles /***** User DVAppOptions/DVAppOptions ************************************************************** |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) @@ -21,7 +15,7 @@ input_location |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = -1 (default: -1) -|-evt_pre_filters = [LoKi__HDRFilter/EventPreFilter] (default: []) +|-evt_pre_filters = {'HltLineFilter': "HLT_PASS('Hlt2Topo2BodyLineDecision')"} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'sprucing_histos.root' (default: '') |-hlt2_annsvc_location = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/sprucert.all_lines.annsvc.pol.json' @@ -78,12 +72,6 @@ B0DsK_Tuple INFO Instatiating ThOr functors! FunctorFactory INFO Cache miss for functor: ::Functors::Composite::Mass{}, now trying cling with headers [Event/Particle.h, Functors/Composite.h] 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] -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} B0DsK_Tuple INFO Finished initialisation: B0D0pipi_Tuple INFO Initialising the FunTupleBase algorithm B0D0pipi_Tuple INFO Conducting checks with LoKi @@ -91,221 +79,28 @@ B0D0pipi_Tuple INFO Conducting checks with ThOr B0D0pipi_Tuple INFO Setting the properties of ParticleTupleProp objects! B0D0pipi_Tuple INFO Instatiating LoKi functors! B0D0pipi_Tuple INFO Instatiating ThOr functors! -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} B0D0pipi_Tuple INFO Finished initialisation: EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackMCParticle -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackMCVertex -HiveDataBrokerSvc WARNING non-reentrant algorithm: LHCb::Hlt::PackedData::Decoder/HltPackedDataDecoder -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackRecVertex/UnpackPVs -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackChargedProtos -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackNeutralProtos -HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackMuonPIDs -HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackRichPIDs -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackParticlesAndVertices -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos -HiveDataBrokerSvc WARNING non-reentrant algorithm: LoKi::VoidFilter/B0DsK_Tuple_checkLocation -HiveDataBrokerSvc WARNING non-reentrant algorithm: LoKi::VoidFilter/B0D0pipi_Tuple_checkLocation ApplicationMgr INFO Application Manager Initialized successfully 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/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 -EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. -EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter -HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... HltDecReportsDecoder WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... -UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. -UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent +HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 RndmGenSvc INFO Using Random engine:HepRndm::Engine SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! RFileCnv INFO opening Root file "sprucing_tuple.root" for writing RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple -HLTControlFlowMgr FATAL *** Event 0 on slot 0 failed! *** - [slot: 0, incident: AlgFail]: - + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS - + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS - + UnpackTracks e: d f: 1 sc: Filter decision: PASSED - + UnpackMuonPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS - + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS - + EventPreFilter e: d f: 1 sc: FAILURE - + B0D0pipi_Tuple e: n - + B0D0pipi_Tuple_checkLocation e: d f: 0 sc: SUCCESS - + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED - + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS - + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED - + UnpackMCParticle e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS - + UnpackRawEvent e: d f: 1 sc: FAILURE - + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS - + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#1 e: n - + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS - + HltPackedDataDecoder e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#16 e: n - + Gaudi__Hive__FetchDataFromFile#18 e: n - + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS - + SimpleHistos e: d f: 1 sc: SUCCESS - + UnpackPVs e: d f: 1 sc: SUCCESS - + DummyEventTime e: n - + UnpackChargedProtos e: d f: 1 sc: SUCCESS - + UnpackRichPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS - + UnpackNeutralProtos e: d f: 1 sc: SUCCESS - + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED - + reserveIOV e: n - + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS - + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS - + UnpackMCVertex e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS -HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 0 EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 -EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. -EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter -UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. -UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -HLTControlFlowMgr FATAL *** Event 1 on slot 0 failed! *** - [slot: 0, incident: AlgFail]: - + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS - + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS - + UnpackTracks e: d f: 1 sc: Filter decision: PASSED - + UnpackMuonPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS - + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS - + EventPreFilter e: d f: 1 sc: FAILURE - + B0D0pipi_Tuple e: n - + B0D0pipi_Tuple_checkLocation e: d f: 0 sc: SUCCESS - + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED - + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS - + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED - + UnpackMCParticle e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS - + UnpackRawEvent e: d f: 1 sc: FAILURE - + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS - + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#1 e: n - + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS - + HltPackedDataDecoder e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#16 e: n - + Gaudi__Hive__FetchDataFromFile#18 e: n - + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS - + SimpleHistos e: d f: 1 sc: SUCCESS - + UnpackPVs e: d f: 1 sc: SUCCESS - + DummyEventTime e: n - + UnpackChargedProtos e: d f: 1 sc: SUCCESS - + UnpackRichPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS - + UnpackNeutralProtos e: d f: 1 sc: SUCCESS - + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED - + reserveIOV e: n - + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS - + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS - + UnpackMCVertex e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS -HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 1 EventSelector SUCCESS Reading Event record 3. Record number within stream 1: 3 -EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. -EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter -UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. -UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -HLTControlFlowMgr FATAL *** Event 2 on slot 0 failed! *** - [slot: 0, incident: AlgFail]: - + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS - + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS - + UnpackTracks e: d f: 1 sc: Filter decision: PASSED - + UnpackMuonPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS - + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS - + EventPreFilter e: d f: 1 sc: FAILURE - + B0D0pipi_Tuple e: n - + B0D0pipi_Tuple_checkLocation e: d f: 0 sc: SUCCESS - + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED - + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS - + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED - + UnpackMCParticle e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS - + UnpackRawEvent e: d f: 1 sc: FAILURE - + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS - + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#1 e: n - + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS - + HltPackedDataDecoder e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#16 e: n - + Gaudi__Hive__FetchDataFromFile#18 e: n - + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS - + SimpleHistos e: d f: 1 sc: SUCCESS - + UnpackPVs e: d f: 1 sc: SUCCESS - + DummyEventTime e: n - + UnpackChargedProtos e: d f: 1 sc: SUCCESS - + UnpackRichPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS - + UnpackNeutralProtos e: d f: 1 sc: SUCCESS - + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED - + reserveIOV e: n - + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS - + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS - + UnpackMCVertex e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS -HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 2 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 4. Record number within stream 1: 4 -EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. -EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter -UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. -UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -314,110 +109,115 @@ B0D0pipi_Tuple INFO Multiple particles match the decay d B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0D0pipi_Tuple -HLTControlFlowMgr FATAL *** Event 3 on slot 0 failed! *** - [slot: 0, incident: AlgFail]: - + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS - + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS - + UnpackTracks e: d f: 1 sc: Filter decision: PASSED - + UnpackMuonPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS - + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS - + EventPreFilter e: d f: 1 sc: FAILURE - + B0D0pipi_Tuple e: d f: 1 sc: Filter decision: PASSED - + B0D0pipi_Tuple_checkLocation e: d f: 1 sc: SUCCESS - + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED - + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS - + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED - + UnpackMCParticle e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS - + UnpackRawEvent e: d f: 1 sc: FAILURE - + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS - + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#1 e: d f: 1 sc: SUCCESS - + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS - + HltPackedDataDecoder e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#16 e: n - + Gaudi__Hive__FetchDataFromFile#18 e: n - + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS - + SimpleHistos e: d f: 1 sc: SUCCESS - + UnpackPVs e: d f: 1 sc: SUCCESS - + DummyEventTime e: n - + UnpackChargedProtos e: d f: 1 sc: SUCCESS - + UnpackRichPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS - + UnpackNeutralProtos e: d f: 1 sc: SUCCESS - + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED - + reserveIOV e: n - + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS - + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS - + UnpackMCVertex e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS -HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 3 EventSelector SUCCESS Reading Event record 5. Record number within stream 1: 5 -EventPreFilter ERROR The type expected for /Event/Spruce is LHCb::HltDecReports and is different from the one of the object in the store which is DataObject. -EventPreFilter ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LoKi__HDRFilter/EventPreFilter -UnpackRawEvent ERROR Cannot retrieve /Event/DAQ/RawBanks/ODIN from transient store. -UnpackRawEvent ERROR Maximum number of errors ( 'ErrorMax':1) reached. -HLTControlFlowMgr FATAL Event failed in Node LHCb__UnpackRawEvent/UnpackRawEvent -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -HLTControlFlowMgr FATAL *** Event 4 on slot 0 failed! *** - [slot: 0, incident: AlgFail]: - + Gaudi__Hive__FetchDataFromFile#15 e: d f: 1 sc: SUCCESS - + UnpackCaloElectrons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#8 e: d f: 1 sc: SUCCESS - + UnpackTracks e: d f: 1 sc: Filter decision: PASSED - + UnpackMuonPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#17 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#7 e: d f: 1 sc: SUCCESS - + UnpackParticlesAndVertices e: d f: 1 sc: SUCCESS - + EventPreFilter e: d f: 1 sc: FAILURE - + B0D0pipi_Tuple e: d f: 1 sc: Filter decision: PASSED - + B0D0pipi_Tuple_checkLocation e: d f: 0 sc: SUCCESS - + B0DsK_Tuple e: d f: 1 sc: Filter decision: PASSED - + UnpackCaloPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#6 e: d f: 1 sc: SUCCESS - + HltDecReportsDecoder e: d f: 1 sc: Filter decision: PASSED - + UnpackMCParticle e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#13 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#3 e: d f: 1 sc: SUCCESS - + UnpackRawEvent e: d f: 1 sc: FAILURE - + Gaudi__Hive__FetchDataFromFile e: d f: 1 sc: SUCCESS - + UnpackCaloSplitPhotons e: d f: 1 sc: Filter decision: PASSED - + Gaudi__Hive__FetchDataFromFile#1 e: d f: 1 sc: SUCCESS - + FSROutputStreamDstWriter e: d f: 1 sc: SUCCESS - + HltPackedDataDecoder e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#16 e: n - + Gaudi__Hive__FetchDataFromFile#18 e: n - + Gaudi__Hive__FetchDataFromFile#10 e: d f: 1 sc: SUCCESS - + SimpleHistos e: d f: 1 sc: SUCCESS - + UnpackPVs e: d f: 1 sc: SUCCESS - + DummyEventTime e: n - + UnpackChargedProtos e: d f: 1 sc: SUCCESS - + UnpackRichPIDs e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#14 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#2 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#4 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#12 e: d f: 1 sc: SUCCESS - + UnpackNeutralProtos e: d f: 1 sc: SUCCESS - + UnpackCaloMergedPi0s e: d f: 1 sc: Filter decision: PASSED - + reserveIOV e: n - + Gaudi__Hive__FetchDataFromFile#5 e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#9 e: d f: 1 sc: SUCCESS - + B0DsK_Tuple_checkLocation e: d f: 1 sc: SUCCESS - + UnpackMCVertex e: d f: 1 sc: SUCCESS - + Gaudi__Hive__FetchDataFromFile#11 e: d f: 1 sc: SUCCESS -HLTControlFlowMgr FATAL Failed event detected on s: 0 e: 4 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 6. Record number within stream 1: 6 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 7. Record number within stream 1: 7 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 8. Record number within stream 1: 8 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 9. Record number within stream 1: 9 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 10. Record number within stream 1: 10 +EventSelector SUCCESS Reading Event record 11. Record number within stream 1: 11 +EventSelector SUCCESS Reading Event record 12. Record number within stream 1: 12 +EventSelector SUCCESS Reading Event record 13. Record number within stream 1: 13 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 14. Record number within stream 1: 14 +EventSelector SUCCESS Reading Event record 15. Record number within stream 1: 15 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 16. Record number within stream 1: 16 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 17. Record number within stream 1: 17 +EventSelector SUCCESS Reading Event record 18. Record number within stream 1: 18 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 19. Record number within stream 1: 19 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 20. Record number within stream 1: 20 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 21. Record number within stream 1: 21 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 22. Record number within stream 1: 22 +EventSelector SUCCESS Reading Event record 23. Record number within stream 1: 23 +EventSelector SUCCESS Reading Event record 24. Record number within stream 1: 24 +EventSelector SUCCESS Reading Event record 25. Record number within stream 1: 25 +EventSelector SUCCESS Reading Event record 26. Record number within stream 1: 26 +EventSelector SUCCESS Reading Event record 27. Record number within stream 1: 27 +EventSelector SUCCESS Reading Event record 28. Record number within stream 1: 28 +EventSelector SUCCESS Reading Event record 29. Record number within stream 1: 29 +EventSelector SUCCESS Reading Event record 30. Record number within stream 1: 30 +EventSelector SUCCESS Reading Event record 31. Record number within stream 1: 31 +EventSelector SUCCESS Reading Event record 32. Record number within stream 1: 32 +EventSelector SUCCESS Reading Event record 33. Record number within stream 1: 33 +EventSelector SUCCESS Reading Event record 34. Record number within stream 1: 34 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 35. Record number within stream 1: 35 +EventSelector SUCCESS Reading Event record 36. Record number within stream 1: 36 +EventSelector SUCCESS Reading Event record 37. Record number within stream 1: 37 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 38. Record number within stream 1: 38 +EventSelector SUCCESS Reading Event record 39. Record number within stream 1: 39 +EventSelector SUCCESS Reading Event record 40. Record number within stream 1: 40 +EventSelector SUCCESS Reading Event record 41. Record number within stream 1: 41 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 42. Record number within stream 1: 42 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 43. Record number within stream 1: 43 +EventSelector SUCCESS Reading Event record 44. Record number within stream 1: 44 +EventSelector SUCCESS Reading Event record 45. Record number within stream 1: 45 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 46. Record number within stream 1: 46 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 47. Record number within stream 1: 47 +EventSelector SUCCESS Reading Event record 48. Record number within stream 1: 48 +EventSelector SUCCESS Reading Event record 49. Record number within stream 1: 49 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 50. Record number within stream 1: 50 +EventSelector SUCCESS Reading Event record 51. Record number within stream 1: 51 +EventSelector SUCCESS Reading Event record 52. Record number within stream 1: 52 +EventSelector SUCCESS Reading Event record 53. Record number within stream 1: 53 +EventSelector SUCCESS Reading Event record 54. Record number within stream 1: 54 +EventSelector SUCCESS Reading Event record 55. Record number within stream 1: 55 +EventSelector SUCCESS Reading Event record 56. Record number within stream 1: 56 ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 @@ -427,36 +227,36 @@ B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" B0D0pipi_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections B0D0pipi_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0D0pipi_Tuple" B0D0pipi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=47 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -LAZY_AND: DaVinci #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| - NONLAZY_OR: UserAnalysis #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| - LAZY_AND: DVAnalysisNode #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| - LoKi__HDRFilter/EventPreFilter #=0 Sum=0 Eff=|(-100.0000 +- -100.000)%| - UnpackMCParticle/UnpackMCParticle #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - HltDecReportsDecoder/HltDecReportsDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=0 Sum=0 Eff=|(-100.0000 +- -100.000)%| - LAZY_AND: DVAlgNode #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| - LAZY_AND: FSRNode #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: B0DsK #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/B0DsK_Tuple_checkLocation #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: B0D0pipi #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| - LoKi__VoidFilter/B0D0pipi_Tuple_checkLocation #=5 Sum=1 Eff=|( 20.00000 +- 17.8885 )%| +LAZY_AND: DaVinci #=56 Sum=1 Eff=|( 1.785714 +- 1.76970 )%| + NONLAZY_OR: UserAnalysis #=56 Sum=1 Eff=|( 1.785714 +- 1.76970 )%| + LAZY_AND: DVAnalysisNode #=56 Sum=1 Eff=|( 1.785714 +- 1.76970 )%| + LoKi__HDRFilter/EventPreFilter_HltLineFilter #=56 Sum=33 Eff=|( 58.92857 +- 6.57414 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackMuonPIDs #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackRichPIDs #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + HltDecReportsDecoder/HltDecReportsDecoder #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: DVAlgNode #=33 Sum=1 Eff=|( 3.030303 +- 2.98404 )%| + LAZY_AND: FSRNode #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: StandardAlgs #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + GaudiHistoAlgorithm/SimpleHistos #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0DsK #=33 Sum=28 Eff=|( 84.84848 +- 6.24156 )%| + LoKi__VoidFilter/B0DsK_Tuple_checkLocation #=33 Sum=28 Eff=|( 84.84848 +- 6.24156 )%| + FunTupleBase_Particles/B0DsK_Tuple #=28 Sum=28 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0D0pipi #=28 Sum=1 Eff=|( 3.571429 +- 3.50707 )%| + LoKi__VoidFilter/B0D0pipi_Tuple_checkLocation #=28 Sum=1 Eff=|( 3.571429 +- 3.50707 )%| FunTupleBase_Particles/B0D0pipi_Tuple #=1 Sum=1 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 @@ -464,13 +264,16 @@ TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE NTupleSvc INFO NTuples saved successfully ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully -ApplicationMgr ERROR Application Manager Terminated with error code 3 +ApplicationMgr INFO Application Manager Terminated successfully B0D0pipi_Tuple_checkLocation INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "#passed" | 1 | B0DsK_Tuple_checkLocation INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 5 | + | "#passed" | 28 | +EventPreFilter_HltLineFilter INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + |*"#passed" | 56 | 33 |( 58.92857 +- 6.574138)% | ToolSvc.CoreFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# loaded from PYTHON" | 2 | @@ -482,34 +285,34 @@ ToolSvc.HybridFactory INFO Number of counters : 1 | "# loaded from PYTHON" | 62 | UnpackParticlesAndVertices INFO Number of counters : 8 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# UnPacked FlavourTags" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked MuonPIDs" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Particles" | 5 | 580 | 116.00 | 177.54 | 6.0000 | 470.00 | - | "# UnPacked ProtoParticles" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RecVertices" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RichPIDs" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Tracks" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Vertices" | 5 | 507 | 101.40 | 170.06 | 2.0000 | 441.00 | + | "# UnPacked FlavourTags" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked MuonPIDs" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Particles" | 33 | 1732 | 52.485 | 101.43 | 6.0000 | 470.00 | + | "# UnPacked ProtoParticles" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RecVertices" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RichPIDs" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Tracks" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Vertices" | 33 | 1356 | 41.091 | 93.944 | 2.0000 | 441.00 | SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 5 | 1.5585 | 1.3686 | 1.3169 | 0.007671 | - | 102 | "Breit" | 5 | -0.47848 | 1.7231 | -0.73721 | -1.4101 | - | 1111 | "Forced Numeric ID time test" | 5 | 0.60102 | 0.77219 | 0.25676 | -1.8814 | - | AutoID time test | "AutoID time test" | 5 | 0.60102 | 0.77219 | 0.25676 | -1.8814 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 5 | 0.60102 | 0.77219 | 0.25676 | -1.8814 | - | poisson | "Poisson" | 5 | 1.6 | 0.8 | 1.0315 | -0.68748 | - | subdir1/bino | "Binominal" | 5 | 3.25 | 0.82916 | -0.31226 | -1.4691 | - | subdir2/bino | "Binominal" | 5 | 3.25 | 0.82916 | -0.31226 | -1.4691 | - | test1 | "Forced Alpha ID time test" | 5 | 0.60102 | 0.77219 | 0.25676 | -1.8814 | - | varBinning/x | "1D Variable Binning" | 5 | -0.38037 | 2.9517 | 0.43753 | -0.17942 | + | 101 | "Exponential" | 33 | 1.1477 | 1.0673 | 1.0159 | 0.29845 | + | 102 | "Breit" | 33 | -0.36001 | 1.0656 | -1.281 | 1.8023 | + | 1111 | "Forced Numeric ID time test" | 33 | 0.20408 | 0.97308 | -0.58699 | 0.83413 | + | AutoID time test | "AutoID time test" | 33 | 0.20408 | 0.97308 | -0.58699 | 0.83413 | + | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 33 | 0.20408 | 0.97308 | -0.58699 | 0.83413 | + | poisson | "Poisson" | 33 | 1.5161 | 1.0738 | 0.567 | -0.60638 | + | subdir1/bino | "Binominal" | 33 | 1.875 | 1.1924 | 0.36778 | -0.71859 | + | subdir2/bino | "Binominal" | 33 | 1.875 | 1.1924 | 0.36778 | -0.71859 | + | test1 | "Forced Alpha ID time test" | 33 | 0.20408 | 0.97308 | -0.58699 | 0.83413 | + | varBinning/x | "1D Variable Binning" | 33 | -0.14425 | 2.7646 | -0.027661 | -1.1776 | SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 5 | 0.60102 | 0.77219 | -0.31781 | -2.117 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 5 | 0.60102 | 0.77219 | -0.31781 | -2.117 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 5 | -2.0703 | 4.2888 | 2.4585 | 0.24075 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 5 | -2.0703 | 4.2888 | 2.4585 | 0.24075 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 4 | -0.38037 | 2.9517 | 0.86863 | 5.1451 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 4 | -0.38037 | 2.9517 | 0.86863 | 5.1451 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 1 | -8.8302 | 0 | 0 | 0 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 1 | -8.8302 | 0 | 0 | 0 | - | varBinning/a | "1D Profile Variable Binning" | 5 | -0.38037 | 2.9517 | 0.71962 | 2.3791 | + | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 33 | 0.20408 | 0.97308 | -3.0786 | 9.4213 | + | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 33 | 0.20408 | 0.97308 | -3.0786 | 9.4213 | + | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 33 | -1.1133 | 5.4041 | -1.1909 | -3.9956 | + | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 33 | -1.1133 | 5.4041 | -1.1909 | -3.9956 | + | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 19 | -1.6848 | 4.9061 | 0.44674 | -1.2531 | + | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 19 | -1.6848 | 4.9061 | 0.44674 | -1.2531 | + | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 14 | -0.3378 | 5.9268 | 0 | -3 | + | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 14 | -0.3378 | 5.9268 | 0 | -3 | + | varBinning/a | "1D Profile Variable Binning" | 33 | -0.14425 | 2.7646 | 0.89544 | 3.9644 | diff --git a/Phys/DaVinci/options/application-option-defaults.yaml b/Phys/DaVinci/options/application-option-defaults.yaml index d7df3d7c7..4e284dd2c 100644 --- a/Phys/DaVinci/options/application-option-defaults.yaml +++ b/Phys/DaVinci/options/application-option-defaults.yaml @@ -46,7 +46,7 @@ enable_unpack: value: True evt_pre_filters: text: '"""Set of event filtering algorithms to be run before DaVinci initializaton sequence. Only events passing these filters will be processed. Default = []."""' - value: [] + value: {} evt_max: text: '"""Number of events to analyse. Default = -1 to run over all events."""' value: -1 diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index cc85c8c7a..9f59fdf5a 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -15,7 +15,9 @@ from PyConf.application import ComponentConfig, configure, configure_input from PyConf.control_flow import CompositeNode, NodeLogic from DaVinci.configOptions import (check_options, set_job_options, set_args_options, set_input_file_options) -from DaVinci.algorithms import setup_algorithms, define_fsr_writer, unpack_locations +from DaVinci.algorithms import (setup_algorithms, define_fsr_writer, + setup_user_algorithms, unpack_locations, + set_hlt_config, set_evt_filters) from DaVinci.config import davinci_control_flow, prepare_davinci_nodes @@ -40,10 +42,15 @@ def add_davinci_configurables(options): config = configure_input(options) dvMainFlow[dvAnaNode] = [] - if options.evt_pre_filters: - dvMainFlow[dvAnaNode] += options.evt_pre_filters if options.enable_unpack: - dvMainFlow[dvAnaNode] += unpack_locations(config, options) + hlt_dec_reports = set_hlt_config(config, options) + + # Prepend the event per-filters defined by the user to all the unpacking algorithms + if options.evt_pre_filters: + dvMainFlow[dvAnaNode] += set_evt_filters(options, hlt_dec_reports) + + dvMainFlow[dvAnaNode] += unpack_locations(options) + dvMainFlow[dvAnaNode] += [hlt_dec_reports] dvAlgs = {} if options.simulation and options.write_fsr: diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index 60d83c4d1..c384f60f8 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -10,7 +10,6 @@ ############################################################################### import os, sys, importlib, json, XRootD.client -from Gaudi.Configuration import INFO from GaudiKernel.ProcessJobOptions import importOptions from PyConf.components import setup_component from DaVinci.configOptions import get_option_value @@ -86,8 +85,9 @@ def add_safe_filters(options, algs_dict): if location not in location_list: algFilter_code = "EXISTS('%s')" %location algFilter = DValgFilter(name="%s_checkLocation" %alg.name, Code=algFilter_code) - algs_list += [algFilter, alg] + algs_list += [algFilter] location_list.append(location) + algs_list += [alg] alg_filterd_dict[name] = algs_list return alg_filterd_dict @@ -103,6 +103,7 @@ def define_fsr_writer(options): Returns: - list of FSR algorithm instances to be configured. """ + from Gaudi.Configuration import INFO from PyConf.Algorithms import GenFSRMerge, RecordStream algs = [] @@ -170,7 +171,7 @@ def setup_user_algorithms(userAlgPath): # Import the module containing the user algorithms try: - module = importlib.import_module(moduleName) # noqa: F841 + module = importlib.import_module(moduleName) except: raise DVOptionError( "user_algorithms", @@ -194,53 +195,81 @@ def setup_user_algorithms(userAlgPath): return userAlgs, publicTools -def unpack_locations(config, options): +def unpack_locations(options): """ Configures algorithms for reading HLT2 output. Location are found using stream as prefix. """ from GaudiConf import reading - from PyConf.Algorithms import HltDecReportsDecoder, LHCb__UnpackRawEvent - from PyConf.application import make_data_with_FetchDataFromFile - from PyConf.dataflow import force_location - from RawEventFormat import Raw_location_db + from PyConf.Algorithms import LHCb__UnpackRawEvent + from PyConf.application import default_raw_event#, make_data_with_FetchDataFromFile - hlt2_annsvc_location = get_option_value(options, "hlt2_annsvc_location") - hlt2_annsvc_selid = get_option_value(options, "hlt2_annsvc_selid") raw_event_format = get_option_value(options, "input_raw_format") stream_psandvs = get_option_value(options, "unpack_stream") stream = "%s/HLT2" % stream_psandvs - set_hltAnn_svc(config, hlt2_annsvc_location, hlt2_annsvc_selid) - bank_location = make_data_with_FetchDataFromFile( - os.path.join("/Event", Raw_location_db[raw_event_format]["DstData"])) - dec_reports = HltDecReportsDecoder( - RawEventLocations=bank_location, - SourceID='Hlt2', - outputs={ - "OutputHltDecReportsLocation": - force_location(os.path.join("/Event", "Hlt2/DecReports")) - }) - - odin_alg = LHCb__UnpackRawEvent( + unpack_raw_event = LHCb__UnpackRawEvent( name='UnpackRawEvent', BankTypes=['ODIN'], - RawEventLocation=make_data_with_FetchDataFromFile( - os.path.join("/Event",'DAQ/RawBanks/ODIN'))) + RawEventLocation=default_raw_event(['ODIN']), + RawBankLocations=['/Event/DAQ/RawBanks/ODIN']) - reading_algs = [dec_reports, odin_alg] + reading_algs = [unpack_raw_event] - reading_algs = [reading.decoder( + reading_algs += [reading.decoder( stream=stream, configurables=False)] + reading.unpackers( stream=stream, stream_psandvs=stream_psandvs, - configurables=False) + reading_algs + configurables=False) if options.simulation: - reading_algs = reading.mc_unpackers( - stream=stream, configurables=False) + reading_algs - + reading_algs += reading.mc_unpackers( + stream=stream, configurables=False) + return reading_algs +def set_hlt_config(config, options): + """ + Set the Hlt service and algorithms. + """ + from PyConf.Algorithms import HltDecReportsDecoder + from PyConf.application import default_raw_event + from PyConf.dataflow import force_location + hlt2_annsvc_location = get_option_value(options, "hlt2_annsvc_location") + hlt2_annsvc_selid = get_option_value(options, "hlt2_annsvc_selid") + + set_hltAnn_svc(config, hlt2_annsvc_location, hlt2_annsvc_selid) + + dec_reports = HltDecReportsDecoder( + ANNSvc="HltANNSvc", + RawEventLocations=default_raw_event(bank_types=["HltDecReports"]), + SourceID=2, + outputs={ + "OutputHltDecReportsLocation": + force_location(os.path.join("/Event/", "Hlt2/DecReports")) + }) + + return dec_reports + + +def set_evt_filters(options, dec_reports): + """ + Set a prefilter for each code listed in evt_pre_filters options. + The type of filter is chosen automatically according to the code selection. + """ + from PyConf.Algorithms import LoKi__HDRFilter as Filter + filters = [] + code_filters = options.evt_pre_filters + for name, code in code_filters.items(): + if "Hlt" in code: + evt_filter = Filter( + name="EventPreFilter_%s" %name, + Code=code, + Location=dec_reports.OutputHltDecReportsLocation) + filters.append(evt_filter) + + return filters + + def get_hltAnn_dict(location): """ Extracts Hlt ANN dictionary from the given location. @@ -277,3 +306,5 @@ def set_hltAnn_svc(config, hlt2_annsvc_location, hlt2_annsvc_selid): for k, v in tck.items()}, Hlt2SelectionID={str(k): v for k, v in selid.items()})) + + diff --git a/Phys/DaVinci/python/DaVinci/options_default.py b/Phys/DaVinci/python/DaVinci/options_default.py index c51ee0cba..f3dd88d8e 100644 --- a/Phys/DaVinci/python/DaVinci/options_default.py +++ b/Phys/DaVinci/python/DaVinci/options_default.py @@ -77,7 +77,7 @@ __optsDict__ = { "evt_pre_filters": { "text": '"""Set of event filtering algorithms to be run before DaVinci initializaton sequence. Only events passing these filters will be processed."""', - "value": [] + "value": {} }, "evt_max": { "text": -- GitLab From 52d28cc2a5a97c46f7c1d145ab07805cbb188fd9 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sat, 18 Sep 2021 16:33:07 +0200 Subject: [PATCH 05/38] Removing some lines from test validation --- DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py b/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py index 3d436fc50..eb2a2898d 100755 --- a/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py +++ b/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py @@ -35,4 +35,6 @@ preprocessor = LHCbPreprocessor + \ LineSkipper(["DVControlFlowMgr INFO"]) + \ LineSkipper(["HLTControlFlowMgr INFO"]) + \ LineSkipper(["|-log_file ="]) + \ - LineSkipper([" Date: Sat, 18 Sep 2021 16:33:57 +0200 Subject: [PATCH 06/38] Updating other test references --- .../tests/refs/test_davinci_control_flow.ref | 3 +- .../refs/test_davinci_initialise_upgrade.ref | 1 + .../tests/refs/test_davinci_read_mc_digi.ref | 1 + .../tests/refs/test_davinci_read_mc_ldst.ref | 1 + .../tests/refs/test_davinci_read_mc_mdf.ref | 1 + .../tests/refs/test_davinci_read_mc_xdigi.ref | 1 + .../tests/refs/test_davinci_simplejob.ref | 1 + .../tests/refs/test_davinci_sprucing.ref | 30 ++++----- .../tests/refs/test_davinci_testfiledb.ref | 3 +- .../tests/refs/test_davinci_tupling.ref | 61 ++++++++++++++++--- .../tests/refs/test_davinci_user_algs.ref | 55 ++++++++++++++--- 11 files changed, 119 insertions(+), 39 deletions(-) diff --git a/DaVinciTests/tests/refs/test_davinci_control_flow.ref b/DaVinciTests/tests/refs/test_davinci_control_flow.ref index 53b79fc4b..c33bcb887 100644 --- a/DaVinciTests/tests/refs/test_davinci_control_flow.ref +++ b/DaVinciTests/tests/refs/test_davinci_control_flow.ref @@ -15,6 +15,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 150 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') |-hlt2_annsvc_location = '' (default: '') @@ -61,8 +62,6 @@ RootHistSvc INFO Writing ROOT histograms to: DVHistos HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully diff --git a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref index 545420554..d846049ab 100644 --- a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref +++ b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref @@ -15,6 +15,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 1000 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') |-hlt2_annsvc_location = '' (default: '') diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref index 2c4cfd4cf..91b4eef33 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref @@ -15,6 +15,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') |-hlt2_annsvc_location = '' (default: '') diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref index 44b4684a3..d7916319b 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref @@ -15,6 +15,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') |-hlt2_annsvc_location = '' (default: '') diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref index 04fde416f..c935944e6 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref @@ -15,6 +15,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') |-hlt2_annsvc_location = '' (default: '') diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref index c7a78439d..0914a87ee 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref @@ -15,6 +15,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') |-hlt2_annsvc_location = '' (default: '') diff --git a/DaVinciTests/tests/refs/test_davinci_simplejob.ref b/DaVinciTests/tests/refs/test_davinci_simplejob.ref index 2248c077f..9b91730cf 100644 --- a/DaVinciTests/tests/refs/test_davinci_simplejob.ref +++ b/DaVinciTests/tests/refs/test_davinci_simplejob.ref @@ -15,6 +15,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') |-hlt2_annsvc_location = '' (default: '') diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 0fdc7887b..6ecbbbd00 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -15,6 +15,7 @@ INFO User algorithm option_davinci_sprucing.main imported successfully! |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 3 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'sprucing_histos.root' (default: '') |-hlt2_annsvc_location = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/sprucert.all_lines.annsvc.pol.json' @@ -71,25 +72,8 @@ B0DsK_Tuple INFO Instatiating ThOr functors! FunctorFactory INFO Cache miss for functor: ::Functors::Composite::Mass{}, now trying cling with headers [Event/Particle.h, Functors/Composite.h] 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] -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Composite::Mass{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::TransverseMomentum{} B0DsK_Tuple INFO Finished initialisation: EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackMCParticle -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackMCVertex -HiveDataBrokerSvc WARNING non-reentrant algorithm: LHCb::Hlt::PackedData::Decoder/HltPackedDataDecoder -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackRecVertex/UnpackPVs -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackChargedProtos -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackNeutralProtos -HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackMuonPIDs -HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackRichPIDs -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackParticlesAndVertices -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 64 ApplicationMgr INFO Application Manager Started successfully @@ -121,8 +105,7 @@ B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" LAZY_AND: DaVinci #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| NONLAZY_OR: UserAnalysis #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| LAZY_AND: DVAnalysisNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| HltPackedDataDecoder/HltPackedDataDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| UnpackTrackFunctional/UnpackTracks #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| UnpackRecVertex/UnpackPVs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| @@ -135,6 +118,8 @@ LAZY_AND: DaVinci #=3 Sum=3 DataPacking__Unpack/UnpackMuonPIDs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| DataPacking__Unpack/UnpackRichPIDs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| UnpackParticlesAndVertices/UnpackParticlesAndVertices #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| HltDecReportsDecoder/HltDecReportsDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| LAZY_AND: DVAlgNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| LAZY_AND: FSRNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| @@ -142,6 +127,7 @@ LAZY_AND: DaVinci #=3 Sum=3 LAZY_AND: StandardAlgs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| GaudiHistoAlgorithm/SimpleHistos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| LAZY_AND: UserAlgorithms #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/B0DsK_Tuple_checkLocation #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| FunTupleBase_Particles/B0DsK_Tuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 @@ -150,6 +136,12 @@ NTupleSvc INFO NTuples saved successfully ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully +B0DsK_Tuple_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 3 | +ToolSvc.CoreFactory INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "# loaded from PYTHON" | 1 | ToolSvc.HybridFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# loaded from PYTHON" | 27 | diff --git a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref index a8d12872e..398a16962 100644 --- a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref +++ b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref @@ -15,6 +15,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'ExampleHistos.root' (default: '') |-hlt2_annsvc_location = '' (default: '') @@ -61,8 +62,6 @@ RootHistSvc INFO Writing ROOT histograms to: ExampleH HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index 5d977be87..7de1d758e 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -15,6 +15,7 @@ INFO User algorithm example-tupling-basic-run-mc.main imported successfully! |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DV-example-tupling-basic-his.root' (default: '') |-hlt2_annsvc_location = '' (default: '') @@ -73,16 +74,7 @@ DimuonsTuple INFO Instatiating LoKi functors! DimuonsTuple INFO Instatiating ThOr functors! 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] -FunctorFactory INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{} DimuonsTuple INFO Finished initialisation: -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackRecVertex/UnpackRecVertices -HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackMuonPIDs -HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackRichPIDs -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackNeutralProtos -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackChargedProtos -HiveDataBrokerSvc WARNING non-reentrant algorithm: CombineParticles ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -112,18 +104,30 @@ LAZY_AND: DaVinci #=10 Sum=3 LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| GaudiHistoAlgorithm/SimpleHistos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| LAZY_AND: UserAlgorithms #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| + LoKi__VoidFilter/UnpackRecVertices_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackRecVertex/UnpackRecVertices #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackCaloElectrons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackCaloHypo/UnpackCaloElectrons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackCaloPhotons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackCaloHypo/UnpackCaloPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackCaloMergedPi0s_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackCaloSplitPhotons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackMuonPIDs_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| DataPacking__Unpack/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackRichPIDs_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| DataPacking__Unpack/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackBestTracks_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackTrackFunctional/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackMuonTracks_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackTrackFunctional/UnpackMuonTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackNeutralProtos_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackProtoParticle/UnpackNeutralProtos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackChargedProtos_checkLocation #=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 )%| + LoKi__VoidFilter/DimuonsTuple_checkLocation #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| FunTupleBase_Particles/DimuonsTuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 @@ -145,12 +149,18 @@ 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_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 3 | FunctionalParticleMaker INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1106 | 1106 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 1667 | 1106 |( 66.34673 +- 1.157326)% | | "Nb created anti-particles" | 10 | 570 | 57.000 | 25.072 | 11.000 | 93.000 | | "Nb created particles" | 10 | 536 | 53.600 | 19.643 | 22.000 | 77.000 | +ToolSvc.CoreFactory INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "# loaded from PYTHON" | 12 | ToolSvc.HybridFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# loaded from PYTHON" | 11 | @@ -167,12 +177,45 @@ ToolSvc.TrackFunctorFactory INFO Number of counters : 1 UnpackBestTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 4332 | 433.20 | +UnpackBestTracks_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackCaloElectrons_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackCaloMergedPi0s_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackCaloPhotons_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackCaloSplitPhotons_checkLoca... INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackChargedProtos_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | UnpackMuonPIDs INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# UnPackedData" | 10 | 1088 | 108.80 | 43.990 | 33.000 | 159.00 | +UnpackMuonPIDs_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | UnpackMuonTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 156 | 15.600 | +UnpackMuonTracks_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackNeutralProtos_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackRecVertices_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackRichPIDs_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 | ID | Title | # | Mean | RMS | Skewness | Kurtosis | | 101 | "Exponential" | 10 | 1.4996 | 1.259 | 0.98706 | -0.35506 | diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index 40120d268..b9534e67d 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -15,6 +15,7 @@ INFO User algorithm option_davinci_user_algs.main imported successfully! |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) +|-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') |-hlt2_annsvc_location = '' (default: '') @@ -62,13 +63,6 @@ HistogramPersistencySvc INFO Added successfully Conversion servic FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' UnpackChargedProtos.ChargedProto... INFO Using retuned RICH el and mu DLL values in combined DLLs EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackRecVertex/UnpackRecVertices -HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackMuonPIDs -HiveDataBrokerSvc WARNING non-reentrant algorithm: DataPacking::Unpack/UnpackRichPIDs -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackNeutralProtos -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackChargedProtos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -92,30 +86,77 @@ LAZY_AND: DaVinci #=10 Sum=10 LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| GaudiHistoAlgorithm/SimpleHistos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackRecVertices_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackRecVertex/UnpackRecVertices #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackCaloElectrons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackCaloHypo/UnpackCaloElectrons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackCaloPhotons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackCaloHypo/UnpackCaloPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackCaloMergedPi0s_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackCaloSplitPhotons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackMuonPIDs_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| DataPacking__Unpack/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackRichPIDs_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| DataPacking__Unpack/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackBestTracks_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackTrackFunctional/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackMuonTracks_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackTrackFunctional/UnpackMuonTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackNeutralProtos_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackProtoParticle/UnpackNeutralProtos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__VoidFilter/UnpackChargedProtos_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| UnpackProtoParticle/UnpackChargedProtos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully +ToolSvc.CoreFactory INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "# loaded from PYTHON" | 11 | UnpackBestTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 4332 | 433.20 | +UnpackBestTracks_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackCaloElectrons_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackCaloMergedPi0s_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackCaloPhotons_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackCaloSplitPhotons_checkLoca... INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackChargedProtos_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | UnpackMuonPIDs INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# UnPackedData" | 10 | 1088 | 108.80 | 43.990 | 33.000 | 159.00 | +UnpackMuonPIDs_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | UnpackMuonTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 156 | 15.600 | +UnpackMuonTracks_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackNeutralProtos_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackRecVertices_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | +UnpackRichPIDs_checkLocation INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "#passed" | 10 | SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 | ID | Title | # | Mean | RMS | Skewness | Kurtosis | | 101 | "Exponential" | 10 | 1.4996 | 1.259 | 0.98706 | -0.35506 | -- GitLab From f39dcdeb9f2d32806d7e9ad8c8aba1c4f558b7da Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Sat, 18 Sep 2021 14:35:08 +0000 Subject: [PATCH 07/38] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/DaVinci/-/jobs/16358623 --- DaVinciTests/tests/options/option_davinci_filters.py | 1 + Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index 517dd1036..e23aa1c16 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -86,6 +86,7 @@ tuple_B0D0pipi = Funtuple( evt_filter = "HLT_PASS('Hlt2Topo2BodyLineDecision')" + def main(): from DaVinci import options options.evt_max = -1 diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index 9f59fdf5a..8bd13ae2c 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -44,7 +44,7 @@ def add_davinci_configurables(options): if options.enable_unpack: hlt_dec_reports = set_hlt_config(config, options) - + # Prepend the event per-filters defined by the user to all the unpacking algorithms if options.evt_pre_filters: dvMainFlow[dvAnaNode] += set_evt_filters(options, hlt_dec_reports) -- GitLab From e5259c4bd13bc99119ec895e699fafcb25eb5e68 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sat, 18 Sep 2021 17:32:17 +0200 Subject: [PATCH 08/38] Fixed linting --- DaVinciTests/tests/options/option_davinci_filters.py | 1 - Phys/DaVinci/python/DaVinci/algorithms.py | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index e23aa1c16..36741be97 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -15,7 +15,6 @@ from FunTuple import FunctorCollection from FunTuple import FunTuple_Particles as Funtuple from FunTuple.NewTupleTools import Kinematics from PyConf.application import make_data_with_FetchDataFromFile -from PyConf.Algorithms import LoKi__HDRFilter as Filter bd2dsk_line = make_data_with_FetchDataFromFile( "/Event/Spruce/SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line/Particles") diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index c384f60f8..de6592f0a 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -171,7 +171,7 @@ def setup_user_algorithms(userAlgPath): # Import the module containing the user algorithms try: - module = importlib.import_module(moduleName) + module = importlib.import_module(moduleName) # noqa: F841 except: raise DVOptionError( "user_algorithms", @@ -201,9 +201,8 @@ def unpack_locations(options): """ from GaudiConf import reading from PyConf.Algorithms import LHCb__UnpackRawEvent - from PyConf.application import default_raw_event#, make_data_with_FetchDataFromFile + from PyConf.application import default_raw_event - raw_event_format = get_option_value(options, "input_raw_format") stream_psandvs = get_option_value(options, "unpack_stream") stream = "%s/HLT2" % stream_psandvs @@ -306,5 +305,3 @@ def set_hltAnn_svc(config, hlt2_annsvc_location, hlt2_annsvc_selid): for k, v in tck.items()}, Hlt2SelectionID={str(k): v for k, v in selid.items()})) - - -- GitLab From 08a9bdd455e76782b94550073097ddd50284e079 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sun, 19 Sep 2021 10:58:25 +0200 Subject: [PATCH 09/38] fix small bug --- Phys/DaVinci/python/DaVinci/algorithms.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index de6592f0a..bcb7fdf37 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -71,22 +71,25 @@ def add_safe_filters(options, algs_dict): from PyConf.Algorithms import LoKi__VoidFilter as DValgFilter alg_filterd_dict = {} + location_list = [] for name, algs in algs_dict.items(): algs_list = [] - location_list = [] for alg in algs: try: alg.inputs except: algs_list += [alg] else: - for name_location, data_location in alg.inputs.items(): - location = alg.inputs[name_location].location - if location not in location_list: - algFilter_code = "EXISTS('%s')" %location - algFilter = DValgFilter(name="%s_checkLocation" %alg.name, Code=algFilter_code) - algs_list += [algFilter] - location_list.append(location) + for data_name, data_locations in alg.inputs.items(): + if not isinstance(data_locations, list): + data_locations = [data_locations] + for data in data_locations: + location = data.location + if location not in location_list: + algFilter_code = "EXISTS('%s')" %location + algFilter = DValgFilter(name="%s_checkLocation" %alg.name, Code=algFilter_code) + algs_list += [algFilter] + location_list.append(location) algs_list += [alg] alg_filterd_dict[name] = algs_list -- GitLab From 61e309cc896cf99a72ef627cebc933a48c8718b9 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Fri, 1 Oct 2021 10:07:34 +0200 Subject: [PATCH 10/38] adding filters based on spruced line decision --- .../example-tupling-advanced-run-mc.py | 19 ++- .../tests/refs/test_davinci_control_flow.ref | 41 +----- .../refs/test_davinci_initialise_upgrade.ref | 1 + .../tests/refs/test_davinci_read_mc_digi.ref | 1 + .../tests/refs/test_davinci_read_mc_ldst.ref | 1 + .../tests/refs/test_davinci_read_mc_mdf.ref | 1 + .../tests/refs/test_davinci_read_mc_xdigi.ref | 1 + .../tests/refs/test_davinci_simplejob.ref | 1 + .../tests/refs/test_davinci_sprucing.ref | 51 +------- .../tests/refs/test_davinci_testfiledb.ref | 41 +----- .../tests/refs/test_davinci_tupling.ref | 121 +++--------------- .../tests/refs/test_davinci_user_algs.ref | 113 +++------------- .../options/application-option-defaults.yaml | 3 + .../python/DaVinci/ConfigurationUpgrade.py | 41 ++---- Phys/DaVinci/python/DaVinci/algorithms.py | 90 ++++++++----- Phys/DaVinci/python/DaVinci/config.py | 11 +- .../DaVinci/python/DaVinci/options_default.py | 6 + 17 files changed, 155 insertions(+), 388 deletions(-) diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py index 163be169c..6e7f5ed3b 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py @@ -120,12 +120,23 @@ def main(): options.enable_unpack = False tools = [] - #Algorithms will be run following the insertion order. - #In this case, both "DiMuons" and "KShorts" need locations created by - #upfront_reconstruction() as input, so a "Reco" node is created on top. algs = { "Reco": upfront_reconstruction(), "DiMuons": [dimuons, tuple_dimuons], "KShorts": [kshorts, tuple_kshorts] } - return algs, tools + + #Algorithms will be run following the insertion order. + #In this case, both "DiMuons" and "KShorts" need locations created by + #upfront_reconstruction() as input, so a "Reco" node is created on top. + from PyConf.control_flow import CompositeNode, NodeLogic + node_dimuons = CompositeNode( + "DiMuons", children=algs["DiMuons"], combine_logic=NodeLogic.LAZY_AND) + node_kshorts = CompositeNode( + "KShorts", children=algs["KShorts"], combine_logic=NodeLogic.LAZY_AND) + node_tuples = CompositeNode( + "Tupling", children=[node_dimuons, node_kshorts], combine_logic=NodeLogic.NONLAZY_AND) + node = CompositeNode( + "Reco", children=algs["Reco"] + [node_tuples], combine_logic=NodeLogic.LAZY_AND) + + return {"UserAlgs": [node]}, tools diff --git a/DaVinciTests/tests/refs/test_davinci_control_flow.ref b/DaVinciTests/tests/refs/test_davinci_control_flow.ref index c33bcb887..64e69bf00 100644 --- a/DaVinciTests/tests/refs/test_davinci_control_flow.ref +++ b/DaVinciTests/tests/refs/test_davinci_control_flow.ref @@ -12,6 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 150 (default: -1) @@ -68,45 +69,13 @@ ApplicationMgr INFO Application Manager Started successf EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/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 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 -LAZY_AND: DaVinci #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAnalysisNode #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAlgNode #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: FSRNode #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: FileSummaryRecords #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 150 | 1.0544 | 0.96222 | 1.2397 | 1.1807 | - | 102 | "Breit" | 150 | -0.17526 | 1.1518 | -0.69906 | 2.2522 | - | 1111 | "Forced Numeric ID time test" | 150 | -0.077547 | 0.91944 | -0.29833 | -0.018186 | - | AutoID time test | "AutoID time test" | 150 | -0.077547 | 0.91944 | -0.29833 | -0.018186 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 150 | -0.077547 | 0.91944 | -0.29833 | -0.018186 | - | poisson | "Poisson" | 150 | 1.838 | 1.1606 | 0.39305 | -0.75933 | - | subdir1/bino | "Binominal" | 150 | 1.9732 | 1.0488 | 0.26648 | -0.57997 | - | subdir2/bino | "Binominal" | 150 | 1.9732 | 1.0488 | 0.26648 | -0.57997 | - | test1 | "Forced Alpha ID time test" | 150 | -0.077547 | 0.91944 | -0.29833 | -0.018186 | - | varBinning/x | "1D Variable Binning" | 150 | -0.0098433 | 2.7426 | -0.027901 | -1.0865 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 150 | -0.077547 | 0.91944 | -3.0691 | 9.4945 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 150 | -0.077547 | 0.91944 | -3.0691 | 9.4945 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 150 | 0.38454 | 5.7038 | 0 | -3 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 150 | 0.38454 | 5.7038 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 68 | 0.38536 | 5.5289 | -0.45136 | -0.94643 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 68 | 0.38536 | 5.5289 | -0.45136 | -0.94643 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 82 | 0.38385 | 5.8449 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 82 | 0.38385 | 5.8449 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 150 | -0.0098433 | 2.7426 | -4.458 | 50.149 | diff --git a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref index d846049ab..d17ede1cf 100644 --- a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref +++ b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref @@ -12,6 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 1000 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref index 91b4eef33..bcec1b6ed 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref @@ -12,6 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref index d7916319b..4907db0cd 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref @@ -12,6 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref index c935944e6..b63607976 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref @@ -12,6 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref index 0914a87ee..d9e347892 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref @@ -12,6 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_simplejob.ref b/DaVinciTests/tests/refs/test_davinci_simplejob.ref index 9b91730cf..e5f88810c 100644 --- a/DaVinciTests/tests/refs/test_davinci_simplejob.ref +++ b/DaVinciTests/tests/refs/test_davinci_simplejob.ref @@ -12,6 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 6ecbbbd00..2fb360bca 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -12,6 +12,7 @@ INFO User algorithm option_davinci_sprucing.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 3 (default: -1) @@ -81,11 +82,6 @@ EventPersistencySvc INFO Added successfully Conversion servic EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... -HltDecReportsDecoder WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! RFileCnv INFO opening Root file "sprucing_tuple.root" for writing RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 @@ -103,8 +99,11 @@ B0DsK_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Co B0DsK_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0DsK_Tuple" B0DsK_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} LAZY_AND: DaVinci #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: FileSummaryRecords #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| NONLAZY_OR: UserAnalysis #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAnalysisNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| LHCb__UnpackRawEvent/UnpackRawEvent #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| HltPackedDataDecoder/HltPackedDataDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| UnpackTrackFunctional/UnpackTracks #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| @@ -120,28 +119,13 @@ LAZY_AND: DaVinci #=3 Sum=3 UnpackParticlesAndVertices/UnpackParticlesAndVertices #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| UnpackMCParticle/UnpackMCParticle #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| UnpackMCVertex/UnpackMCVertex #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - HltDecReportsDecoder/HltDecReportsDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAlgNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: FSRNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/B0DsK_Tuple_checkLocation #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE NTupleSvc INFO NTuples saved successfully -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -B0DsK_Tuple_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 3 | -ToolSvc.CoreFactory INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 1 | ToolSvc.HybridFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# loaded from PYTHON" | 27 | @@ -155,26 +139,3 @@ UnpackParticlesAndVertices INFO Number of counters : 8 | "# UnPacked RichPIDs" | 3 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "# UnPacked Tracks" | 3 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "# UnPacked Vertices" | 3 | 54 | 18.000 | 11.776 | 2.0000 | 30.000 | -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 3 | 2.1152 | 1.5041 | 0.67348 | -1.5278 | - | 102 | "Breit" | 3 | 0.73861 | 0.099296 | 0.35049 | -1.8911 | - | 1111 | "Forced Numeric ID time test" | 3 | -0.01936 | 0.16936 | -0.48568 | -1.5107 | - | AutoID time test | "AutoID time test" | 3 | -0.01936 | 0.16936 | -0.48568 | -1.5107 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 3 | -0.01936 | 0.16936 | -0.48568 | -1.5107 | - | poisson | "Poisson" | 3 | 2 | 0.8165 | 0.18394 | -1.4775 | - | subdir1/bino | "Binominal" | 3 | 2.5 | 0.5 | 0.301 | -1.9399 | - | subdir2/bino | "Binominal" | 3 | 2.5 | 0.5 | 0.301 | -1.9399 | - | test1 | "Forced Alpha ID time test" | 3 | -0.01936 | 0.16936 | -0.48568 | -1.5107 | - | varBinning/x | "1D Variable Binning" | 3 | -0.74394 | 0.34987 | -3.0262 | 1.3773 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 3 | -0.01936 | 0.16936 | -1.1759 | -0.48202 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 3 | -0.01936 | 0.16936 | -1.1759 | -0.48202 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 3 | -3.4394 | 3.8226 | 0 | -3 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 3 | -3.4394 | 3.8226 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 2 | -0.74394 | 0.34987 | -0.39204 | -2.7131 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 2 | -0.74394 | 0.34987 | -0.39204 | -2.7131 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 1 | -8.8302 | 0 | 0 | 0 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 1 | -8.8302 | 0 | 0 | 0 | - | varBinning/a | "1D Profile Variable Binning" | 3 | -0.74394 | 0.34987 | -3.0262 | 1.3773 | diff --git a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref index 398a16962..114d2ddf5 100644 --- a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref +++ b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref @@ -12,6 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) @@ -68,45 +69,13 @@ ApplicationMgr INFO Application Manager Started successf EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/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 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 -LAZY_AND: DaVinci #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAnalysisNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAlgNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: FSRNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| +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 )%| ToolSvc INFO Removing all tools created by ToolSvc -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 10 | 1.4996 | 1.259 | 0.98706 | -0.35506 | - | 102 | "Breit" | 10 | 0.057899 | 1.2104 | -1.7162 | 1.96 | - | 1111 | "Forced Numeric ID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | AutoID time test | "AutoID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | poisson | "Poisson" | 10 | 1.3333 | 0.8165 | 0.72827 | -0.010819 | - | subdir1/bino | "Binominal" | 10 | 2.2222 | 1.3147 | -0.0065855 | -1.1662 | - | subdir2/bino | "Binominal" | 10 | 2.2222 | 1.3147 | -0.0065855 | -1.1662 | - | test1 | "Forced Alpha ID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | varBinning/x | "1D Variable Binning" | 10 | 0.74391 | 2.9037 | -0.54505 | -0.53568 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 10 | 0.62385 | 0.83435 | 0.078851 | -2.1359 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 10 | 0.62385 | 0.83435 | 0.078851 | -2.1359 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 10 | -2.7485 | 4.9549 | 1.8445 | -0.57073 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 10 | -2.7485 | 4.9549 | 1.8445 | -0.57073 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 7 | -0.10679 | 3.4013 | 0.032668 | 0.72593 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 7 | -0.10679 | 3.4013 | 0.032668 | 0.72593 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 3 | -8.9125 | 0.75156 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 3 | -8.9125 | 0.75156 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 10 | 0.74391 | 2.9037 | -1.4356 | 2.3329 | diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index 7de1d758e..58dacc038 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -12,6 +12,7 @@ INFO User algorithm example-tupling-basic-run-mc.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) @@ -81,10 +82,6 @@ ApplicationMgr INFO Application Manager Started successf EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/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 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! 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 RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory DV-example-tupling-basic-ntp.root:/DimuonsTuple @@ -95,45 +92,29 @@ UnpackRichPIDs SUCCESS #WARNINGS = 10 Message = 'I 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 )%| - NONLAZY_OR: UserAnalysis #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - LAZY_AND: DVAnalysisNode #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - LAZY_AND: DVAlgNode #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - LAZY_AND: FSRNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - LoKi__VoidFilter/UnpackRecVertices_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackRecVertices #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackCaloElectrons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackCaloPhotons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackCaloMergedPi0s_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackCaloSplitPhotons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackMuonPIDs_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackRichPIDs_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackBestTracks_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackMuonTracks_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackMuonTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackNeutralProtos_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackChargedProtos_checkLocation #=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 )%| - LoKi__VoidFilter/DimuonsTuple_checkLocation #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/DimuonsTuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| + 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 )%| + 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 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/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 )%| 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 NTupleSvc INFO NTuples saved successfully -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully CombineParticles INFO Number of counters : 11 @@ -149,18 +130,12 @@ 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_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 3 | FunctionalParticleMaker INFO Number of counters : 4 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | |*"# passed ProtoParticle filter" | 1106 | 1106 |( 100.0000 +- 0.000000)% | |*"# passed Track filter" | 1667 | 1106 |( 66.34673 +- 1.157326)% | | "Nb created anti-particles" | 10 | 570 | 57.000 | 25.072 | 11.000 | 93.000 | | "Nb created particles" | 10 | 536 | 53.600 | 19.643 | 22.000 | 77.000 | -ToolSvc.CoreFactory INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 12 | ToolSvc.HybridFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# loaded from PYTHON" | 11 | @@ -177,65 +152,9 @@ ToolSvc.TrackFunctorFactory INFO Number of counters : 1 UnpackBestTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 4332 | 433.20 | -UnpackBestTracks_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackCaloElectrons_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackCaloMergedPi0s_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackCaloPhotons_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackCaloSplitPhotons_checkLoca... INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackChargedProtos_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | UnpackMuonPIDs INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# UnPackedData" | 10 | 1088 | 108.80 | 43.990 | 33.000 | 159.00 | -UnpackMuonPIDs_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | UnpackMuonTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 156 | 15.600 | -UnpackMuonTracks_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackNeutralProtos_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackRecVertices_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackRichPIDs_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 10 | 1.4996 | 1.259 | 0.98706 | -0.35506 | - | 102 | "Breit" | 10 | 0.057899 | 1.2104 | -1.7162 | 1.96 | - | 1111 | "Forced Numeric ID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | AutoID time test | "AutoID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | poisson | "Poisson" | 10 | 1.3333 | 0.8165 | 0.72827 | -0.010819 | - | subdir1/bino | "Binominal" | 10 | 2.2222 | 1.3147 | -0.0065855 | -1.1662 | - | subdir2/bino | "Binominal" | 10 | 2.2222 | 1.3147 | -0.0065855 | -1.1662 | - | test1 | "Forced Alpha ID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | varBinning/x | "1D Variable Binning" | 10 | 0.74391 | 2.9037 | -0.54505 | -0.53568 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 10 | 0.62385 | 0.83435 | 0.078851 | -2.1359 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 10 | 0.62385 | 0.83435 | 0.078851 | -2.1359 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 10 | -2.7485 | 4.9549 | 1.8445 | -0.57073 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 10 | -2.7485 | 4.9549 | 1.8445 | -0.57073 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 7 | -0.10679 | 3.4013 | 0.032668 | 0.72593 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 7 | -0.10679 | 3.4013 | 0.032668 | 0.72593 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 3 | -8.9125 | 0.75156 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 3 | -8.9125 | 0.75156 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 10 | 0.74391 | 2.9037 | -1.4356 | 2.3329 | diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index b9534e67d..771486202 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -12,6 +12,7 @@ INFO User algorithm option_davinci_user_algs.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) @@ -69,114 +70,36 @@ ApplicationMgr INFO Application Manager Started successf EventPersistencySvc INFO Added successfully Conversion service:RootCnvSvc EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/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 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 UnpackRichPIDs SUCCESS #WARNINGS = 10 Message = 'Incorrect data version 0 for packing version > 3. Correcting data to version 2.' -LAZY_AND: DaVinci #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAnalysisNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAlgNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: FSRNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackRecVertices_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackRecVertices #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackCaloElectrons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackCaloPhotons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackCaloMergedPi0s_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackCaloSplitPhotons_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackMuonPIDs_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackRichPIDs_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackBestTracks_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackMuonTracks_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackMuonTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackNeutralProtos_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__VoidFilter/UnpackChargedProtos_checkLocation #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| +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=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 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/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 )%| ToolSvc INFO Removing all tools created by ToolSvc -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -ToolSvc.CoreFactory INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 11 | UnpackBestTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 4332 | 433.20 | -UnpackBestTracks_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackCaloElectrons_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackCaloMergedPi0s_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackCaloPhotons_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackCaloSplitPhotons_checkLoca... INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackChargedProtos_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | UnpackMuonPIDs INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# UnPackedData" | 10 | 1088 | 108.80 | 43.990 | 33.000 | 159.00 | -UnpackMuonPIDs_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | UnpackMuonTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 156 | 15.600 | -UnpackMuonTracks_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackNeutralProtos_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackRecVertices_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -UnpackRichPIDs_checkLocation INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 10 | -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 10 | 1.4996 | 1.259 | 0.98706 | -0.35506 | - | 102 | "Breit" | 10 | 0.057899 | 1.2104 | -1.7162 | 1.96 | - | 1111 | "Forced Numeric ID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | AutoID time test | "AutoID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | poisson | "Poisson" | 10 | 1.3333 | 0.8165 | 0.72827 | -0.010819 | - | subdir1/bino | "Binominal" | 10 | 2.2222 | 1.3147 | -0.0065855 | -1.1662 | - | subdir2/bino | "Binominal" | 10 | 2.2222 | 1.3147 | -0.0065855 | -1.1662 | - | test1 | "Forced Alpha ID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | varBinning/x | "1D Variable Binning" | 10 | 0.74391 | 2.9037 | -0.54505 | -0.53568 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 10 | 0.62385 | 0.83435 | 0.078851 | -2.1359 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 10 | 0.62385 | 0.83435 | 0.078851 | -2.1359 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 10 | -2.7485 | 4.9549 | 1.8445 | -0.57073 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 10 | -2.7485 | 4.9549 | 1.8445 | -0.57073 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 7 | -0.10679 | 3.4013 | 0.032668 | 0.72593 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 7 | -0.10679 | 3.4013 | 0.032668 | 0.72593 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 3 | -8.9125 | 0.75156 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 3 | -8.9125 | 0.75156 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 10 | 0.74391 | 2.9037 | -1.4356 | 2.3329 | diff --git a/Phys/DaVinci/options/application-option-defaults.yaml b/Phys/DaVinci/options/application-option-defaults.yaml index 4e284dd2c..ac894e962 100644 --- a/Phys/DaVinci/options/application-option-defaults.yaml +++ b/Phys/DaVinci/options/application-option-defaults.yaml @@ -41,6 +41,9 @@ detectors: dqflags_tag: text: '"""Tag for DQFLAGS. Default as set in DDDBConf for DataType."""' value: '' +enable_filters: + text: '"""Explicitly enable/disable filters on top of unpacking and tupling algorithms."""' + value: True enable_unpack: text: '"""Explicitly enable/disable unpacking for input data (if specified)"""' value: True diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index 8bd13ae2c..34358f247 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -17,7 +17,7 @@ from DaVinci.configOptions import (check_options, set_job_options, set_args_options, set_input_file_options) from DaVinci.algorithms import (setup_algorithms, define_fsr_writer, setup_user_algorithms, unpack_locations, - set_hlt_config, set_evt_filters) + set_hlt_config, apply_filters_and_unpacking) from DaVinci.config import davinci_control_flow, prepare_davinci_nodes @@ -33,44 +33,29 @@ def add_davinci_configurables(options): - ComponentConfig: Dict of configured Gaudi and DaVinci Configurable instances and user algorithms. """ dvMainFlow = {} - dvAnaNode = "DVAnalysisNode" + fsrAlgs = {} + filterAlgs = {} userAlgs, publicTools = setup_algorithms(options) - check_options(options) - config = configure_input(options) - dvMainFlow[dvAnaNode] = [] - - if options.enable_unpack: - hlt_dec_reports = set_hlt_config(config, options) - # Prepend the event per-filters defined by the user to all the unpacking algorithms - if options.evt_pre_filters: - dvMainFlow[dvAnaNode] += set_evt_filters(options, hlt_dec_reports) + hlt_dec_reports, spruce_dec_reports = set_hlt_config(config, options) + dvMainFlow.update(apply_filters_and_unpacking(options, userAlgs, hlt_dec_reports, spruce_dec_reports)) - dvMainFlow[dvAnaNode] += unpack_locations(options) - dvMainFlow[dvAnaNode] += [hlt_dec_reports] + if options.write_fsr: + if options.simulation: + fsrAlgs.update({"GenFSR": define_fsr_writer(options)}) - dvAlgs = {} - if options.simulation and options.write_fsr: - fsrAlgs = {"FSRNode": define_fsr_writer(options)} - dvAlgs.update(fsrAlgs) + if options.lumi: + fsrAlgs.update({"Lumi": [EventAccounting(name='EventAccount')]}) + # this should be modified to reflect LumiAlgsConf (configured separately?) - dvAlgs.update(userAlgs) - dvAlgs_nodes = prepare_davinci_nodes(dvAlgs) - dvAlgNode = CompositeNode( - 'DVAlgNode', - combine_logic=NodeLogic.LAZY_AND, - children=[dv_node.node for dv_node in dvAlgs_nodes], - force_order=True) - - dvMainFlow[dvAnaNode] += [dvAlgNode] dvMainNode = davinci_control_flow(options, - prepare_davinci_nodes(dvMainFlow)) + prepare_davinci_nodes(dvMainFlow), + prepare_davinci_nodes(fsrAlgs)) config.update(configure(options, dvMainNode, public_tools=publicTools)) - return config diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index bcb7fdf37..605e00dd5 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -40,14 +40,6 @@ def setup_algorithms(options): "INFO", "No MainOptions specified. DaVinci will import no options file!") - stdAlgs = [ - GaudiHistoAlgorithm( - name="SimpleHistos", - HistoPrint=True, - OutputLevel=get_option_value(options, "output_level")) - ] - dvAlgs["StandardAlgs"] = stdAlgs - userAlgName = get_option_value(options, 'user_algorithms') if not userAlgName: log_click( @@ -64,35 +56,48 @@ def setup_algorithms(options): return dvAlgs, publicTools -def add_safe_filters(options, algs_dict): +def add_filters(alg, spruce_dec_reports): """ - Adding void filter to all algorithms with an input location checking it exists in TES. + Adding HDR filter to FunTuple algorithms checking is the corresponding SpruceLine fired. """ - from PyConf.Algorithms import LoKi__VoidFilter as DValgFilter + algs_list = [] + try: + alg._alg_type + except: + pass + else: + if "FunTupleBase_Particles" in str(alg._alg_type): + for _, data in alg.inputs.items(): + location = data.location.split("/")[-2] + algFilter_code = "HLT_PASS('%sDecision')" %location + algFilter = Filter(name="%s_checkHltDecision" %alg.name, + Code=algFilter_code, + Location=spruce_dec_reports.OutputHltDecReportsLocation) + algs_list += [algFilter] + + return algs_list + +def apply_filters_and_unpacking(options, algs_dict, hlt_dec_reports, spruce_dec_reports): + """ + Adding filter and unpacking algorithms. + """ + from PyConf.Algorithms import LoKi__HDRFilter as Filter alg_filterd_dict = {} - location_list = [] for name, algs in algs_dict.items(): algs_list = [] + if options.evt_pre_filters: + algs_list += set_evt_filters(options, hlt_dec_reports, spruce_dec_reports) + for alg in algs: - try: - alg.inputs - except: - algs_list += [alg] - else: - for data_name, data_locations in alg.inputs.items(): - if not isinstance(data_locations, list): - data_locations = [data_locations] - for data in data_locations: - location = data.location - if location not in location_list: - algFilter_code = "EXISTS('%s')" %location - algFilter = DValgFilter(name="%s_checkLocation" %alg.name, Code=algFilter_code) - algs_list += [algFilter] - location_list.append(location) - algs_list += [alg] + if options.enable_filters: + algs_list += add_filters(alg, spruce_dec_reports) + if options.enable_unpack: + algs_list += unpack_locations(options) + algs_list += [alg] alg_filterd_dict[name] = algs_list + return alg_filterd_dict @@ -110,7 +115,7 @@ def define_fsr_writer(options): from PyConf.Algorithms import GenFSRMerge, RecordStream algs = [] - if get_option_value(options, "merge_genfsr"): + if options.merge_genfsr and options.simulation: mergeGenfsr = GenFSRMerge(name="GenFSRMerge") algs.append(mergeGenfsr) @@ -244,16 +249,25 @@ def set_hlt_config(config, options): dec_reports = HltDecReportsDecoder( ANNSvc="HltANNSvc", RawEventLocations=default_raw_event(bank_types=["HltDecReports"]), - SourceID=2, + SourceID='Hlt2', outputs={ "OutputHltDecReportsLocation": - force_location(os.path.join("/Event/", "Hlt2/DecReports")) + force_location("/Event/Hlt2/DecReports") }) - return dec_reports + spruce_dec_reports = HltDecReportsDecoder( + ANNSvc="HltANNSvc", + RawEventLocations=default_raw_event(bank_types=["SpruceDecReports"]), + SourceID="Spruce", + outputs={ + "OutputHltDecReportsLocation": + force_location("/Event/Spruce/DecReports") + }) + + return hlt_dec_reports, spruce_dec_reports -def set_evt_filters(options, dec_reports): +def set_evt_filters(options, hlt_dec_reports, spruce_dec_reports): """ Set a prefilter for each code listed in evt_pre_filters options. The type of filter is chosen automatically according to the code selection. @@ -266,9 +280,15 @@ def set_evt_filters(options, dec_reports): evt_filter = Filter( name="EventPreFilter_%s" %name, Code=code, - Location=dec_reports.OutputHltDecReportsLocation) + Location=hlt_dec_reports.OutputHltDecReportsLocation) filters.append(evt_filter) - + elif "Spruce" in code: + evt_filter = Filter( + name="EventPreFilter_%s" %name, + Code=code, + Location=spruce_dec_reports.OutputHltDecReportsLocation) + filters.append(evt_filter) + return filters diff --git a/Phys/DaVinci/python/DaVinci/config.py b/Phys/DaVinci/python/DaVinci/config.py index 66ff329ea..7e9a6302c 100644 --- a/Phys/DaVinci/python/DaVinci/config.py +++ b/Phys/DaVinci/python/DaVinci/config.py @@ -84,7 +84,7 @@ class DVNode(namedtuple('DVNode', ['node', 'extra_outputs'])): # noqa return self.output_producer is not None -def davinci_control_flow(options, user_analysis_nodes=[]): +def davinci_control_flow(options, user_analysis_nodes=[], fsr_nodes=[]): ''' DaVinci control flow is split in a few sections as described in DaVinci/issue#2 (then simplified) @@ -118,15 +118,10 @@ def davinci_control_flow(options, user_analysis_nodes=[]): ''' options.finalize() dv_top_children = [] - # Setup luminosity - lumi_nodes = [] - if options.lumi: - lumi_nodes += [ - DVNode('Lumi', [EventAccounting(name='EventAccount')]) - ] # this should be modified to reflect LumiAlgsConf (configured separately?) ordered_nodes = OrderedDict() - ordered_nodes['Luminosity'] = lumi_nodes + ordered_nodes['FileSummaryRecords'] = fsr_nodes ordered_nodes['UserAnalysis'] = user_analysis_nodes + for k, v in ordered_nodes.items(): if len(v): cnode = CompositeNode( diff --git a/Phys/DaVinci/python/DaVinci/options_default.py b/Phys/DaVinci/python/DaVinci/options_default.py index f3dd88d8e..01faeeeec 100644 --- a/Phys/DaVinci/python/DaVinci/options_default.py +++ b/Phys/DaVinci/python/DaVinci/options_default.py @@ -68,6 +68,12 @@ __optsDict__ = { '"""Tag for DQFLAGS. Default as set in DDDBConf for DataType."""', "value": '' }, + "enable_filters": { + "text": + '"""Explicitly enable/disable filters on top of unpacking and tupling algorithms."""', + "value": + True + }, "enable_unpack": { "text": '"""Explicitly enable/disable unpacking for input data (if specified)"""', -- GitLab From 8c3076a8bb6794293ae286bdb81a682907a548e7 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Fri, 1 Oct 2021 08:08:25 +0000 Subject: [PATCH 11/38] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/DaVinci/-/jobs/16635092 --- .../tupling/example-tupling-advanced-run-mc.py | 8 ++++++-- Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py index 6e7f5ed3b..28b476003 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py @@ -135,8 +135,12 @@ def main(): node_kshorts = CompositeNode( "KShorts", children=algs["KShorts"], combine_logic=NodeLogic.LAZY_AND) node_tuples = CompositeNode( - "Tupling", children=[node_dimuons, node_kshorts], combine_logic=NodeLogic.NONLAZY_AND) + "Tupling", + children=[node_dimuons, node_kshorts], + combine_logic=NodeLogic.NONLAZY_AND) node = CompositeNode( - "Reco", children=algs["Reco"] + [node_tuples], combine_logic=NodeLogic.LAZY_AND) + "Reco", + children=algs["Reco"] + [node_tuples], + combine_logic=NodeLogic.LAZY_AND) return {"UserAlgs": [node]}, tools diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index 34358f247..b22db9ae7 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -41,7 +41,9 @@ def add_davinci_configurables(options): config = configure_input(options) hlt_dec_reports, spruce_dec_reports = set_hlt_config(config, options) - dvMainFlow.update(apply_filters_and_unpacking(options, userAlgs, hlt_dec_reports, spruce_dec_reports)) + dvMainFlow.update( + apply_filters_and_unpacking(options, userAlgs, hlt_dec_reports, + spruce_dec_reports)) if options.write_fsr: if options.simulation: -- GitLab From e36403752e2aa4b5129bf73fe1df1d2e419e0ec3 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Fri, 1 Oct 2021 10:17:07 +0200 Subject: [PATCH 12/38] Fixed linting --- Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py | 7 +++---- Phys/DaVinci/python/DaVinci/algorithms.py | 9 +++------ Phys/DaVinci/python/DaVinci/config.py | 1 - 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index b22db9ae7..8b524b9be 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -12,12 +12,12 @@ High level configuration tools for DaVinci. """ from PyConf.application import ComponentConfig, configure, configure_input -from PyConf.control_flow import CompositeNode, NodeLogic +from PyConf.Algorithms import EventAccounting from DaVinci.configOptions import (check_options, set_job_options, set_args_options, set_input_file_options) from DaVinci.algorithms import (setup_algorithms, define_fsr_writer, - setup_user_algorithms, unpack_locations, - set_hlt_config, apply_filters_and_unpacking) + setup_user_algorithms, set_hlt_config, + apply_filters_and_unpacking) from DaVinci.config import davinci_control_flow, prepare_davinci_nodes @@ -34,7 +34,6 @@ def add_davinci_configurables(options): """ dvMainFlow = {} fsrAlgs = {} - filterAlgs = {} userAlgs, publicTools = setup_algorithms(options) check_options(options) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index 605e00dd5..3b45474ec 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -12,10 +12,11 @@ import os, sys, importlib, json, XRootD.client from GaudiKernel.ProcessJobOptions import importOptions from PyConf.components import setup_component +from PyConf.Algorithms import LoKi__HDRFilter as Filter from DaVinci.configOptions import get_option_value from DaVinci.optionChecker import DVOptionError, log_click - + def setup_algorithms(options): """ Set DaVinci algorithms. @@ -27,8 +28,6 @@ def setup_algorithms(options): - Dict of the algorithm instances to be run in the job. - List of public tool instances to configure. """ - from PyConf.Algorithms import GaudiHistoAlgorithm - opts = get_option_value(options, "main_options") publicTools = [] dvAlgs = {} @@ -82,7 +81,6 @@ def apply_filters_and_unpacking(options, algs_dict, hlt_dec_reports, spruce_dec_ """ Adding filter and unpacking algorithms. """ - from PyConf.Algorithms import LoKi__HDRFilter as Filter alg_filterd_dict = {} for name, algs in algs_dict.items(): algs_list = [] @@ -246,7 +244,7 @@ def set_hlt_config(config, options): set_hltAnn_svc(config, hlt2_annsvc_location, hlt2_annsvc_selid) - dec_reports = HltDecReportsDecoder( + hlt_dec_reports = HltDecReportsDecoder( ANNSvc="HltANNSvc", RawEventLocations=default_raw_event(bank_types=["HltDecReports"]), SourceID='Hlt2', @@ -272,7 +270,6 @@ def set_evt_filters(options, hlt_dec_reports, spruce_dec_reports): Set a prefilter for each code listed in evt_pre_filters options. The type of filter is chosen automatically according to the code selection. """ - from PyConf.Algorithms import LoKi__HDRFilter as Filter filters = [] code_filters = options.evt_pre_filters for name, code in code_filters.items(): diff --git a/Phys/DaVinci/python/DaVinci/config.py b/Phys/DaVinci/python/DaVinci/config.py index 7e9a6302c..309a279a7 100644 --- a/Phys/DaVinci/python/DaVinci/config.py +++ b/Phys/DaVinci/python/DaVinci/config.py @@ -17,7 +17,6 @@ from collections import namedtuple, OrderedDict from PyConf.application import configure_input, configure from PyConf.components import Algorithm from PyConf.control_flow import CompositeNode, NodeLogic -from PyConf.Algorithms import EventAccounting from DaVinci.application import DVAppOptions -- GitLab From e354675e40f2e67913dd3a8b373cab50ba1a638f Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Fri, 1 Oct 2021 08:17:56 +0000 Subject: [PATCH 13/38] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/DaVinci/-/jobs/16635294 --- Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index 8b524b9be..79922a254 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -16,7 +16,7 @@ from PyConf.Algorithms import EventAccounting from DaVinci.configOptions import (check_options, set_job_options, set_args_options, set_input_file_options) from DaVinci.algorithms import (setup_algorithms, define_fsr_writer, - setup_user_algorithms, set_hlt_config, + setup_user_algorithms, set_hlt_config, apply_filters_and_unpacking) from DaVinci.config import davinci_control_flow, prepare_davinci_nodes -- GitLab From 5d631808c75b8fee2c6222bd209b54e4cfb2122f Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Tue, 5 Oct 2021 10:58:13 +0200 Subject: [PATCH 14/38] updating codes to the latest Moore version --- .../tupling/example-tupling-basic-run-mc.yaml | 7 +- .../tests/options/option_davinci_filters.py | 32 ++- .../options/option_davinci_sprucing.yaml | 5 +- .../davinci.qms/test_davinci_filters.qmt | 4 +- .../davinci.qms/test_davinci_sprucing.qmt | 4 +- .../tests/refs/test_davinci_control_flow.ref | 3 +- .../tests/refs/test_davinci_filters.ref | 251 +++++++----------- .../refs/test_davinci_initialise_upgrade.ref | 3 +- .../tests/refs/test_davinci_read_mc_digi.ref | 3 +- .../tests/refs/test_davinci_read_mc_ldst.ref | 3 +- .../tests/refs/test_davinci_read_mc_mdf.ref | 3 +- .../tests/refs/test_davinci_read_mc_xdigi.ref | 3 +- .../tests/refs/test_davinci_simplejob.ref | 3 +- .../tests/refs/test_davinci_sprucing.ref | 112 +++++--- .../tests/refs/test_davinci_testfiledb.ref | 3 +- .../tests/refs/test_davinci_tupling.ref | 7 +- .../tests/refs/test_davinci_user_algs.ref | 3 +- Phys/DaVinci/options/DaVinciDB-Example.yaml | 14 +- .../options/application-option-defaults.yaml | 7 +- Phys/DaVinci/python/DaVinci/algorithms.py | 138 +++++++--- Phys/DaVinci/python/DaVinci/configOptions.py | 20 +- .../DaVinci/python/DaVinci/options_default.py | 10 +- 22 files changed, 341 insertions(+), 297 deletions(-) diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml index e565b8c00..addc382eb 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml @@ -9,10 +9,11 @@ # or submit itself to any jurisdiction. # ############################################################################### +enable_unpack: False +enable_filters: False evt_max: 10 -ntuple_file: 'DV-example-tupling-basic-ntp.root' histo_file: 'DV-example-tupling-basic-his.root' -unpack_stream: '/Event' -enable_unpack: False input_raw_format: 4.3 lumi: False +ntuple_file: 'DV-example-tupling-basic-ntp.root' +unpack_stream: '/Event/' diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index 36741be97..1db513ff4 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -18,8 +18,8 @@ from PyConf.application import make_data_with_FetchDataFromFile bd2dsk_line = make_data_with_FetchDataFromFile( "/Event/Spruce/SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line/Particles") -bd2d0pipi_line = make_data_with_FetchDataFromFile( - "/Event/Spruce/SpruceB2OC_BdToD0PiPi_D0ToHHHH_Line/Particles") +bd2dspi_line = make_data_with_FetchDataFromFile( + "/Event/Spruce/SpruceB2OC_BdToDsmPi_DsmToHHH_Line/Particles") branches_dsk = { 'B0': "[B0 -> D_s- K+]CC", @@ -27,11 +27,10 @@ branches_dsk = { 'Kp': "[B0 -> D_s- ^K+]CC" } -branches_d0pipi = { - 'B0': "[B0 -> D0 pi+ pi-]CC", - 'D0': "[B0 -> ^D0 pi+ pi-]CC", - 'pip': "[B0 -> D0 ^pi+ pi-]CC", - 'pim': "[B0 -> D0 pi+ ^pi-]CC" +branches_dspi = { + 'B0': "[B0 -> D_s- pi+]CC", + 'Ds': "[B0 -> ^D_s- pi+]CC", + 'pip': "[B0 -> D_s- ^pi+]CC", } variables = FunctorCollection({ @@ -57,12 +56,11 @@ variables_dsk = { 'Kp': variables_extra } -variables_d0pipi = { +variables_dspi = { 'ALL': variables_all, #adds variables to all branches 'B0': variables, - 'D0': variables_extra, + 'Ds': variables_extra, 'pip': variables_extra, - 'pim': variables_extra } loki_preamble = ['TRACK_MAX_PT = MAXTREE(ISBASIC & HASTRACK, PT, -1)'] @@ -75,24 +73,24 @@ tuple_B0DsK = Funtuple( loki_preamble=loki_preamble, inputs=bd2dsk_line) -tuple_B0D0pipi = Funtuple( - name="B0D0pipi_Tuple", +tuple_B0Dspi = Funtuple( + name="B0Dspi_Tuple", tree_name="DecayTree", - branches=branches_d0pipi, - variables=variables_d0pipi, + branches=branches_dspi, + variables=variables_dspi, loki_preamble=loki_preamble, - inputs=bd2d0pipi_line) + inputs=bd2dspi_line) evt_filter = "HLT_PASS('Hlt2Topo2BodyLineDecision')" - def main(): from DaVinci import options options.evt_max = -1 + options.hlt2_annsvc_config = "/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_example_realtime.tck.json" options.evt_pre_filters = {"HltLineFilter": evt_filter} options.output_level = 3 tools = [] - algs = {"B0DsK": [tuple_B0DsK], "B0D0pipi": [tuple_B0D0pipi]} + algs = {"B0DsK": [tuple_B0DsK], "B0Dspi": [tuple_B0Dspi]} return algs, tools diff --git a/DaVinciTests/tests/options/option_davinci_sprucing.yaml b/DaVinciTests/tests/options/option_davinci_sprucing.yaml index e08e285ca..de2c6931e 100644 --- a/DaVinciTests/tests/options/option_davinci_sprucing.yaml +++ b/DaVinciTests/tests/options/option_davinci_sprucing.yaml @@ -9,13 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### -evt_max: 3 +evt_max: 10 skip_events: 0 print_freq: 1 ntuple_file: 'sprucing_tuple.root' histo_file: 'sprucing_histos.root' input_raw_format: 0.3 lumi: false -hlt2_annsvc_location: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/sprucert.all_lines.annsvc.pol.json' -hlt2_annsvc_selid: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/00135282_00000001_1.annsvc.selid.json' +hlt2_annsvc_config: '/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_all_lines_realtime.tck.json' unpack_stream: '/Event/Spruce' diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt index 3c178752f..9012d68be 100644 --- a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt +++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt @@ -19,7 +19,7 @@ # Author: dfazzini # Purpose: Test for the new DaVinci configuration checking the correct processing of a spruced file # Prerequisites: None -# inputfiledb FEST_June_2021_dst ../../../Phys/DaVinci/options/DaVinciDB-Example.yaml +# inputfiledb FEST_October_2021_dst ../../../Phys/DaVinci/options/DaVinciDB-Example.yaml # joboptfile ../options/option_davinci_sprucing.yaml # user_algorithms ../options/option_davinci_sprucing:main ####################################################### @@ -29,7 +29,7 @@ run-mc --inputfiledb - FEST_June_2021_dst + FEST_October_2021_dst ../../../Phys/DaVinci/options/DaVinciDB-Example.yaml --joboptfile ../options/option_davinci_sprucing.yaml diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_sprucing.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_sprucing.qmt index 97f248b9c..538013b78 100644 --- a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_sprucing.qmt +++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_sprucing.qmt @@ -19,7 +19,7 @@ # Author: dfazzini # Purpose: Test for the new DaVinci configuration checking the correct processing of a spruced file # Prerequisites: None -# inputfiledb FEST_June_2021_dst ../../../Phys/DaVinci/options/DaVinciDB-Example.yaml +# inputfiledb FEST_October_2021_dst ../../../Phys/DaVinci/options/DaVinciDB-Example.yaml # joboptfile ../options/option_davinci_sprucing.yaml # user_algorithms ../options/option_davinci_sprucing:main ####################################################### @@ -29,7 +29,7 @@ run-mc --inputfiledb - FEST_June_2021_dst + FEST_October_2021_dst ../../../Phys/DaVinci/options/DaVinciDB-Example.yaml --joboptfile ../options/option_davinci_sprucing.yaml diff --git a/DaVinciTests/tests/refs/test_davinci_control_flow.ref b/DaVinciTests/tests/refs/test_davinci_control_flow.ref index 64e69bf00..41a232ea7 100644 --- a/DaVinciTests/tests/refs/test_davinci_control_flow.ref +++ b/DaVinciTests/tests/refs/test_davinci_control_flow.ref @@ -19,8 +19,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_filters.ref b/DaVinciTests/tests/refs/test_davinci_filters.ref index 4506482d5..43014ced8 100644 --- a/DaVinciTests/tests/refs/test_davinci_filters.ref +++ b/DaVinciTests/tests/refs/test_davinci_filters.ref @@ -4,26 +4,25 @@ INFO User algorithm option_davinci_filters.main imported successfully! |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) -|-conddb_tag = 'sim-20210505-vc-md100' (default: '') +|-conddb_tag = 'sim-20171127-vc-md100' (default: '') |-control_flow_file = '' (default: '') |-data_flow_file = '' (default: '') |-data_type = 'Upgrade' (default: '') -|-dddb_tag = 'dddb-20210218' (default: '') +|-dddb_tag = 'dddb-20171126' (default: '') |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') +|-enable_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = -1 (default: -1) |-evt_pre_filters = {'HltLineFilter': "HLT_PASS('Hlt2Topo2BodyLineDecision')"} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'sprucing_histos.root' (default: '') -|-hlt2_annsvc_location = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/sprucert.all_lines.annsvc.pol.json' -| (default: '') -|-hlt2_annsvc_selid = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/00135282_00000001_1.annsvc.selid.json' +|-hlt2_annsvc_config = '/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_example_realtime.tck.json' | (default: '') |-ignore_dq_flags = False (default: False) -|-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst'] +|-input_files = ['/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.dst'] | (default: []) |-input_raw_format = 0.3 (default: 0.3) |-input_type = 'ROOT' (default: 'DST') @@ -73,30 +72,37 @@ FunctorFactory INFO Cache miss for functor: ::Functors:: 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] B0DsK_Tuple INFO Finished initialisation: -B0D0pipi_Tuple INFO Initialising the FunTupleBase algorithm -B0D0pipi_Tuple INFO Conducting checks with LoKi -B0D0pipi_Tuple INFO Conducting checks with ThOr -B0D0pipi_Tuple INFO Setting the properties of ParticleTupleProp objects! -B0D0pipi_Tuple INFO Instatiating LoKi functors! -B0D0pipi_Tuple INFO Instatiating ThOr functors! -B0D0pipi_Tuple INFO Finished initialisation: +B0Dspi_Tuple INFO Initialising the FunTupleBase algorithm +B0Dspi_Tuple INFO Conducting checks with LoKi +B0Dspi_Tuple INFO Conducting checks with ThOr +B0Dspi_Tuple INFO Setting the properties of ParticleTupleProp objects! +B0Dspi_Tuple INFO Instatiating LoKi functors! +B0Dspi_Tuple INFO Instatiating ThOr functors! +B0Dspi_Tuple INFO Finished initialisation: EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 ApplicationMgr INFO Application Manager Initialized successfully -DeFTDetector INFO Current FT geometry version = 64 +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/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' +EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 HltDecReportsDecoder WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... +HltDecReportsDecoder#1 WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! RFileCnv INFO opening Root file "sprucing_tuple.root" for writing +RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0Dspi_Tuple +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 3. Record number within stream 1: 3 +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -104,11 +110,6 @@ EventSelector SUCCESS Reading Event record 4. Record numbe B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0D0pipi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0D0pipi_Tuple EventSelector SUCCESS Reading Event record 5. Record number within stream 1: 5 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -126,17 +127,29 @@ B0DsK_Tuple INFO Multiple particles match the decay d B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 9. Record number within stream 1: 9 +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 10. Record number within stream 1: 10 EventSelector SUCCESS Reading Event record 11. Record number within stream 1: 11 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 12. Record number within stream 1: 12 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 13. Record number within stream 1: 13 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 14. Record number within stream 1: 14 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 15. Record number within stream 1: 15 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -146,10 +159,10 @@ B0DsK_Tuple INFO Multiple particles match the decay d B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 17. Record number within stream 1: 17 -EventSelector SUCCESS Reading Event record 18. Record number within stream 1: 18 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 18. Record number within stream 1: 18 EventSelector SUCCESS Reading Event record 19. Record number within stream 1: 19 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -163,156 +176,94 @@ B0DsK_Tuple INFO Multiple particles match the decay d B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 22. Record number within stream 1: 22 -EventSelector SUCCESS Reading Event record 23. Record number within stream 1: 23 -EventSelector SUCCESS Reading Event record 24. Record number within stream 1: 24 -EventSelector SUCCESS Reading Event record 25. Record number within stream 1: 25 -EventSelector SUCCESS Reading Event record 26. Record number within stream 1: 26 -EventSelector SUCCESS Reading Event record 27. Record number within stream 1: 27 -EventSelector SUCCESS Reading Event record 28. Record number within stream 1: 28 -EventSelector SUCCESS Reading Event record 29. Record number within stream 1: 29 -EventSelector SUCCESS Reading Event record 30. Record number within stream 1: 30 -EventSelector SUCCESS Reading Event record 31. Record number within stream 1: 31 -EventSelector SUCCESS Reading Event record 32. Record number within stream 1: 32 -EventSelector SUCCESS Reading Event record 33. Record number within stream 1: 33 -EventSelector SUCCESS Reading Event record 34. Record number within stream 1: 34 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 35. Record number within stream 1: 35 -EventSelector SUCCESS Reading Event record 36. Record number within stream 1: 36 -EventSelector SUCCESS Reading Event record 37. Record number within stream 1: 37 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 38. Record number within stream 1: 38 -EventSelector SUCCESS Reading Event record 39. Record number within stream 1: 39 -EventSelector SUCCESS Reading Event record 40. Record number within stream 1: 40 -EventSelector SUCCESS Reading Event record 41. Record number within stream 1: 41 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 42. Record number within stream 1: 42 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 43. Record number within stream 1: 43 -EventSelector SUCCESS Reading Event record 44. Record number within stream 1: 44 -EventSelector SUCCESS Reading Event record 45. Record number within stream 1: 45 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 46. Record number within stream 1: 46 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 47. Record number within stream 1: 47 -EventSelector SUCCESS Reading Event record 48. Record number within stream 1: 48 -EventSelector SUCCESS Reading Event record 49. Record number within stream 1: 49 +EventSelector SUCCESS Reading Event record 23. Record number within stream 1: 23 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 50. Record number within stream 1: 50 -EventSelector SUCCESS Reading Event record 51. Record number within stream 1: 51 -EventSelector SUCCESS Reading Event record 52. Record number within stream 1: 52 -EventSelector SUCCESS Reading Event record 53. Record number within stream 1: 53 -EventSelector SUCCESS Reading Event record 54. Record number within stream 1: 54 -EventSelector SUCCESS Reading Event record 55. Record number within stream 1: 55 -EventSelector SUCCESS Reading Event record 56. Record number within stream 1: 56 +EventSelector SUCCESS Reading Event record 24. Record number within stream 1: 24 ApplicationMgr INFO Application Manager Stopped successfully 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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -B0D0pipi_Tuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections -B0D0pipi_Tuple SUCCESS List of booked N-Tuples in directory "FILE1/B0D0pipi_Tuple" -B0D0pipi_Tuple SUCCESS ID=DecayTree Title="DecayTree" #items=47 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -LAZY_AND: DaVinci #=56 Sum=1 Eff=|( 1.785714 +- 1.76970 )%| - NONLAZY_OR: UserAnalysis #=56 Sum=1 Eff=|( 1.785714 +- 1.76970 )%| - LAZY_AND: DVAnalysisNode #=56 Sum=1 Eff=|( 1.785714 +- 1.76970 )%| - LoKi__HDRFilter/EventPreFilter_HltLineFilter #=56 Sum=33 Eff=|( 58.92857 +- 6.57414 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - HltDecReportsDecoder/HltDecReportsDecoder #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAlgNode #=33 Sum=1 Eff=|( 3.030303 +- 2.98404 )%| - LAZY_AND: FSRNode #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=33 Sum=33 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: B0DsK #=33 Sum=28 Eff=|( 84.84848 +- 6.24156 )%| - LoKi__VoidFilter/B0DsK_Tuple_checkLocation #=33 Sum=28 Eff=|( 84.84848 +- 6.24156 )%| - FunTupleBase_Particles/B0DsK_Tuple #=28 Sum=28 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: B0D0pipi #=28 Sum=1 Eff=|( 3.571429 +- 3.50707 )%| - LoKi__VoidFilter/B0D0pipi_Tuple_checkLocation #=28 Sum=1 Eff=|( 3.571429 +- 3.50707 )%| - FunTupleBase_Particles/B0D0pipi_Tuple #=1 Sum=1 Eff=|( 100.0000 +- 0.00000 )%| +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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} +LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LoKi__HDRFilter/EventPreFilter_HltLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LoKi__HDRFilter/B0DsK_Tuple_checkHltDecision #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackMuonPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackRichPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| + LoKi__HDRFilter/EventPreFilter_HltLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LoKi__HDRFilter/B0Dspi_Tuple_checkHltDecision #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackMuonPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackRichPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE NTupleSvc INFO NTuples saved successfully -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -B0D0pipi_Tuple_checkLocation INFO Number of counters : 1 +B0DsK_Tuple_checkHltDecision INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 1 | -B0DsK_Tuple_checkLocation INFO Number of counters : 1 + |*"#passed" | 22 | 21 |( 95.45455 +- 4.440947)% | +B0Dspi_Tuple_checkHltDecision INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "#passed" | 28 | + |*"#passed" | 22 | 14 |( 63.63636 +- 10.25593)% | EventPreFilter_HltLineFilter INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"#passed" | 56 | 33 |( 58.92857 +- 6.574138)% | -ToolSvc.CoreFactory INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 2 | + |*"#passed" | 24 | 22 |( 91.66667 +- 5.641693)% | ToolSvc.HltFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 1 | + | "# loaded from PYTHON" | 3 | ToolSvc.HybridFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 62 | + | "# loaded from PYTHON" | 54 | UnpackParticlesAndVertices INFO Number of counters : 8 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# UnPacked FlavourTags" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked MuonPIDs" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Particles" | 33 | 1732 | 52.485 | 101.43 | 6.0000 | 470.00 | - | "# UnPacked ProtoParticles" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RecVertices" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RichPIDs" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Tracks" | 33 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Vertices" | 33 | 1356 | 41.091 | 93.944 | 2.0000 | 441.00 | -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 33 | 1.1477 | 1.0673 | 1.0159 | 0.29845 | - | 102 | "Breit" | 33 | -0.36001 | 1.0656 | -1.281 | 1.8023 | - | 1111 | "Forced Numeric ID time test" | 33 | 0.20408 | 0.97308 | -0.58699 | 0.83413 | - | AutoID time test | "AutoID time test" | 33 | 0.20408 | 0.97308 | -0.58699 | 0.83413 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 33 | 0.20408 | 0.97308 | -0.58699 | 0.83413 | - | poisson | "Poisson" | 33 | 1.5161 | 1.0738 | 0.567 | -0.60638 | - | subdir1/bino | "Binominal" | 33 | 1.875 | 1.1924 | 0.36778 | -0.71859 | - | subdir2/bino | "Binominal" | 33 | 1.875 | 1.1924 | 0.36778 | -0.71859 | - | test1 | "Forced Alpha ID time test" | 33 | 0.20408 | 0.97308 | -0.58699 | 0.83413 | - | varBinning/x | "1D Variable Binning" | 33 | -0.14425 | 2.7646 | -0.027661 | -1.1776 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 33 | 0.20408 | 0.97308 | -3.0786 | 9.4213 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 33 | 0.20408 | 0.97308 | -3.0786 | 9.4213 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 33 | -1.1133 | 5.4041 | -1.1909 | -3.9956 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 33 | -1.1133 | 5.4041 | -1.1909 | -3.9956 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 19 | -1.6848 | 4.9061 | 0.44674 | -1.2531 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 19 | -1.6848 | 4.9061 | 0.44674 | -1.2531 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 14 | -0.3378 | 5.9268 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 14 | -0.3378 | 5.9268 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 33 | -0.14425 | 2.7646 | 0.89544 | 3.9644 | + | "# UnPacked FlavourTags" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked MuonPIDs" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Particles" | 21 | 645 | 30.714 | 42.137 | 12.000 | 216.00 | + | "# UnPacked ProtoParticles" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RecVertices" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RichPIDs" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Tracks" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Vertices" | 21 | 428 | 20.381 | 37.571 | 6.0000 | 187.00 | diff --git a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref index d17ede1cf..427790707 100644 --- a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref +++ b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref @@ -19,8 +19,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref index bcec1b6ed..554468b60 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref @@ -19,8 +19,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_00.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_01.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_02.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_03.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_04.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_05.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_06.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_07.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_08.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_09.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_10.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_11.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_12.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_13.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_14.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_15.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_16.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_17.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_18.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_19.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_20.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_21.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_22.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_23.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_24.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_25.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_26.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_27.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_28.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_29.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_30.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_31.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_32.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_33.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_34.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_35.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_36.digi'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref index 4907db0cd..b2d164678 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref @@ -19,8 +19,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeMinbias/00069155_00000021_2.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref index b63607976..17bc09786 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref @@ -19,8 +19,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_1.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_12.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_13.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_14.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_17.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_2.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_20.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_21.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_22.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_23.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_24.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_25.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_27.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_29.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_3.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_32.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_36.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_37.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_39.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_4.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_40.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_42.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_43.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_46.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_47.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_49.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_52.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_53.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_54.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_55.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_58.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_60.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_61.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_62.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_66.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_68.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_70.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_73.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_74.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_76.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_78.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_79.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_80.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_82.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_83.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_86.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_87.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_9.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_91.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_94.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_96.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_97.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_98.mdf'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref index d9e347892..9edf4dd7b 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref @@ -19,8 +19,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000002_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000009_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000010_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000011_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000012_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000013_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000016_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000017_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000019_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000021_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000022_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000023_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000024_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000025_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000028_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000032_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000033_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000035_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000037_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000038_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000039_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000040_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000042_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000045_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000046_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000048_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000050_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000051_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000054_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000055_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000056_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000057_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000060_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000062_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000064_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000065_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000066_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000068_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000069_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000071_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000072_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000073_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000075_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000079_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000001_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000015_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000026_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000036_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000049_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000061_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000080_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000081_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000003_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000005_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000027_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000052_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000074_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000004_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000031_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000034_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000044_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000047_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000067_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000070_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000078_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000006_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000020_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000043_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000059_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000076_1.xdigi', 'root://hake12.grid.surfsara.nl:1094/pnfs/grid.sara.nl/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000007_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000008_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000018_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000029_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000041_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000058_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000077_1.xdigi', 'root://door02.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000030_1.xdigi', 'root://door03.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000053_1.xdigi', 'root://door07.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000082_1.xdigi', 'root://shark10.grid.surfsara.nl:1094/pnfs/grid.sara.nl/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000063_1.xdigi'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_simplejob.ref b/DaVinciTests/tests/refs/test_davinci_simplejob.ref index e5f88810c..3bc447c43 100644 --- a/DaVinciTests/tests/refs/test_davinci_simplejob.ref +++ b/DaVinciTests/tests/refs/test_davinci_simplejob.ref @@ -19,8 +19,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 2fb360bca..8b2fb008a 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -4,27 +4,25 @@ INFO User algorithm option_davinci_sprucing.main imported successfully! |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) -|-conddb_tag = 'sim-20210505-vc-md100' (default: '') +|-conddb_tag = 'sim-20171127-vc-md100' (default: '') |-control_flow_file = '' (default: '') |-data_flow_file = '' (default: '') |-data_type = 'Upgrade' (default: '') -|-dddb_tag = 'dddb-20210218' (default: '') +|-dddb_tag = 'dddb-20171126' (default: '') |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') |-enable_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') -|-evt_max = 3 (default: -1) +|-evt_max = 10 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'sprucing_histos.root' (default: '') -|-hlt2_annsvc_location = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/sprucert.all_lines.annsvc.pol.json' -| (default: '') -|-hlt2_annsvc_selid = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/00135282_00000001_1.annsvc.selid.json' +|-hlt2_annsvc_config = '/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_all_lines_realtime.tck.json' | (default: '') |-ignore_dq_flags = False (default: False) -|-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst'] +|-input_files = ['/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.dst'] | (default: []) |-input_raw_format = 0.3 (default: 0.3) |-input_type = 'ROOT' (default: 'DST') @@ -76,13 +74,17 @@ FunctorFactory INFO Cache miss for functor: ::Functors:: B0DsK_Tuple INFO Finished initialisation: EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 ApplicationMgr INFO Application Manager Initialized successfully -DeFTDetector INFO Current FT geometry version = 64 +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/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' +EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 +HltDecReportsDecoder#1 WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... RFileCnv INFO opening Root file "sprucing_tuple.root" for writing +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -92,50 +94,82 @@ EventSelector SUCCESS Reading Event record 3. Record numbe B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 4. Record number within stream 1: 4 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 5. Record number within stream 1: 5 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 6. Record number within stream 1: 6 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 7. Record number within stream 1: 7 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 8. Record number within stream 1: 8 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 9. Record number within stream 1: 9 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +EventSelector SUCCESS Reading Event record 10. Record number within stream 1: 10 ApplicationMgr INFO Application Manager Stopped successfully 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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -LAZY_AND: DaVinci #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: FileSummaryRecords #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=10 Sum=9 Eff=|( 90.00000 +- 9.48683 )%| + 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=9 Eff=|( 90.00000 +- 9.48683 )%| + LAZY_AND: UserAlgorithms #=10 Sum=9 Eff=|( 90.00000 +- 9.48683 )%| + LoKi__HDRFilter/B0DsK_Tuple_checkHltDecision #=10 Sum=9 Eff=|( 90.00000 +- 9.48683 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackMuonPIDs #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack/UnpackRichPIDs #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE NTupleSvc INFO NTuples saved successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully +B0DsK_Tuple_checkHltDecision INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + |*"#passed" | 10 | 9 |( 90.00000 +- 9.486833)% | +ToolSvc.HltFactory INFO Number of counters : 1 + | Counter | # | sum | mean/eff^* | rms/err^* | min | max | + | "# loaded from PYTHON" | 1 | ToolSvc.HybridFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# loaded from PYTHON" | 27 | UnpackParticlesAndVertices INFO Number of counters : 8 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# UnPacked FlavourTags" | 3 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked MuonPIDs" | 3 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Particles" | 3 | 89 | 29.667 | 17.327 | 6.0000 | 47.000 | - | "# UnPacked ProtoParticles" | 3 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RecVertices" | 3 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RichPIDs" | 3 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Tracks" | 3 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Vertices" | 3 | 54 | 18.000 | 11.776 | 2.0000 | 30.000 | + | "# UnPacked FlavourTags" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked MuonPIDs" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Particles" | 9 | 220 | 24.444 | 8.4078 | 12.000 | 44.000 | + | "# UnPacked ProtoParticles" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RecVertices" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RichPIDs" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Tracks" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Vertices" | 9 | 126 | 14.000 | 5.3541 | 6.0000 | 24.000 | diff --git a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref index 114d2ddf5..24fd4bcfe 100644 --- a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref +++ b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref @@ -19,8 +19,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'ExampleHistos.root' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index 58dacc038..37e2079c0 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -12,15 +12,14 @@ INFO User algorithm example-tupling-basic-run-mc.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_filters = False (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DV-example-tupling-basic-his.root' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) @@ -47,7 +46,7 @@ INFO User algorithm example-tupling-basic-run-mc.main imported successfully! |-simulation = True (default: False) |-skip_events = 0 (default: 0) |-tck = 0 (default: 0) -|-unpack_stream = '/Event' (default: '/Event/Spruce') +|-unpack_stream = '/Event/' (default: '/Event/Spruce') |-use_iosvc = False (default: False) |-user_algorithms = '../../../DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc:main' | (default: '') diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index 771486202..8a3a1f152 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -19,8 +19,7 @@ INFO User algorithm option_davinci_user_algs.main imported successfully! |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') -|-hlt2_annsvc_location = '' (default: '') -|-hlt2_annsvc_selid = '' (default: '') +|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/Phys/DaVinci/options/DaVinciDB-Example.yaml b/Phys/DaVinci/options/DaVinciDB-Example.yaml index 4a21f3295..341fec522 100644 --- a/Phys/DaVinci/options/DaVinciDB-Example.yaml +++ b/Phys/DaVinci/options/DaVinciDB-Example.yaml @@ -43,16 +43,16 @@ Upgrade_Bd2KstarMuMu_ldst: Date: '2020-05-28 11:12:55' Comment: 'K*mumu by Moore Hlt1-filtered with TCK-0x52000000' -FEST_June_2021_dst: +FEST_October_2021_dst: filenames: - - 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp1/JuneFEST/spruce_FEST_00135282_00000001_1.dst' + - '/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.dst' qualifiers: data_type: Upgrade input_type: DST simulation: true - conddb_tag: sim-20210505-vc-md100 - dddb_tag: dddb-20210218 + conddb_tag: sim-20171127-vc-md100 + dddb_tag: dddb-20171126 metadata: - Author: 'Nicole Skidmore' - Data: '2021-06' - Comment: "Minimum bias ntuples produced for FEST in June 2021" + Author: 'Davide Fazzini' + Data: '2021-10' + Comment: "Minimum bias ntuples produced for FEST in October 2021" diff --git a/Phys/DaVinci/options/application-option-defaults.yaml b/Phys/DaVinci/options/application-option-defaults.yaml index ac894e962..9648fca47 100644 --- a/Phys/DaVinci/options/application-option-defaults.yaml +++ b/Phys/DaVinci/options/application-option-defaults.yaml @@ -56,11 +56,8 @@ evt_max: histo_file: text: '"""Name of output histogram file. Default = ''."""' value: '' -hlt2_annsvc_location: - text: '"""Path to .json file containing HLT2 packed object locations generated by ANNSvc when the .dst input file was created."""' - value: '' -hlt2_annsvc_selid: - text: '"""Path to .json file containing HLT2 selections IDs generated by ANNSvc when the .dst input file was created."""' +hlt2_annsvc_config: + text: '"""Path to .json file containing HLT2 configuration generated by ANNSvc when the .dst input file was created."""' value: '' ignore_dq_flags: text: '"""If False, process only events with good DQ. Default = False."""' diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index 3b45474ec..e2397d2cc 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -12,7 +12,8 @@ import os, sys, importlib, json, XRootD.client from GaudiKernel.ProcessJobOptions import importOptions from PyConf.components import setup_component -from PyConf.Algorithms import LoKi__HDRFilter as Filter +from PyConf.Algorithms import (LoKi__HDRFilter as HDRFilter, + LoKi__VoidFilter as VoidFilter) from DaVinci.configOptions import get_option_value from DaVinci.optionChecker import DVOptionError, log_click @@ -58,6 +59,13 @@ def setup_algorithms(options): def add_filters(alg, spruce_dec_reports): """ Adding HDR filter to FunTuple algorithms checking is the corresponding SpruceLine fired. + + Args: + - alg: tupling algorithm of interest. + - spruce_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for spruced lines. + + Returns: + - A list of algorithms containing all the filters and the original algorithm. """ algs_list = [] try: @@ -69,7 +77,7 @@ def add_filters(alg, spruce_dec_reports): for _, data in alg.inputs.items(): location = data.location.split("/")[-2] algFilter_code = "HLT_PASS('%sDecision')" %location - algFilter = Filter(name="%s_checkHltDecision" %alg.name, + algFilter = HDRFilter(name="%s_checkHltDecision" %alg.name, Code=algFilter_code, Location=spruce_dec_reports.OutputHltDecReportsLocation) algs_list += [algFilter] @@ -80,6 +88,15 @@ def add_filters(alg, spruce_dec_reports): def apply_filters_and_unpacking(options, algs_dict, hlt_dec_reports, spruce_dec_reports): """ Adding filter and unpacking algorithms. + + Args: + - options: list of DaVinci options. + - algs_dict: dict of the user algorithms. + - hlt_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for hlt2 lines. + - spruce_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for spruced lines. + + Returns: + - Dict where at each node filters and unpacking algorithms are prepended to the initial list of user algorithms. """ alg_filterd_dict = {} for name, algs in algs_dict.items(): @@ -204,6 +221,13 @@ def setup_user_algorithms(userAlgPath): def unpack_locations(options): """ Configures algorithms for reading HLT2 output. Location are found using stream as prefix. + (TO BE REMOVED WHEN THE UNPACKING WILL BECOME FUNCTIONAL) + + Args: + - options: list of DaVinci options. + + Returns: + - List of unpacking algorithms. """ from GaudiConf import reading from PyConf.Algorithms import LHCb__UnpackRawEvent @@ -235,17 +259,23 @@ def unpack_locations(options): def set_hlt_config(config, options): """ Set the Hlt service and algorithms. + + Args: + - config: dict of configured Configurable instances. + - options: list of DaVinci options. + + Returns: + - HltDecReportsDecoder containing the HLT2 configuration for hlt2 lines. + - HltDecReportsDecoder containing the HLT2 configuration for spruced lines. """ from PyConf.Algorithms import HltDecReportsDecoder from PyConf.application import default_raw_event from PyConf.dataflow import force_location - hlt2_annsvc_location = get_option_value(options, "hlt2_annsvc_location") - hlt2_annsvc_selid = get_option_value(options, "hlt2_annsvc_selid") + hlt2_annsvc_config = get_option_value(options, "hlt2_annsvc_config") - set_hltAnn_svc(config, hlt2_annsvc_location, hlt2_annsvc_selid) + set_hltAnn_svc(config, hlt2_annsvc_config) hlt_dec_reports = HltDecReportsDecoder( - ANNSvc="HltANNSvc", RawEventLocations=default_raw_event(bank_types=["HltDecReports"]), SourceID='Hlt2', outputs={ @@ -254,8 +284,7 @@ def set_hlt_config(config, options): }) spruce_dec_reports = HltDecReportsDecoder( - ANNSvc="HltANNSvc", - RawEventLocations=default_raw_event(bank_types=["SpruceDecReports"]), + RawEventLocations=default_raw_event(bank_types=["HltDecReports"]), SourceID="Spruce", outputs={ "OutputHltDecReportsLocation": @@ -269,59 +298,98 @@ def set_evt_filters(options, hlt_dec_reports, spruce_dec_reports): """ Set a prefilter for each code listed in evt_pre_filters options. The type of filter is chosen automatically according to the code selection. + + Args: + - options: list of DaVinci options. + - hlt_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for hlt2 lines. + - spruce_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for spruced lines. + + Returns: + - List of event pre-filters to be added to the configuration. """ filters = [] code_filters = options.evt_pre_filters for name, code in code_filters.items(): if "Hlt" in code: - evt_filter = Filter( + evt_filter = HDRFilter( name="EventPreFilter_%s" %name, Code=code, Location=hlt_dec_reports.OutputHltDecReportsLocation) - filters.append(evt_filter) elif "Spruce" in code: - evt_filter = Filter( + evt_filter = HDRFilter( name="EventPreFilter_%s" %name, Code=code, Location=spruce_dec_reports.OutputHltDecReportsLocation) - filters.append(evt_filter) + else: + evt_filter = VoidFilter( + name="EventPreFilter_%s" %name, + Code=code) + filters.append(evt_filter) return filters -def get_hltAnn_dict(location): +def get_hltAnn_dict(hlt2_annsvc_config): """ Extracts Hlt ANN dictionary from the given location. + + Args: + - hlt2_annsvc_config: path to the .json file containing the HltAnnSvc configuration + + Returns: + - Dict with all the HLT2 locations. """ - hltDict = {} - if "root://eoslhcb.cern.ch//" in location: + tck = {} + if "root://eoslhcb.cern.ch//" in hlt2_annsvc_config: with XRootD.client.File() as f: status, _ = f.open(location) if not status.ok: - raise RuntimeError(f"could not open {location}: {status.message}") + raise RuntimeError(f"could not open {hlt2_annsvc_config}: {status.message}") status, data = f.read() if not status.ok: - raise RuntimeError(f"could not read {location}: {status.message}") - hltDict = json.loads(data.decode('utf-8')) - - elif location: - with open(os.path.expandvars(location)) as f: - hltDict = json.load(f) + raise RuntimeError(f"could not read {hlt2_annsvc_config}: {status.message}") + tck = json.loads(data.decode('utf-8')) + elif hlt2_annsvc_config: + with open(os.path.expandvars(hlt2_annsvc_config)) as f: + tck = json.load(f) - return hltDict + return tck -def set_hltAnn_svc(config, hlt2_annsvc_location, hlt2_annsvc_selid): +def set_hltAnn_svc(config, hlt2_annsvc_config): """ - Configures the Hlt ANN service to read correctly the spruced locations. + Configures the Hlt ANN service to read correctly the spruced locations using the HltAnnSvc + configuration of the HLT2 application. + + Args: + - config: dict of configured Configurable instances. + - hlt2_annsvc_config: path to the .json file containing the HltAnnSvc configuration. """ - tck = get_hltAnn_dict(hlt2_annsvc_location) - selid = get_hltAnn_dict(hlt2_annsvc_selid) - - config.add( - setup_component( - 'HltANNSvc', - PackedObjectLocations={str(k): v - for k, v in tck.items()}, - Hlt2SelectionID={str(k): v - for k, v in selid.items()})) + tck = get_hltAnn_dict(hlt2_annsvc_config) + if tck: + ann_config = tck["HltANNSvc/HltANNSvc"] + + hlt2_sel_ids = { + str(k): v + for k, v in ann_config["Hlt2SelectionID"].items() + } + spruce_sel_ids = { + str(k): v + for k, v in ann_config["SpruceSelectionID"].items() + } + packed_object_locs = { + str(k): v + for k, v in ann_config["PackedObjectLocations"].items() + } + + config.add( + setup_component( + "HltANNSvc", + Hlt2SelectionID=hlt2_sel_ids, + SpruceSelectionID=spruce_sel_ids, + PackedObjectLocations=packed_object_locs + ) + ) + else: + config.add(setup_component("HltANNSvc")) + diff --git a/Phys/DaVinci/python/DaVinci/configOptions.py b/Phys/DaVinci/python/DaVinci/configOptions.py index c347b938c..733e08107 100644 --- a/Phys/DaVinci/python/DaVinci/configOptions.py +++ b/Phys/DaVinci/python/DaVinci/configOptions.py @@ -20,6 +20,13 @@ from DaVinci.optionChecker import option_checker, log_click def get_option_value(options, name): """ Get option value for a given name. + + Args: + - options: list of DaVinci options. + - name: name of the option to be retrieved. + + Returns: + - Value of the option of interest. """ return options.getProp(name) @@ -27,6 +34,11 @@ def get_option_value(options, name): def set_option_value(options, name, value): """ Set option value for a given name. + + Args: + - options: list of DaVinci options. + - name: name of the option of interest. + - value: value to be set. """ options.setProp(name, value) @@ -40,7 +52,7 @@ def set_input_file_options(options, fileDB_key, fileDB_file): does, but the latter acts on a TestFileDB entry. Args: - - options: set of DV options. + - options: list of DaVinci options. - fileDB_key: key in the testfileDB. - fileDB_file: file containing the testfileDB. """ @@ -90,7 +102,7 @@ def set_job_options(options, jobOptFile, fileDB_key, fileDB_file): testfileDB, if yes it checks if the option is settable. Args: - - options: set of DV options. + - options: list of DaVinci options. - jobOptFile: file containing the job options chosen by the user. - fileDB_key: key in the testfileDB. - fileDB_file: file containing the testfileDB. @@ -124,7 +136,7 @@ def set_args_options(options, ctx_args, fileDB_key, fileDB_file): Set the extra arguments required by the user. Args: - - options: set of DV options. + - options: list of DaVinci options. - ctx_args: click context. - fileDB_key: key in the testfileDB. - fileDB_file: file containing the testfileDB. @@ -147,7 +159,7 @@ def is_option_settable(options, name, dataOptions): using the information found in the testfileDB. Args: - - options: set of DV options. + - options: list of DaVinci options. - name: name of the option to be checked. - dataOptions: list of options related to the input data. """ diff --git a/Phys/DaVinci/python/DaVinci/options_default.py b/Phys/DaVinci/python/DaVinci/options_default.py index 01faeeeec..c42bb99d7 100644 --- a/Phys/DaVinci/python/DaVinci/options_default.py +++ b/Phys/DaVinci/python/DaVinci/options_default.py @@ -96,15 +96,9 @@ __optsDict__ = { '."""', "value": '' }, - "hlt2_annsvc_location": { + "hlt2_annsvc_config": { "text": - '"""Path to .json file containing HLT2 packed object locations generated by ANNSvc when the .dst input file was created."""', - "value": - '' - }, - "hlt2_annsvc_selid": { - "text": - '"""Path to .json file containing HLT2 selections IDs generated by ANNSvc when the .dst input file was created."""', + '"""Path to .json file containing HLT2 configuration generated by ANNSvc when the .dst input file was created."""', "value": '' }, -- GitLab From ffdf30ce83a8769c349b09903783e2f07f4da0f9 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Tue, 5 Oct 2021 11:29:10 +0200 Subject: [PATCH 15/38] fixing path of spruced files --- DaVinciTests/tests/options/option_davinci_filters.py | 1 - DaVinciTests/tests/options/option_davinci_sprucing.yaml | 4 ++-- DaVinciTests/tests/refs/test_davinci_filters.ref | 6 +++--- DaVinciTests/tests/refs/test_davinci_sprucing.ref | 6 +++--- Phys/DaVinci/options/DaVinciDB-Example.yaml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index 1db513ff4..09c213a73 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -86,7 +86,6 @@ evt_filter = "HLT_PASS('Hlt2Topo2BodyLineDecision')" def main(): from DaVinci import options options.evt_max = -1 - options.hlt2_annsvc_config = "/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_example_realtime.tck.json" options.evt_pre_filters = {"HltLineFilter": evt_filter} options.output_level = 3 diff --git a/DaVinciTests/tests/options/option_davinci_sprucing.yaml b/DaVinciTests/tests/options/option_davinci_sprucing.yaml index de2c6931e..fad7ea07b 100644 --- a/DaVinciTests/tests/options/option_davinci_sprucing.yaml +++ b/DaVinciTests/tests/options/option_davinci_sprucing.yaml @@ -16,5 +16,5 @@ ntuple_file: 'sprucing_tuple.root' histo_file: 'sprucing_histos.root' input_raw_format: 0.3 lumi: false -hlt2_annsvc_config: '/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_all_lines_realtime.tck.json' -unpack_stream: '/Event/Spruce' +hlt2_annsvc_config: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtime.tck.json' +unpack_stream: '/Event/Spruce' \ No newline at end of file diff --git a/DaVinciTests/tests/refs/test_davinci_filters.ref b/DaVinciTests/tests/refs/test_davinci_filters.ref index 43014ced8..ab76aca92 100644 --- a/DaVinciTests/tests/refs/test_davinci_filters.ref +++ b/DaVinciTests/tests/refs/test_davinci_filters.ref @@ -19,10 +19,10 @@ INFO User algorithm option_davinci_filters.main imported successfully! |-evt_pre_filters = {'HltLineFilter': "HLT_PASS('Hlt2Topo2BodyLineDecision')"} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'sprucing_histos.root' (default: '') -|-hlt2_annsvc_config = '/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_example_realtime.tck.json' +|-hlt2_annsvc_config = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtime.tck.json' | (default: '') |-ignore_dq_flags = False (default: False) -|-input_files = ['/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.dst'] +|-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtimereco.dst'] | (default: []) |-input_raw_format = 0.3 (default: 0.3) |-input_type = 'ROOT' (default: 'DST') @@ -84,7 +84,7 @@ 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='/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.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/OctoberFEST/test_spruce_realtimereco.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 HltDecReportsDecoder WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... HltDecReportsDecoder#1 WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 8b2fb008a..393888cc5 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -19,10 +19,10 @@ INFO User algorithm option_davinci_sprucing.main imported successfully! |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'sprucing_histos.root' (default: '') -|-hlt2_annsvc_config = '/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_all_lines_realtime.tck.json' +|-hlt2_annsvc_config = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtime.tck.json' | (default: '') |-ignore_dq_flags = False (default: False) -|-input_files = ['/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.dst'] +|-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtimereco.dst'] | (default: []) |-input_raw_format = 0.3 (default: 0.3) |-input_type = 'ROOT' (default: 'DST') @@ -77,7 +77,7 @@ 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='/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.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/OctoberFEST/test_spruce_realtimereco.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 HltDecReportsDecoder#1 WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... diff --git a/Phys/DaVinci/options/DaVinciDB-Example.yaml b/Phys/DaVinci/options/DaVinciDB-Example.yaml index 341fec522..5027fcfcb 100644 --- a/Phys/DaVinci/options/DaVinciDB-Example.yaml +++ b/Phys/DaVinci/options/DaVinciDB-Example.yaml @@ -45,7 +45,7 @@ Upgrade_Bd2KstarMuMu_ldst: FEST_October_2021_dst: filenames: - - '/afs/cern.ch/work/d/dfazzini/temp/MooreDev_HEAD/spruce_realtimereco.dst' + - 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtimereco.dst' qualifiers: data_type: Upgrade input_type: DST -- GitLab From ae146b7fa76e910c1d1094f01c9174af156c1efd Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Tue, 5 Oct 2021 09:30:43 +0000 Subject: [PATCH 16/38] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/DaVinci/-/jobs/16709498 --- DaVinciTests/tests/options/option_davinci_filters.py | 1 + 1 file changed, 1 insertion(+) diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index 09c213a73..f9fea52e7 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -83,6 +83,7 @@ tuple_B0Dspi = Funtuple( evt_filter = "HLT_PASS('Hlt2Topo2BodyLineDecision')" + def main(): from DaVinci import options options.evt_max = -1 -- GitLab From bf646c57561b502244ab816e61a9e9a927997b90 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Tue, 5 Oct 2021 11:33:34 +0200 Subject: [PATCH 17/38] Fixed linting --- Phys/DaVinci/python/DaVinci/algorithms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index e2397d2cc..48960e5c3 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -342,7 +342,7 @@ def get_hltAnn_dict(hlt2_annsvc_config): tck = {} if "root://eoslhcb.cern.ch//" in hlt2_annsvc_config: with XRootD.client.File() as f: - status, _ = f.open(location) + status, _ = f.open(hlt2_annsvc_config) if not status.ok: raise RuntimeError(f"could not open {hlt2_annsvc_config}: {status.message}") status, data = f.read() -- GitLab From 0e992f69381ff52cb9bddff488be8531f929e495 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Tue, 5 Oct 2021 19:30:36 +0200 Subject: [PATCH 18/38] small changes --- .../tupling/example-tupling-advanced-run-mc.py | 1 + DaVinciTests/tests/refs/test_davinci_filters.ref | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py index 28b476003..4455453f9 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py @@ -112,6 +112,7 @@ tuple_kshorts = Funtuple( def main(): from DaVinci import options + options.enable_filters = False options.evt_max = 10 options.ntuple_file = 'DV-example-tupling-advanced-ntp.root' options.histo_file = 'DV-example-tupling-advanced-his.root' diff --git a/DaVinciTests/tests/refs/test_davinci_filters.ref b/DaVinciTests/tests/refs/test_davinci_filters.ref index ab76aca92..39f2ea305 100644 --- a/DaVinciTests/tests/refs/test_davinci_filters.ref +++ b/DaVinciTests/tests/refs/test_davinci_filters.ref @@ -90,22 +90,22 @@ HltDecReportsDecoder WARNING TCK obtained from rawbank seems to b HltDecReportsDecoder#1 WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... RFileCnv INFO opening Root file "sprucing_tuple.root" for writing -RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0Dspi_Tuple B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple +RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0Dspi_Tuple EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 3. Record number within stream 1: 3 -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 4. Record number within stream 1: 4 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -127,12 +127,12 @@ B0DsK_Tuple INFO Multiple particles match the decay d B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 9. Record number within stream 1: 9 -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 10. Record number within stream 1: 10 EventSelector SUCCESS Reading Event record 11. Record number within stream 1: 11 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -- GitLab From af4d320a07fe65c6eff9da78c18527c87be77c28 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Wed, 6 Oct 2021 13:37:01 +0200 Subject: [PATCH 19/38] small changes --- .../tests/refs/test_davinci_control_flow.ref | 11 ++++-- .../tests/refs/test_davinci_filters.ref | 16 ++++---- .../tests/refs/test_davinci_read_mc_digi.ref | 37 ++----------------- .../tests/refs/test_davinci_read_mc_ldst.ref | 37 ++----------------- .../tests/refs/test_davinci_read_mc_mdf.ref | 37 ++----------------- .../tests/refs/test_davinci_read_mc_xdigi.ref | 37 ++----------------- .../tests/refs/test_davinci_simplejob.ref | 37 ++----------------- .../tests/refs/test_davinci_testfiledb.ref | 11 ++++-- Phys/DaVinci/python/DaVinci/algorithms.py | 14 ++++--- 9 files changed, 51 insertions(+), 186 deletions(-) diff --git a/DaVinciTests/tests/refs/test_davinci_control_flow.ref b/DaVinciTests/tests/refs/test_davinci_control_flow.ref index 41a232ea7..b3e241a2e 100644 --- a/DaVinciTests/tests/refs/test_davinci_control_flow.ref +++ b/DaVinciTests/tests/refs/test_davinci_control_flow.ref @@ -71,10 +71,13 @@ EventSelector SUCCESS Reading Event record 1. Record numbe ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 -LAZY_AND: DaVinci #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: FileSummaryRecords #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: FileSummaryRecords #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=150 Sum=150 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully diff --git a/DaVinciTests/tests/refs/test_davinci_filters.ref b/DaVinciTests/tests/refs/test_davinci_filters.ref index 39f2ea305..cf5581e7a 100644 --- a/DaVinciTests/tests/refs/test_davinci_filters.ref +++ b/DaVinciTests/tests/refs/test_davinci_filters.ref @@ -1,4 +1,4 @@ -INFO No MainOptions specified. DaVinci() will import no options file! +INFO No MainOptions specified. DaVinci will import no options file! INFO User algorithm option_davinci_filters.main imported successfully! /***** User DVAppOptions/DVAppOptions ************************************************************** |-auditors = [] (default: []) @@ -90,22 +90,22 @@ HltDecReportsDecoder WARNING TCK obtained from rawbank seems to b HltDecReportsDecoder#1 WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... RFileCnv INFO opening Root file "sprucing_tuple.root" for writing +RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0Dspi_Tuple B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple -RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0Dspi_Tuple EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 3. Record number within stream 1: 3 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 4. Record number within stream 1: 4 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -127,12 +127,12 @@ B0DsK_Tuple INFO Multiple particles match the decay d B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 9. Record number within stream 1: 9 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 10. Record number within stream 1: 10 EventSelector SUCCESS Reading Event record 11. Record number within stream 1: 11 B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref index 554468b60..a2f1b01ec 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref @@ -58,46 +58,17 @@ ApplicationMgr INFO Application Manager Configured successfully DetectorPersistencySvc INFO Added successfully Conversion service:XmlCnvSvc DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos 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/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_00.digi' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! ApplicationMgr INFO Application Manager Stopped successfully -LAZY_AND: DaVinci #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 200 | 1.0375 | 0.98812 | 1.2984 | 1.1493 | - | 102 | "Breit" | 200 | -0.13288 | 1.1554 | -0.63297 | 2.5528 | - | 1111 | "Forced Numeric ID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | AutoID time test | "AutoID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | poisson | "Poisson" | 200 | 1.8125 | 1.1394 | 0.39748 | -0.69255 | - | subdir1/bino | "Binominal" | 200 | 1.9442 | 1.0625 | 0.25254 | -0.63664 | - | subdir2/bino | "Binominal" | 200 | 1.9442 | 1.0625 | 0.25254 | -0.63664 | - | test1 | "Forced Alpha ID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | varBinning/x | "1D Variable Binning" | 200 | -0.065339 | 2.8519 | -0.016208 | -1.1729 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 200 | -0.093324 | 0.96907 | -1.6998 | 5.1535 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 200 | -0.093324 | 0.96907 | -1.6998 | 5.1535 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 200 | 0.22419 | 5.6605 | 0 | -3 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 200 | 0.22419 | 5.6605 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 92 | 0.25743 | 5.4893 | -0.22985 | -0.952 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 92 | 0.25743 | 5.4893 | -0.22985 | -0.952 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 108 | 0.19587 | 5.8022 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 108 | 0.19587 | 5.8022 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 200 | -0.065339 | 2.8519 | 0 | -3 | diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref index b2d164678..052b42d26 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref @@ -58,46 +58,17 @@ ApplicationMgr INFO Application Manager Configured successfully DetectorPersistencySvc INFO Added successfully Conversion service:XmlCnvSvc DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos 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/wg/HLT/UpgradeMinbias/00069155_00000021_2.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! ApplicationMgr INFO Application Manager Stopped successfully -LAZY_AND: DaVinci #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 200 | 1.0375 | 0.98812 | 1.2984 | 1.1493 | - | 102 | "Breit" | 200 | -0.13288 | 1.1554 | -0.63297 | 2.5528 | - | 1111 | "Forced Numeric ID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | AutoID time test | "AutoID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | poisson | "Poisson" | 200 | 1.8125 | 1.1394 | 0.39748 | -0.69255 | - | subdir1/bino | "Binominal" | 200 | 1.9442 | 1.0625 | 0.25254 | -0.63664 | - | subdir2/bino | "Binominal" | 200 | 1.9442 | 1.0625 | 0.25254 | -0.63664 | - | test1 | "Forced Alpha ID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | varBinning/x | "1D Variable Binning" | 200 | -0.065339 | 2.8519 | -0.016208 | -1.1729 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 200 | -0.093324 | 0.96907 | -1.6998 | 5.1535 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 200 | -0.093324 | 0.96907 | -1.6998 | 5.1535 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 200 | 0.22419 | 5.6605 | 0 | -3 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 200 | 0.22419 | 5.6605 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 92 | 0.25743 | 5.4893 | -0.22985 | -0.952 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 92 | 0.25743 | 5.4893 | -0.22985 | -0.952 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 108 | 0.19587 | 5.8022 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 108 | 0.19587 | 5.8022 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 200 | -0.065339 | 2.8519 | 0 | -3 | diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref index 17bc09786..04bd756c0 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref @@ -58,46 +58,17 @@ ApplicationMgr INFO Application Manager Configured successfully DetectorPersistencySvc INFO Added successfully Conversion service:XmlCnvSvc DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 62 ApplicationMgr INFO Application Manager Started successfully EventSelector INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_1.mdf' SVC='LHCb::MDFSelector' OPT='READ' IgnoreChecksum='YES' EventSelector.DataStreamTool_1 INFO Compression:0 Checksum:1 EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! ApplicationMgr INFO Application Manager Stopped successfully -LAZY_AND: DaVinci #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 200 | 1.0375 | 0.98812 | 1.2984 | 1.1493 | - | 102 | "Breit" | 200 | -0.13288 | 1.1554 | -0.63297 | 2.5528 | - | 1111 | "Forced Numeric ID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | AutoID time test | "AutoID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | poisson | "Poisson" | 200 | 1.8125 | 1.1394 | 0.39748 | -0.69255 | - | subdir1/bino | "Binominal" | 200 | 1.9442 | 1.0625 | 0.25254 | -0.63664 | - | subdir2/bino | "Binominal" | 200 | 1.9442 | 1.0625 | 0.25254 | -0.63664 | - | test1 | "Forced Alpha ID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | varBinning/x | "1D Variable Binning" | 200 | -0.065339 | 2.8519 | -0.016208 | -1.1729 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 200 | -0.093324 | 0.96907 | -1.6998 | 5.1535 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 200 | -0.093324 | 0.96907 | -1.6998 | 5.1535 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 200 | 0.22419 | 5.6605 | 0 | -3 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 200 | 0.22419 | 5.6605 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 92 | 0.25743 | 5.4893 | -0.22985 | -0.952 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 92 | 0.25743 | 5.4893 | -0.22985 | -0.952 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 108 | 0.19587 | 5.8022 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 108 | 0.19587 | 5.8022 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 200 | -0.065339 | 2.8519 | 0 | -3 | diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref index 9edf4dd7b..14054f614 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref @@ -58,46 +58,17 @@ ApplicationMgr INFO Application Manager Configured successfully DetectorPersistencySvc INFO Added successfully Conversion service:XmlCnvSvc DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully 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/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000002_1.xdigi' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! ApplicationMgr INFO Application Manager Stopped successfully -LAZY_AND: DaVinci #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=200 Sum=200 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 200 | 1.0375 | 0.98812 | 1.2984 | 1.1493 | - | 102 | "Breit" | 200 | -0.13288 | 1.1554 | -0.63297 | 2.5528 | - | 1111 | "Forced Numeric ID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | AutoID time test | "AutoID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | poisson | "Poisson" | 200 | 1.8125 | 1.1394 | 0.39748 | -0.69255 | - | subdir1/bino | "Binominal" | 200 | 1.9442 | 1.0625 | 0.25254 | -0.63664 | - | subdir2/bino | "Binominal" | 200 | 1.9442 | 1.0625 | 0.25254 | -0.63664 | - | test1 | "Forced Alpha ID time test" | 200 | -0.093324 | 0.96907 | -0.27771 | -0.15602 | - | varBinning/x | "1D Variable Binning" | 200 | -0.065339 | 2.8519 | -0.016208 | -1.1729 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 200 | -0.093324 | 0.96907 | -1.6998 | 5.1535 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 200 | -0.093324 | 0.96907 | -1.6998 | 5.1535 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 200 | 0.22419 | 5.6605 | 0 | -3 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 200 | 0.22419 | 5.6605 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 92 | 0.25743 | 5.4893 | -0.22985 | -0.952 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 92 | 0.25743 | 5.4893 | -0.22985 | -0.952 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 108 | 0.19587 | 5.8022 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 108 | 0.19587 | 5.8022 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 200 | -0.065339 | 2.8519 | 0 | -3 | diff --git a/DaVinciTests/tests/refs/test_davinci_simplejob.ref b/DaVinciTests/tests/refs/test_davinci_simplejob.ref index 3bc447c43..d485220ab 100644 --- a/DaVinciTests/tests/refs/test_davinci_simplejob.ref +++ b/DaVinciTests/tests/refs/test_davinci_simplejob.ref @@ -58,46 +58,17 @@ ApplicationMgr INFO Application Manager Configured successfully DetectorPersistencySvc INFO Added successfully Conversion service:XmlCnvSvc DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos 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/grid/prod/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 -RndmGenSvc.Engine INFO Generator engine type:CLHEP::RanluxEngine -RndmGenSvc.Engine INFO Current Seed:1234567 Luxury:3 -RndmGenSvc INFO Using Random engine:HepRndm::Engine -SimpleHistos INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient ! ApplicationMgr INFO Application Manager Stopped successfully -LAZY_AND: DaVinci #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -SimpleHistos SUCCESS 1D histograms in directory "SimpleHistos" : 10 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | 101 | "Exponential" | 10 | 1.4996 | 1.259 | 0.98706 | -0.35506 | - | 102 | "Breit" | 10 | 0.057899 | 1.2104 | -1.7162 | 1.96 | - | 1111 | "Forced Numeric ID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | AutoID time test | "AutoID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | Gaussian mean=0, sigma=1 | "Gaussian mean=0, sigma=1" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | poisson | "Poisson" | 10 | 1.3333 | 0.8165 | 0.72827 | -0.010819 | - | subdir1/bino | "Binominal" | 10 | 2.2222 | 1.3147 | -0.0065855 | -1.1662 | - | subdir2/bino | "Binominal" | 10 | 2.2222 | 1.3147 | -0.0065855 | -1.1662 | - | test1 | "Forced Alpha ID time test" | 10 | 0.62385 | 0.83435 | 0.29994 | -1.437 | - | varBinning/x | "1D Variable Binning" | 10 | 0.74391 | 2.9037 | -0.54505 | -0.53568 | -SimpleHistos SUCCESS 1D profile histograms in directory "SimpleHistos" : 9 - | ID | Title | # | Mean | RMS | Skewness | Kurtosis | - | Expo V Gauss 1DProf | "Expo V Gauss 1DProf" | 10 | 0.62385 | 0.83435 | 0.078851 | -2.1359 | - | Expo V Gauss 1DProf s | "Expo V Gauss 1DProf s" | 10 | 0.62385 | 0.83435 | 0.078851 | -2.1359 | - | Gauss V Flat 1DProf | "Gauss V Flat 1DProf" | 10 | -2.7485 | 4.9549 | 1.8445 | -0.57073 | - | Gauss V Flat 1DProf S | "Gauss V Flat 1DProf S" | 10 | -2.7485 | 4.9549 | 1.8445 | -0.57073 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I" | 7 | -0.10679 | 3.4013 | 0.032668 | 0.72593 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I s" | 7 | -0.10679 | 3.4013 | 0.032668 | 0.72593 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II" | 3 | -8.9125 | 0.75156 | 0 | -3 | - | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s" | 3 | -8.9125 | 0.75156 | 0 | -3 | - | varBinning/a | "1D Profile Variable Binning" | 10 | 0.74391 | 2.9037 | -1.4356 | 2.3329 | diff --git a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref index 24fd4bcfe..e12261d10 100644 --- a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref +++ b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref @@ -71,10 +71,13 @@ EventSelector SUCCESS Reading Event record 1. Record numbe ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 -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 )%| +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=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index 48960e5c3..44369fcff 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -53,6 +53,12 @@ def setup_algorithms(options): userAlgs = {"UserAlgorithms": userAlgs} dvAlgs.update(userAlgs) + if not dvAlgs: + # Add a dummy algorithm in order to avoid errors from empty nodes + from Gaudi.Configuration import ERROR + from PyConf.Algorithms import Gaudi__Examples__VoidConsumer as VoidConsumer + dvAlgs = {"UserAlgorithms": [VoidConsumer(OutputLevel=ERROR)]} + return dvAlgs, publicTools @@ -158,16 +164,14 @@ def setup_user_algorithms(userAlgPath): - Dict of user algorithm instances to be run in the job. - List of user public tool instances to configure. """ + userAlgs = {} + publicTools = [] + if userAlgPath == "": log_click( "WARNING", "DV option file or main function not defined. No user algorithms will be used." ) - - # Add a dummy algorithm in order to avoid errors from empty nodes - from PyConf.Algorithms import Gaudi__Examples__VoidConsumer as VoidConsumer - userAlgs = {"UserAlgorithms": [VoidConsumer()]} - publicTools = [] else: # Identify the module path and the algorithm name from the user defined string if '/' in userAlgPath: -- GitLab From 9d3ddda6b94aaee787a1da4f038b8a1bdcfdcb1e Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Fri, 15 Oct 2021 12:23:19 +0200 Subject: [PATCH 20/38] fix small bug --- Phys/DaVinci/python/DaVinci/algorithms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index 44369fcff..d86726a02 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -80,7 +80,9 @@ def add_filters(alg, spruce_dec_reports): pass else: if "FunTupleBase_Particles" in str(alg._alg_type): - for _, data in alg.inputs.items(): + for prefix, data in alg.inputs.items(): + if not prefix == "input_location": + continue location = data.location.split("/")[-2] algFilter_code = "HLT_PASS('%sDecision')" %location algFilter = HDRFilter(name="%s_checkHltDecision" %alg.name, -- GitLab From 06f62e0c756f1b364308f01c4ff71c1e9af9f9da Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Wed, 27 Oct 2021 14:09:35 +0200 Subject: [PATCH 21/38] fix error in test_davinci_filters qmtest --- .../davinci.qms/test_davinci_filters.qmt | 51 +++- .../tests/refs/test_davinci_filters.ref | 269 ------------------ 2 files changed, 45 insertions(+), 275 deletions(-) delete mode 100644 DaVinciTests/tests/refs/test_davinci_filters.ref diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt index 9012d68be..17e391dfe 100644 --- a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt +++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt @@ -36,11 +36,50 @@ --user_algorithms ../options/option_davinci_filters:main - ../refs/test_davinci_filters.ref - ../refs/empty.ref -from DaVinciTests.QMTest.DaVinciExclusions import preprocessor -validateWithReference(preproc = preprocessor) -countErrorLines({"FATAL":0}) - +findReferenceBlock("""LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LoKi__HDRFilter/EventPreFilter_HltLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LoKi__HDRFilter/B0DsK_Tuple_checkHltDecision #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| + LoKi__HDRFilter/EventPreFilter_HltLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LoKi__HDRFilter/B0Dspi_Tuple_checkHltDecision #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| +""", stdout, result, causes, signature_offset = 0, id = "Stream3") + diff --git a/DaVinciTests/tests/refs/test_davinci_filters.ref b/DaVinciTests/tests/refs/test_davinci_filters.ref deleted file mode 100644 index cf5581e7a..000000000 --- a/DaVinciTests/tests/refs/test_davinci_filters.ref +++ /dev/null @@ -1,269 +0,0 @@ -INFO No MainOptions specified. DaVinci will import no options file! -INFO User algorithm option_davinci_filters.main imported successfully! -/***** User DVAppOptions/DVAppOptions ************************************************************** -|-auditors = [] (default: []) -|-buffer_events = 20000 (default: 20000) -|-callgrind_profile = False (default: False) -|-conddb_tag = 'sim-20171127-vc-md100' (default: '') -|-control_flow_file = '' (default: '') -|-data_flow_file = '' (default: '') -|-data_type = 'Upgrade' (default: '') -|-dddb_tag = 'dddb-20171126' (default: '') -|-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] -| (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) -|-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) -|-enable_unpack = True (default: True) -|-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') -|-evt_max = -1 (default: -1) -|-evt_pre_filters = {'HltLineFilter': "HLT_PASS('Hlt2Topo2BodyLineDecision')"} (default: {}) -|-first_evt = 0 (default: 0) -|-histo_file = 'sprucing_histos.root' (default: '') -|-hlt2_annsvc_config = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtime.tck.json' -| (default: '') -|-ignore_dq_flags = False (default: False) -|-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtimereco.dst'] -| (default: []) -|-input_raw_format = 0.3 (default: 0.3) -|-input_type = 'ROOT' (default: 'DST') -|-lines_maker = None -|-lumi = False (default: False) -|-main_options = '' (default: '') -|-memory_pool_size = 10485760 (default: 10485760) -|-merge_genfsr = False (default: False) -|-msg_svc_format = '% F%35W%S %7W%R%T %0W%M' (default: '% F%35W%S %7W%R%T %0W%M') -|-msg_svc_time_format = '%Y-%m-%d %H:%M:%S UTC' (default: '%Y-%m-%d %H:%M:%S UTC') -|-n_event_slots = 1 (default: -1) -|-n_threads = 1 (default: 1) -|-ntuple_file = 'sprucing_tuple.root' (default: '') -|-output_file = '' (default: '') -|-output_level = 3 (default: 3) -|-output_type = '' (default: '') -|-overwrite_data_options = False (default: False) -|-print_freq = 1 (default: 1000) -|-python_logging_level = 30 (default: 30) -|-root_compression_level = 'LZMA:6' (default: 'LZMA:6') -|-scheduler_legacy_mode = True (default: True) -|-simulation = True (default: False) -|-skip_events = 0 (default: 0) -|-tck = 0 (default: 0) -|-unpack_stream = '/Event/Spruce' (default: '/Event/Spruce') -|-use_iosvc = False (default: False) -|-user_algorithms = '../options/option_davinci_filters:main' (default: '') -|-write_fsr = True (default: True) -\----- (End of User DVAppOptions/DVAppOptions) ----------------------------------------------------- -ApplicationMgr SUCCESS -==================================================================================================================================== -==================================================================================================================================== -ApplicationMgr INFO Application Manager Configured successfully -DetectorPersistencySvc INFO Added successfully Conversion service:XmlCnvSvc -DetectorDataSvc SUCCESS Detector description database: git:/lhcb.xml -NTupleSvc INFO Added stream file:sprucing_tuple.root as FILE1 -RootHistSvc INFO Writing ROOT histograms to: sprucing_histos.root -HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc -FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' -B0DsK_Tuple INFO Initialising the FunTupleBase algorithm -B0DsK_Tuple INFO Conducting checks with LoKi -B0DsK_Tuple INFO Conducting checks with ThOr -B0DsK_Tuple INFO Setting the properties of ParticleTupleProp objects! -B0DsK_Tuple INFO Instatiating LoKi functors! -B0DsK_Tuple INFO Instatiating ThOr functors! -FunctorFactory INFO Cache miss for functor: ::Functors::Composite::Mass{}, now trying cling with headers [Event/Particle.h, Functors/Composite.h] -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] -B0DsK_Tuple INFO Finished initialisation: -B0Dspi_Tuple INFO Initialising the FunTupleBase algorithm -B0Dspi_Tuple INFO Conducting checks with LoKi -B0Dspi_Tuple INFO Conducting checks with ThOr -B0Dspi_Tuple INFO Setting the properties of ParticleTupleProp objects! -B0Dspi_Tuple INFO Instatiating LoKi functors! -B0Dspi_Tuple INFO Instatiating ThOr functors! -B0Dspi_Tuple INFO Finished initialisation: -EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -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/wg/dpa/wp3/OctoberFEST/test_spruce_realtimereco.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' -EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 -HltDecReportsDecoder WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... -HltDecReportsDecoder#1 WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... -HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... -RFileCnv INFO opening Root file "sprucing_tuple.root" for writing -RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0Dspi_Tuple -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple -EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 3. Record number within stream 1: 3 -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 4. Record number within stream 1: 4 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 5. Record number within stream 1: 5 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 6. Record number within stream 1: 6 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 7. Record number within stream 1: 7 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 8. Record number within stream 1: 8 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 9. Record number within stream 1: 9 -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0Dspi_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 10. Record number within stream 1: 10 -EventSelector SUCCESS Reading Event record 11. Record number within stream 1: 11 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 12. Record number within stream 1: 12 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 13. Record number within stream 1: 13 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 14. Record number within stream 1: 14 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 15. Record number within stream 1: 15 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 16. Record number within stream 1: 16 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 17. Record number within stream 1: 17 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 18. Record number within stream 1: 18 -EventSelector SUCCESS Reading Event record 19. Record number within stream 1: 19 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 20. Record number within stream 1: 20 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 21. Record number within stream 1: 21 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 22. Record number within stream 1: 22 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 23. Record number within stream 1: 23 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 24. Record number within stream 1: 24 -ApplicationMgr INFO Application Manager Stopped successfully -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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - LoKi__HDRFilter/EventPreFilter_HltLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| - LoKi__HDRFilter/B0DsK_Tuple_checkHltDecision #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| - LoKi__HDRFilter/EventPreFilter_HltLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| - LoKi__HDRFilter/B0Dspi_Tuple_checkHltDecision #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| -ToolSvc INFO Removing all tools created by ToolSvc -RFileCnv INFO dumping contents of /NTUPLES/FILE1 -TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE -NTupleSvc INFO NTuples saved successfully -ApplicationMgr INFO Application Manager Finalized successfully -ApplicationMgr INFO Application Manager Terminated successfully -B0DsK_Tuple_checkHltDecision INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"#passed" | 22 | 21 |( 95.45455 +- 4.440947)% | -B0Dspi_Tuple_checkHltDecision INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"#passed" | 22 | 14 |( 63.63636 +- 10.25593)% | -EventPreFilter_HltLineFilter INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"#passed" | 24 | 22 |( 91.66667 +- 5.641693)% | -ToolSvc.HltFactory INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 3 | -ToolSvc.HybridFactory INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 54 | -UnpackParticlesAndVertices INFO Number of counters : 8 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# UnPacked FlavourTags" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked MuonPIDs" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Particles" | 21 | 645 | 30.714 | 42.137 | 12.000 | 216.00 | - | "# UnPacked ProtoParticles" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RecVertices" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RichPIDs" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Tracks" | 21 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Vertices" | 21 | 428 | 20.381 | 37.571 | 6.0000 | 187.00 | -- GitLab From 2d44049dd2b04eb454ab5fd6b525e404726adcbb Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Fri, 29 Oct 2021 15:28:41 +0200 Subject: [PATCH 22/38] small changes --- Phys/DaVinci/python/DaVinci/algorithms.py | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index d86726a02..1c6a9458e 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -68,7 +68,7 @@ def add_filters(alg, spruce_dec_reports): Args: - alg: tupling algorithm of interest. - - spruce_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for spruced lines. + - spruce_dec_reports: HltDecReportsDecoder containing the configuration for spruced lines. Returns: - A list of algorithms containing all the filters and the original algorithm. @@ -100,8 +100,8 @@ def apply_filters_and_unpacking(options, algs_dict, hlt_dec_reports, spruce_dec_ Args: - options: list of DaVinci options. - algs_dict: dict of the user algorithms. - - hlt_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for hlt2 lines. - - spruce_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for spruced lines. + - hlt_dec_reports: HltDecReportsDecoder containing the configuration for hlt2 lines. + - spruce_dec_reports: HltDecReportsDecoder containing the configuration for spruced lines. Returns: - Dict where at each node filters and unpacking algorithms are prepended to the initial list of user algorithms. @@ -271,15 +271,15 @@ def set_hlt_config(config, options): - options: list of DaVinci options. Returns: - - HltDecReportsDecoder containing the HLT2 configuration for hlt2 lines. - - HltDecReportsDecoder containing the HLT2 configuration for spruced lines. + - HltDecReportsDecoder containing the configuration for hlt2 lines. + - HltDecReportsDecoder containing the configuration for spruced lines. """ from PyConf.Algorithms import HltDecReportsDecoder from PyConf.application import default_raw_event from PyConf.dataflow import force_location - hlt2_annsvc_config = get_option_value(options, "hlt2_annsvc_config") + hlt_annsvc_config = get_option_value(options, "hlt_annsvc_config") - set_hltAnn_svc(config, hlt2_annsvc_config) + set_hltAnn_svc(config, hlt_annsvc_config) hlt_dec_reports = HltDecReportsDecoder( RawEventLocations=default_raw_event(bank_types=["HltDecReports"]), @@ -307,8 +307,8 @@ def set_evt_filters(options, hlt_dec_reports, spruce_dec_reports): Args: - options: list of DaVinci options. - - hlt_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for hlt2 lines. - - spruce_dec_reports: HltDecReportsDecoder containing the HLT2 configuration for spruced lines. + - hlt_dec_reports: HltDecReportsDecoder containing the configuration for hlt2 lines. + - spruce_dec_reports: HltDecReportsDecoder containing the configuration for spruced lines. Returns: - List of event pre-filters to be added to the configuration. @@ -335,43 +335,43 @@ def set_evt_filters(options, hlt_dec_reports, spruce_dec_reports): return filters -def get_hltAnn_dict(hlt2_annsvc_config): +def get_hltAnn_dict(hlt_annsvc_config): """ Extracts Hlt ANN dictionary from the given location. Args: - - hlt2_annsvc_config: path to the .json file containing the HltAnnSvc configuration + - hlt_annsvc_config: path to the .json file containing the HltAnnSvc configuration Returns: - Dict with all the HLT2 locations. """ tck = {} - if "root://eoslhcb.cern.ch//" in hlt2_annsvc_config: + if "root://eoslhcb.cern.ch//" in hlt_annsvc_config: with XRootD.client.File() as f: - status, _ = f.open(hlt2_annsvc_config) + status, _ = f.open(hlt_annsvc_config) if not status.ok: - raise RuntimeError(f"could not open {hlt2_annsvc_config}: {status.message}") + raise RuntimeError(f"could not open {hlt_annsvc_config}: {status.message}") status, data = f.read() if not status.ok: - raise RuntimeError(f"could not read {hlt2_annsvc_config}: {status.message}") + raise RuntimeError(f"could not read {hlt_annsvc_config}: {status.message}") tck = json.loads(data.decode('utf-8')) - elif hlt2_annsvc_config: - with open(os.path.expandvars(hlt2_annsvc_config)) as f: + elif hlt_annsvc_config: + with open(os.path.expandvars(hlt_annsvc_config)) as f: tck = json.load(f) return tck -def set_hltAnn_svc(config, hlt2_annsvc_config): +def set_hltAnn_svc(config, hlt_annsvc_config): """ Configures the Hlt ANN service to read correctly the spruced locations using the HltAnnSvc configuration of the HLT2 application. Args: - config: dict of configured Configurable instances. - - hlt2_annsvc_config: path to the .json file containing the HltAnnSvc configuration. + - hlt_annsvc_config: path to the .json file containing the HltAnnSvc configuration. """ - tck = get_hltAnn_dict(hlt2_annsvc_config) + tck = get_hltAnn_dict(hlt_annsvc_config) if tck: ann_config = tck["HltANNSvc/HltANNSvc"] -- GitLab From 673cf4daf1701b2a99d0681427aed0cc6711e227 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Fri, 29 Oct 2021 19:09:38 +0200 Subject: [PATCH 23/38] change property name from "enable_filters" to "enable_moore_location_fillters" --- .../tupling/example-tupling-advanced-run-mc.py | 2 +- .../tupling/example-tupling-basic-run-mc.yaml | 2 +- DaVinciTests/tests/refs/test-FSRs-aftermerge.ref | 2 +- DaVinciTests/tests/refs/test_davinci_control_flow.ref | 2 +- DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref | 2 +- DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref | 2 +- DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref | 2 +- DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref | 2 +- DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref | 2 +- DaVinciTests/tests/refs/test_davinci_simplejob.ref | 2 +- DaVinciTests/tests/refs/test_davinci_sprucing.ref | 2 +- DaVinciTests/tests/refs/test_davinci_testfiledb.ref | 2 +- DaVinciTests/tests/refs/test_davinci_tupling.ref | 2 +- DaVinciTests/tests/refs/test_davinci_user_algs.ref | 2 +- Phys/DaVinci/options/application-option-defaults.yaml | 6 +++--- Phys/DaVinci/options/prod_conf/options-DaVinciConf.py | 2 +- Phys/DaVinci/python/DaVinci/algorithms.py | 2 +- Phys/DaVinci/python/DaVinci/options_default.py | 4 ++-- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py index 4455453f9..40a7228b3 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py @@ -112,7 +112,7 @@ tuple_kshorts = Funtuple( def main(): from DaVinci import options - options.enable_filters = False + options.enable_moore_location_filters = False options.evt_max = 10 options.ntuple_file = 'DV-example-tupling-advanced-ntp.root' options.histo_file = 'DV-example-tupling-advanced-his.root' diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml index addc382eb..420abeef7 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml @@ -10,7 +10,7 @@ ############################################################################### enable_unpack: False -enable_filters: False +enable_moore_location_filters: False evt_max: 10 histo_file: 'DV-example-tupling-basic-his.root' input_raw_format: 4.3 diff --git a/DaVinciTests/tests/refs/test-FSRs-aftermerge.ref b/DaVinciTests/tests/refs/test-FSRs-aftermerge.ref index ddc7a9812..ce512c94d 100644 --- a/DaVinciTests/tests/refs/test-FSRs-aftermerge.ref +++ b/DaVinciTests/tests/refs/test-FSRs-aftermerge.ref @@ -13,4 +13,4 @@ /0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam1 /0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam1: LumiLowFSR: { runs : 69623 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69623/069623_0000000003.raw info (key/incr/integral) : 0 5 0 / 1 5 92 / 2 5 33 / 6 5 0 / 7 5 0 / 8 5 0 / 10 5 4 / 20 5 5 / } /0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam2 -/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam2: LumiLowFSR: { runs : 69623 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69623/069623_0000000003.raw info (key/incr/integral) : 0 5 0 / 1 5 92 / 2 5 33 / 6 5 0 / 7 5 0 / 8 5 0 / 10 5 4 / 20 5 5 / } \ No newline at end of file +/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam2: LumiLowFSR: { runs : 69623 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69623/069623_0000000003.raw info (key/incr/integral) : 0 5 0 / 1 5 92 / 2 5 33 / 6 5 0 / 7 5 0 / 8 5 0 / 10 5 4 / 20 5 5 / } diff --git a/DaVinciTests/tests/refs/test_davinci_control_flow.ref b/DaVinciTests/tests/refs/test_davinci_control_flow.ref index b3e241a2e..3860a2f8e 100644 --- a/DaVinciTests/tests/refs/test_davinci_control_flow.ref +++ b/DaVinciTests/tests/refs/test_davinci_control_flow.ref @@ -12,7 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 150 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref index 427790707..d3009aaea 100644 --- a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref +++ b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref @@ -12,7 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 1000 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref index a2f1b01ec..7e803d7f2 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref @@ -12,7 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref index 052b42d26..5a19907b3 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref @@ -12,7 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref index 04bd756c0..a9d91b2d0 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref @@ -12,7 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref index 14054f614..4df630224 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref @@ -12,7 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_simplejob.ref b/DaVinciTests/tests/refs/test_davinci_simplejob.ref index d485220ab..3a33a62f9 100644 --- a/DaVinciTests/tests/refs/test_davinci_simplejob.ref +++ b/DaVinciTests/tests/refs/test_davinci_simplejob.ref @@ -12,7 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 393888cc5..adb82695f 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -12,7 +12,7 @@ INFO User algorithm option_davinci_sprucing.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref index e12261d10..4971fa878 100644 --- a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref +++ b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref @@ -12,7 +12,7 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index 37e2079c0..08db94d7b 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -12,7 +12,7 @@ INFO User algorithm example-tupling-basic-run-mc.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = False (default: True) +|-enable_moore_location_filters = False (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index 8a3a1f152..765019645 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -12,7 +12,7 @@ INFO User algorithm option_davinci_user_algs.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_filters = True (default: True) +|-enable_moore_location_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) diff --git a/Phys/DaVinci/options/application-option-defaults.yaml b/Phys/DaVinci/options/application-option-defaults.yaml index 9648fca47..5ab898204 100644 --- a/Phys/DaVinci/options/application-option-defaults.yaml +++ b/Phys/DaVinci/options/application-option-defaults.yaml @@ -41,8 +41,8 @@ detectors: dqflags_tag: text: '"""Tag for DQFLAGS. Default as set in DDDBConf for DataType."""' value: '' -enable_filters: - text: '"""Explicitly enable/disable filters on top of unpacking and tupling algorithms."""' +enable_moore_location_filters: + text: '"""Explicitly enable/disable filters on top of unpacking and tupling algorithms to check the particles location exists."""' value: True enable_unpack: text: '"""Explicitly enable/disable unpacking for input data (if specified)"""' @@ -121,4 +121,4 @@ use_iosvc: value: False write_fsr: text: '"""Flags whether to write out an FSR."""' - value: True \ No newline at end of file + value: True diff --git a/Phys/DaVinci/options/prod_conf/options-DaVinciConf.py b/Phys/DaVinci/options/prod_conf/options-DaVinciConf.py index aa382fb22..9780d8e01 100644 --- a/Phys/DaVinci/options/prod_conf/options-DaVinciConf.py +++ b/Phys/DaVinci/options/prod_conf/options-DaVinciConf.py @@ -18,7 +18,7 @@ After having installed the ProdConf application locally the job can be launched from DaVinci import options options.data_type = 'Upgrade' -options.enable_filters = False +options.enable_moore_location_filters = False options.enable_unpack = False options.histo_file = 'DaVinci_histos.root' options.input_raw_format = 0.3 diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index 1c6a9458e..e1f75b291 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -113,7 +113,7 @@ def apply_filters_and_unpacking(options, algs_dict, hlt_dec_reports, spruce_dec_ algs_list += set_evt_filters(options, hlt_dec_reports, spruce_dec_reports) for alg in algs: - if options.enable_filters: + if options.enable_moore_location_filters: algs_list += add_filters(alg, spruce_dec_reports) if options.enable_unpack: algs_list += unpack_locations(options) diff --git a/Phys/DaVinci/python/DaVinci/options_default.py b/Phys/DaVinci/python/DaVinci/options_default.py index c42bb99d7..b2314cbbd 100644 --- a/Phys/DaVinci/python/DaVinci/options_default.py +++ b/Phys/DaVinci/python/DaVinci/options_default.py @@ -68,9 +68,9 @@ __optsDict__ = { '"""Tag for DQFLAGS. Default as set in DDDBConf for DataType."""', "value": '' }, - "enable_filters": { + "enable_moore_location_filters": { "text": - '"""Explicitly enable/disable filters on top of unpacking and tupling algorithms."""', + '"""Explicitly enable/disable filters on top of unpacking and tupling algorithms to check the particles location exists."""', "value": True }, -- GitLab From 263d5574adc5765b63b2aa1f27f453cb612b1396 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Tue, 2 Nov 2021 17:27:44 +0100 Subject: [PATCH 24/38] remove option enable_moore_location_fillters --- .../example-tupling-advanced-run-mc.py | 1 - .../tupling/example-tupling-basic-run-mc.yaml | 1 - .../tests/options/option_davinci_filters.py | 9 +- .../options/option_davinci_sprucing.yaml | 10 +- .../tests/options/option_davinci_user_algs.py | 6 +- .../tests/options/prod_conf/options_job.py | 2 +- .../davinci.qms/test_davinci_filters.qmt | 86 +++++----- .../tests/refs/test_davinci_control_flow.ref | 3 +- .../refs/test_davinci_initialise_upgrade.ref | 3 +- .../tests/refs/test_davinci_read_mc_digi.ref | 3 +- .../tests/refs/test_davinci_read_mc_ldst.ref | 3 +- .../tests/refs/test_davinci_read_mc_mdf.ref | 3 +- .../tests/refs/test_davinci_read_mc_xdigi.ref | 3 +- .../tests/refs/test_davinci_simplejob.ref | 3 +- .../tests/refs/test_davinci_sprucing.ref | 94 ++++------- .../tests/refs/test_davinci_testfiledb.ref | 3 +- .../tests/refs/test_davinci_user_algs.ref | 38 +---- .../options/application-option-defaults.yaml | 9 +- .../options/prod_conf/options-DaVinciConf.py | 1 - .../python/DaVinci/ConfigurationUpgrade.py | 2 +- Phys/DaVinci/python/DaVinci/algorithms.py | 151 +++++++----------- .../DaVinci/python/DaVinci/options_default.py | 18 +-- 22 files changed, 177 insertions(+), 275 deletions(-) diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py index 40a7228b3..28b476003 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py @@ -112,7 +112,6 @@ tuple_kshorts = Funtuple( def main(): from DaVinci import options - options.enable_moore_location_filters = False options.evt_max = 10 options.ntuple_file = 'DV-example-tupling-advanced-ntp.root' options.histo_file = 'DV-example-tupling-advanced-his.root' diff --git a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml index 420abeef7..b7a97d810 100644 --- a/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml +++ b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml @@ -10,7 +10,6 @@ ############################################################################### enable_unpack: False -enable_moore_location_filters: False evt_max: 10 histo_file: 'DV-example-tupling-basic-his.root' input_raw_format: 4.3 diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index f9fea52e7..80930840a 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -15,6 +15,7 @@ from FunTuple import FunctorCollection from FunTuple import FunTuple_Particles as Funtuple from FunTuple.NewTupleTools import Kinematics from PyConf.application import make_data_with_FetchDataFromFile +from DaVinci.algorithms import add_filter, set_hlt_config bd2dsk_line = make_data_with_FetchDataFromFile( "/Event/Spruce/SpruceB2OC_BdToDsmK_DsmToHHH_FEST_Line/Particles") @@ -87,10 +88,14 @@ evt_filter = "HLT_PASS('Hlt2Topo2BodyLineDecision')" def main(): from DaVinci import options options.evt_max = -1 - options.evt_pre_filters = {"HltLineFilter": evt_filter} + options.evt_pre_filters = {"Hlt2TopoLineFilter": evt_filter} options.output_level = 3 + hlt_dec_reports, spruce_dec_reports = set_hlt_config(options) + filter_B0DsK = add_filter("HDRFilter_B0DsK", "HLT_PASS('SpruceB2OC_BdToDsmK_DsmToHHH_FEST_LineDecision')", hlt_dec_reports, spruce_dec_reports) + filter_B0Dspi = add_filter("HDRFilter_B0Dspi", "HLT_PASS('SpruceB2OC_BdToDsmPi_DsmToHHH_LineDecision')", hlt_dec_reports, spruce_dec_reports) + tools = [] - algs = {"B0DsK": [tuple_B0DsK], "B0Dspi": [tuple_B0Dspi]} + algs = {"B0DsK": [filter_B0DsK, tuple_B0DsK], "B0Dspi": [filter_B0Dspi, tuple_B0Dspi]} return algs, tools diff --git a/DaVinciTests/tests/options/option_davinci_sprucing.yaml b/DaVinciTests/tests/options/option_davinci_sprucing.yaml index fad7ea07b..3f9622ed7 100644 --- a/DaVinciTests/tests/options/option_davinci_sprucing.yaml +++ b/DaVinciTests/tests/options/option_davinci_sprucing.yaml @@ -9,12 +9,12 @@ # or submit itself to any jurisdiction. # ############################################################################### -evt_max: 10 -skip_events: 0 -print_freq: 1 -ntuple_file: 'sprucing_tuple.root' +annsvc_config: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtime.tck.json' +evt_max: 5 histo_file: 'sprucing_histos.root' input_raw_format: 0.3 lumi: false -hlt2_annsvc_config: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtime.tck.json' +ntuple_file: 'sprucing_tuple.root' +print_freq: 1 +skip_events: 0 unpack_stream: '/Event/Spruce' \ No newline at end of file diff --git a/DaVinciTests/tests/options/option_davinci_user_algs.py b/DaVinciTests/tests/options/option_davinci_user_algs.py index 496aa619d..f938b8e31 100644 --- a/DaVinciTests/tests/options/option_davinci_user_algs.py +++ b/DaVinciTests/tests/options/option_davinci_user_algs.py @@ -15,14 +15,14 @@ Example of a DaVinci job printing run and event numbers on every read event. __author__ = "Davide Fazzini" __date__ = "2021-03-31" -from DaVinci.reco_objects import upfront_reconstruction_from_file as upfront_reconstruction - +from Gaudi.Configuration import ERROR +from PyConf.Algorithms import Gaudi__Examples__VoidConsumer as VoidConsumer def main(): # the "upfront_reconstruction" is what unpacks reconstruction objects, particles and primary vertices # from file and creates protoparticles. tools = [] - algs = upfront_reconstruction() + algs = [VoidConsumer(OutputLevel=ERROR)] from DaVinci import options options.evt_max = 10 diff --git a/DaVinciTests/tests/options/prod_conf/options_job.py b/DaVinciTests/tests/options/prod_conf/options_job.py index 2f8c37b1e..be0f0192e 100644 --- a/DaVinciTests/tests/options/prod_conf/options_job.py +++ b/DaVinciTests/tests/options/prod_conf/options_job.py @@ -21,5 +21,5 @@ options.ntuple_file = (prod_conf_params["OutputFilePrefix"] + '.' + options.simulation = True options.skip_events = 0 options.output_type = "ROOT" -options.user_algorithms = "../../../DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc:main" +options.user_algorithms = "../../../DaVinciTests/tests/options/option_davinci_sprucing:main" options.write_fsr = False diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt index 17e391dfe..2c5bbc115 100644 --- a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt +++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt @@ -37,49 +37,49 @@ ../options/option_davinci_filters:main -findReferenceBlock("""LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - LoKi__HDRFilter/EventPreFilter_HltLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| - LoKi__HDRFilter/B0DsK_Tuple_checkHltDecision #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| - LoKi__HDRFilter/EventPreFilter_HltLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| - LoKi__HDRFilter/B0Dspi_Tuple_checkHltDecision #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| +findReferenceBlock("""LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__HDRFilter/HDRFilter_B0DsK #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| + FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| + LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__HDRFilter/HDRFilter_B0Dspi #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| + FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| """, stdout, result, causes, signature_offset = 0, id = "Stream3") diff --git a/DaVinciTests/tests/refs/test_davinci_control_flow.ref b/DaVinciTests/tests/refs/test_davinci_control_flow.ref index 3860a2f8e..6053a6a3f 100644 --- a/DaVinciTests/tests/refs/test_davinci_control_flow.ref +++ b/DaVinciTests/tests/refs/test_davinci_control_flow.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! WARNING DV option file or main function not defined. No user algorithms will be used. /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 150 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref index d3009aaea..b3423a60b 100644 --- a/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref +++ b/DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! WARNING DV option file or main function not defined. No user algorithms will be used. /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 1000 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref index 7e803d7f2..f5cfdb26a 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_digi.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! WARNING DV option file or main function not defined. No user algorithms will be used. /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_00.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_01.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_02.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_03.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_04.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_05.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_06.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_07.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_08.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_09.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_10.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_11.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_12.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_13.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_14.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_15.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_16.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_17.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_18.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_19.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_20.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_21.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_22.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_23.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_24.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_25.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_26.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_27.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_28.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_29.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_30.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_31.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_32.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_33.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_34.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_35.digi', 'root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeSignalDigi/K0S2mu2/K0S2mu2_MCUpgrade_34112100_MagDown_36.digi'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref index 5a19907b3..e5fb7554e 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_ldst.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! WARNING DV option file or main function not defined. No user algorithms will be used. /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeMinbias/00069155_00000021_2.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref index a9d91b2d0..38193cb5d 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_mdf.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! WARNING DV option file or main function not defined. No user algorithms will be used. /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_1.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_12.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_13.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_14.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_17.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_2.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_20.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_21.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_22.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_23.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_24.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_25.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_27.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_29.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_3.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_32.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_36.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_37.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_39.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_4.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_40.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_42.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_43.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_46.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_47.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_49.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_52.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_53.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_54.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_55.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_58.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_60.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_61.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_62.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_66.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_68.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_70.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_73.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_74.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_76.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_78.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_79.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_80.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_82.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_83.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_86.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_87.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_9.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_91.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_94.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_96.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_97.mdf', 'mdf:root://eoslhcb.cern.ch//eos/lhcb/wg/rta/WP2/Hlt2Throughput/minbias_filtered_98.mdf'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref index 4df630224..3c715c7bc 100644 --- a/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref +++ b/DaVinciTests/tests/refs/test_davinci_read_mc_xdigi.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! WARNING DV option file or main function not defined. No user algorithms will be used. /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 200 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000002_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000009_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000010_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000011_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000012_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000013_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000016_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000017_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000019_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000021_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000022_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000023_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000024_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000025_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000028_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000032_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000033_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000035_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000037_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000038_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000039_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000040_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000042_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000045_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000046_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000048_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000050_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000051_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000054_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000055_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000056_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000057_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000060_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000062_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000064_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000065_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000066_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000068_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000069_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000071_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000072_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000073_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000075_1.xdigi', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000079_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000001_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000015_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000026_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000036_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000049_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000061_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000080_1.xdigi', 'root://ccxrootdlhcb.in2p3.fr//pnfs/in2p3.fr/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000081_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000003_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000005_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000027_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000052_1.xdigi', 'root://lhcbsdrm.t1.grid.kiae.ru:1094/t1.grid.kiae.ru/data/lhcb/lhcbdisk/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000074_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000004_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000031_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000034_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000044_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000047_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000067_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000070_1.xdigi', 'root://xrootd.echo.stfc.ac.uk/lhcb:prod/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000078_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000006_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000020_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000043_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000059_1.xdigi', 'root://lhcbxrootd-kit.gridka.de//pnfs/gridka.de/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000076_1.xdigi', 'root://hake12.grid.surfsara.nl:1094/pnfs/grid.sara.nl/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000007_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000008_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000018_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000029_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000041_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000058_1.xdigi', 'root://xrootd-lhcb.cr.cnaf.infn.it//storage/gpfs_lhcb/lhcb/disk/MC/Upgrade/XDIGI/00091825/0000/00091825_00000077_1.xdigi', 'root://door02.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000030_1.xdigi', 'root://door03.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000053_1.xdigi', 'root://door07.pic.es:1094/pnfs/pic.es/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000082_1.xdigi', 'root://shark10.grid.surfsara.nl:1094/pnfs/grid.sara.nl/data/lhcb/MC/Upgrade/XDIGI/00091825/0000/00091825_00000063_1.xdigi'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_simplejob.ref b/DaVinciTests/tests/refs/test_davinci_simplejob.ref index 3a33a62f9..c86426a6e 100644 --- a/DaVinciTests/tests/refs/test_davinci_simplejob.ref +++ b/DaVinciTests/tests/refs/test_davinci_simplejob.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! WARNING DV option file or main function not defined. No user algorithms will be used. /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = '' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index adb82695f..44d2eda64 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -1,6 +1,8 @@ INFO No MainOptions specified. DaVinci will import no options file! INFO User algorithm option_davinci_sprucing.main imported successfully! /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtime.tck.json' +| (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,15 +14,12 @@ INFO User algorithm option_davinci_sprucing.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') -|-evt_max = 10 (default: -1) +|-evt_max = 5 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'sprucing_histos.root' (default: '') -|-hlt2_annsvc_config = 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtime.tck.json' -| (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_spruce_realtimereco.dst'] | (default: []) @@ -62,6 +61,7 @@ NTupleSvc INFO Added stream file:sprucing_tuple.roo RootHistSvc INFO Writing ROOT histograms to: sprucing_histos.root HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' +EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 B0DsK_Tuple INFO Initialising the FunTupleBase algorithm B0DsK_Tuple INFO Conducting checks with LoKi B0DsK_Tuple INFO Conducting checks with ThOr @@ -72,14 +72,12 @@ FunctorFactory INFO Cache miss for functor: ::Functors:: 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] B0DsK_Tuple INFO Finished initialisation: -EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 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/wg/dpa/wp3/OctoberFEST/test_spruce_realtimereco.dst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES' EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 -HltDecReportsDecoder#1 WARNING TCK obtained from rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... RFileCnv INFO opening Root file "sprucing_tuple.root" for writing B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. @@ -102,74 +100,50 @@ EventSelector SUCCESS Reading Event record 5. Record numbe B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 6. Record number within stream 1: 6 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 7. Record number within stream 1: 7 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 8. Record number within stream 1: 8 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 9. Record number within stream 1: 9 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -EventSelector SUCCESS Reading Event record 10. Record number within stream 1: 10 ApplicationMgr INFO Application Manager Stopped successfully 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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -LAZY_AND: DaVinci #=10 Sum=9 Eff=|( 90.00000 +- 9.48683 )%| - 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=9 Eff=|( 90.00000 +- 9.48683 )%| - LAZY_AND: UserAlgorithms #=10 Sum=9 Eff=|( 90.00000 +- 9.48683 )%| - LoKi__HDRFilter/B0DsK_Tuple_checkHltDecision #=10 Sum=9 Eff=|( 90.00000 +- 9.48683 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=9 Sum=9 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: FileSummaryRecords #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackTracks #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE NTupleSvc INFO NTuples saved successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -B0DsK_Tuple_checkHltDecision INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - |*"#passed" | 10 | 9 |( 90.00000 +- 9.486833)% | -ToolSvc.HltFactory INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# loaded from PYTHON" | 1 | ToolSvc.HybridFactory INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# loaded from PYTHON" | 27 | UnpackParticlesAndVertices INFO Number of counters : 8 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# UnPacked FlavourTags" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked MuonPIDs" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Particles" | 9 | 220 | 24.444 | 8.4078 | 12.000 | 44.000 | - | "# UnPacked ProtoParticles" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RecVertices" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked RichPIDs" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Tracks" | 9 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Vertices" | 9 | 126 | 14.000 | 5.3541 | 6.0000 | 24.000 | + | "# UnPacked FlavourTags" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked MuonPIDs" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Particles" | 5 | 143 | 28.600 | 8.4758 | 19.000 | 44.000 | + | "# UnPacked ProtoParticles" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RecVertices" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked RichPIDs" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Tracks" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | + | "# UnPacked Vertices" | 5 | 83 | 16.600 | 5.1225 | 10.000 | 24.000 | diff --git a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref index 4971fa878..39cc3296e 100644 --- a/DaVinciTests/tests/refs/test_davinci_testfiledb.ref +++ b/DaVinciTests/tests/refs/test_davinci_testfiledb.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! WARNING DV option file or main function not defined. No user algorithms will be used. /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ WARNING DV option file or main function not defined. No user algorithms will be |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'ExampleHistos.root' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index 765019645..b39ed71b7 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! INFO User algorithm option_davinci_user_algs.main imported successfully! /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ INFO User algorithm option_davinci_user_algs.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = True (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DVHistos.root' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) @@ -61,7 +60,6 @@ NTupleSvc INFO Added stream file:DVNtuple.root as F RootHistSvc INFO Writing ROOT histograms to: DVHistos.root HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' -UnpackChargedProtos.ChargedProto... INFO Using retuned RICH el and mu DLL values in combined DLLs EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 @@ -72,33 +70,13 @@ EventSelector SUCCESS Reading Event record 1. Record numbe ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 -UnpackRichPIDs SUCCESS #WARNINGS = 10 Message = 'Incorrect data version 0 for packing version > 3. Correcting data to version 2.' -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=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 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/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 )%| +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=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -UnpackBestTracks INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# Unpacked Tracks" | 10 | 4332 | 433.20 | -UnpackMuonPIDs INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# UnPackedData" | 10 | 1088 | 108.80 | 43.990 | 33.000 | 159.00 | -UnpackMuonTracks INFO Number of counters : 1 - | Counter | # | sum | mean/eff^* | rms/err^* | min | max | - | "# Unpacked Tracks" | 10 | 156 | 15.600 | diff --git a/Phys/DaVinci/options/application-option-defaults.yaml b/Phys/DaVinci/options/application-option-defaults.yaml index 5ab898204..5444a4734 100644 --- a/Phys/DaVinci/options/application-option-defaults.yaml +++ b/Phys/DaVinci/options/application-option-defaults.yaml @@ -11,6 +11,9 @@ # Definitions of, and defaults for, the DaVinci application options. +annsvc_config: + text: '"""Path to .json file containing HLT2 and Spruce configuration generated by ANNSvc when the .dst input file was created."""' + value: '' auditors: text: '"""List of auditors to run. Possible common choices include "NameAuditor", "MemoryAuditor", "ChronoAuditor". See Gaudi manual for a full list. Default = []."""' value: [] @@ -41,9 +44,6 @@ detectors: dqflags_tag: text: '"""Tag for DQFLAGS. Default as set in DDDBConf for DataType."""' value: '' -enable_moore_location_filters: - text: '"""Explicitly enable/disable filters on top of unpacking and tupling algorithms to check the particles location exists."""' - value: True enable_unpack: text: '"""Explicitly enable/disable unpacking for input data (if specified)"""' value: True @@ -56,9 +56,6 @@ evt_max: histo_file: text: '"""Name of output histogram file. Default = ''."""' value: '' -hlt2_annsvc_config: - text: '"""Path to .json file containing HLT2 configuration generated by ANNSvc when the .dst input file was created."""' - value: '' ignore_dq_flags: text: '"""If False, process only events with good DQ. Default = False."""' value: False diff --git a/Phys/DaVinci/options/prod_conf/options-DaVinciConf.py b/Phys/DaVinci/options/prod_conf/options-DaVinciConf.py index 9780d8e01..515e30ac3 100644 --- a/Phys/DaVinci/options/prod_conf/options-DaVinciConf.py +++ b/Phys/DaVinci/options/prod_conf/options-DaVinciConf.py @@ -18,7 +18,6 @@ After having installed the ProdConf application locally the job can be launched from DaVinci import options options.data_type = 'Upgrade' -options.enable_moore_location_filters = False options.enable_unpack = False options.histo_file = 'DaVinci_histos.root' options.input_raw_format = 0.3 diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index 79922a254..8d52845fa 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -39,7 +39,7 @@ def add_davinci_configurables(options): check_options(options) config = configure_input(options) - hlt_dec_reports, spruce_dec_reports = set_hlt_config(config, options) + hlt_dec_reports, spruce_dec_reports = set_hlt_config(options, config) dvMainFlow.update( apply_filters_and_unpacking(options, userAlgs, hlt_dec_reports, spruce_dec_reports)) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index e1f75b291..b0e840792 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -46,6 +46,10 @@ def setup_algorithms(options): "WARNING", "DV option file or main function not defined. No user algorithms will be used." ) + # Add a dummy algorithm in order to avoid errors from empty nodes + from Gaudi.Configuration import ERROR + from PyConf.Algorithms import Gaudi__Examples__VoidConsumer as VoidConsumer + dvAlgs = {"UserAlgorithms": [VoidConsumer(OutputLevel=ERROR)]} else: userAlgs, publicTools = setup_user_algorithms(userAlgName) @@ -53,44 +57,34 @@ def setup_algorithms(options): userAlgs = {"UserAlgorithms": userAlgs} dvAlgs.update(userAlgs) - if not dvAlgs: - # Add a dummy algorithm in order to avoid errors from empty nodes - from Gaudi.Configuration import ERROR - from PyConf.Algorithms import Gaudi__Examples__VoidConsumer as VoidConsumer - dvAlgs = {"UserAlgorithms": [VoidConsumer(OutputLevel=ERROR)]} - return dvAlgs, publicTools -def add_filters(alg, spruce_dec_reports): +def add_filter(name, code, hlt_dec_reports, spruce_dec_reports): """ Adding HDR filter to FunTuple algorithms checking is the corresponding SpruceLine fired. Args: - - alg: tupling algorithm of interest. + - name: filter's name. + - code: filter's code. + - hlt_dec_reports: HltDecReportsDecoder containing the configuration for spruced lines. - spruce_dec_reports: HltDecReportsDecoder containing the configuration for spruced lines. Returns: - - A list of algorithms containing all the filters and the original algorithm. + - Filter with name and code defined by the user. """ - algs_list = [] - try: - alg._alg_type - except: - pass + if "Spruce" in code: + algFilter = HDRFilter(name=name, + Code=code, + Location=spruce_dec_reports.OutputHltDecReportsLocation) + elif "Hlt" in code: + algFilter = HDRFilter(name=name, + Code=code, + Location=hlt_dec_reports.OutputHltDecReportsLocation) else: - if "FunTupleBase_Particles" in str(alg._alg_type): - for prefix, data in alg.inputs.items(): - if not prefix == "input_location": - continue - location = data.location.split("/")[-2] - algFilter_code = "HLT_PASS('%sDecision')" %location - algFilter = HDRFilter(name="%s_checkHltDecision" %alg.name, - Code=algFilter_code, - Location=spruce_dec_reports.OutputHltDecReportsLocation) - algs_list += [algFilter] - - return algs_list + algFilter = VoidFilter(name=name, Code=code) + + return algFilter def apply_filters_and_unpacking(options, algs_dict, hlt_dec_reports, spruce_dec_reports): @@ -110,14 +104,16 @@ def apply_filters_and_unpacking(options, algs_dict, hlt_dec_reports, spruce_dec_ for name, algs in algs_dict.items(): algs_list = [] if options.evt_pre_filters: - algs_list += set_evt_filters(options, hlt_dec_reports, spruce_dec_reports) + evt_pre_filters = [] + code_filters = options.evt_pre_filters + for title, code in code_filters.items(): + evt_filter = add_filter(title, code, hlt_dec_reports, spruce_dec_reports) + evt_pre_filters.append(evt_filter) + algs_list += evt_pre_filters - for alg in algs: - if options.enable_moore_location_filters: - algs_list += add_filters(alg, spruce_dec_reports) - if options.enable_unpack: - algs_list += unpack_locations(options) - algs_list += [alg] + if options.enable_unpack: + algs_list += unpack_locations(options) + algs_list += algs alg_filterd_dict[name] = algs_list @@ -262,13 +258,13 @@ def unpack_locations(options): return reading_algs -def set_hlt_config(config, options): +def set_hlt_config(options, config=None): """ Set the Hlt service and algorithms. Args: - - config: dict of configured Configurable instances. - options: list of DaVinci options. + - config: dict of configured Configurable instances. Returns: - HltDecReportsDecoder containing the configuration for hlt2 lines. @@ -277,12 +273,14 @@ def set_hlt_config(config, options): from PyConf.Algorithms import HltDecReportsDecoder from PyConf.application import default_raw_event from PyConf.dataflow import force_location - hlt_annsvc_config = get_option_value(options, "hlt_annsvc_config") - - set_hltAnn_svc(config, hlt_annsvc_config) + annsvc_config = get_option_value(options, "annsvc_config") + + if config: + set_hltAnn_svc(config, annsvc_config) hlt_dec_reports = HltDecReportsDecoder( - RawEventLocations=default_raw_event(bank_types=["HltDecReports"]), + RawEventLocations=default_raw_event(raw_event_format=options.input_raw_format, + bank_types=["HltDecReports"]), SourceID='Hlt2', outputs={ "OutputHltDecReportsLocation": @@ -290,7 +288,8 @@ def set_hlt_config(config, options): }) spruce_dec_reports = HltDecReportsDecoder( - RawEventLocations=default_raw_event(bank_types=["HltDecReports"]), + RawEventLocations=default_raw_event(raw_event_format=options.input_raw_format, + bank_types=["HltDecReports"]), SourceID="Spruce", outputs={ "OutputHltDecReportsLocation": @@ -300,78 +299,43 @@ def set_hlt_config(config, options): return hlt_dec_reports, spruce_dec_reports -def set_evt_filters(options, hlt_dec_reports, spruce_dec_reports): - """ - Set a prefilter for each code listed in evt_pre_filters options. - The type of filter is chosen automatically according to the code selection. - - Args: - - options: list of DaVinci options. - - hlt_dec_reports: HltDecReportsDecoder containing the configuration for hlt2 lines. - - spruce_dec_reports: HltDecReportsDecoder containing the configuration for spruced lines. - - Returns: - - List of event pre-filters to be added to the configuration. - """ - filters = [] - code_filters = options.evt_pre_filters - for name, code in code_filters.items(): - if "Hlt" in code: - evt_filter = HDRFilter( - name="EventPreFilter_%s" %name, - Code=code, - Location=hlt_dec_reports.OutputHltDecReportsLocation) - elif "Spruce" in code: - evt_filter = HDRFilter( - name="EventPreFilter_%s" %name, - Code=code, - Location=spruce_dec_reports.OutputHltDecReportsLocation) - else: - evt_filter = VoidFilter( - name="EventPreFilter_%s" %name, - Code=code) - filters.append(evt_filter) - - return filters - - -def get_hltAnn_dict(hlt_annsvc_config): +def get_hltAnn_dict(annsvc_config): """ Extracts Hlt ANN dictionary from the given location. Args: - - hlt_annsvc_config: path to the .json file containing the HltAnnSvc configuration + - annsvc_config: path to the .json file containing the HltAnnSvc configuration Returns: - Dict with all the HLT2 locations. """ tck = {} - if "root://eoslhcb.cern.ch//" in hlt_annsvc_config: + if "root://eoslhcb.cern.ch//" in annsvc_config: with XRootD.client.File() as f: - status, _ = f.open(hlt_annsvc_config) + status, _ = f.open(annsvc_config) if not status.ok: - raise RuntimeError(f"could not open {hlt_annsvc_config}: {status.message}") + raise RuntimeError(f"could not open {annsvc_config}: {status.message}") status, data = f.read() if not status.ok: - raise RuntimeError(f"could not read {hlt_annsvc_config}: {status.message}") + raise RuntimeError(f"could not read {annsvc_config}: {status.message}") tck = json.loads(data.decode('utf-8')) - elif hlt_annsvc_config: - with open(os.path.expandvars(hlt_annsvc_config)) as f: + elif annsvc_config: + with open(os.path.expandvars(annsvc_config)) as f: tck = json.load(f) return tck -def set_hltAnn_svc(config, hlt_annsvc_config): +def set_hltAnn_svc(config, annsvc_config): """ Configures the Hlt ANN service to read correctly the spruced locations using the HltAnnSvc configuration of the HLT2 application. Args: - config: dict of configured Configurable instances. - - hlt_annsvc_config: path to the .json file containing the HltAnnSvc configuration. + - annsvc_config: path to the .json file containing the HltAnnSvc configuration. """ - tck = get_hltAnn_dict(hlt_annsvc_config) + tck = get_hltAnn_dict(annsvc_config) if tck: ann_config = tck["HltANNSvc/HltANNSvc"] @@ -388,14 +352,15 @@ def set_hltAnn_svc(config, hlt_annsvc_config): for k, v in ann_config["PackedObjectLocations"].items() } - config.add( - setup_component( - "HltANNSvc", - Hlt2SelectionID=hlt2_sel_ids, - SpruceSelectionID=spruce_sel_ids, - PackedObjectLocations=packed_object_locs + if config: + config.add( + setup_component( + "HltANNSvc", + Hlt2SelectionID=hlt2_sel_ids, + SpruceSelectionID=spruce_sel_ids, + PackedObjectLocations=packed_object_locs + ) ) - ) else: config.add(setup_component("HltANNSvc")) diff --git a/Phys/DaVinci/python/DaVinci/options_default.py b/Phys/DaVinci/python/DaVinci/options_default.py index b2314cbbd..ca2f4bffb 100644 --- a/Phys/DaVinci/python/DaVinci/options_default.py +++ b/Phys/DaVinci/python/DaVinci/options_default.py @@ -12,6 +12,12 @@ # Definitions of, and defaults for, the DaVinci application options. __optsDict__ = { + "annsvc_config": { + "text": + '"""Path to .json file containing HLT2 and Spruce configuration generated by ANNSvc when the .dst input file was created."""', + "value": + '' + }, "auditors": { "text": '"""List of auditors to run. Possible common choices include "NameAuditor", "MemoryAuditor", "ChronoAuditor". See Gaudi manual for a full list. Default = []."""', @@ -68,12 +74,6 @@ __optsDict__ = { '"""Tag for DQFLAGS. Default as set in DDDBConf for DataType."""', "value": '' }, - "enable_moore_location_filters": { - "text": - '"""Explicitly enable/disable filters on top of unpacking and tupling algorithms to check the particles location exists."""', - "value": - True - }, "enable_unpack": { "text": '"""Explicitly enable/disable unpacking for input data (if specified)"""', @@ -96,12 +96,6 @@ __optsDict__ = { '."""', "value": '' }, - "hlt2_annsvc_config": { - "text": - '"""Path to .json file containing HLT2 configuration generated by ANNSvc when the .dst input file was created."""', - "value": - '' - }, "ignore_dq_flags": { "text": '"""If False, process only events with good DQ. Default = False."""', -- GitLab From 1aabcbd7384d631a39a67f32789523c5cfdf9160 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Tue, 2 Nov 2021 16:29:04 +0000 Subject: [PATCH 25/38] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/DaVinci/-/jobs/17313703 --- .../tests/options/option_davinci_filters.py | 15 ++++++++++++--- .../tests/options/option_davinci_user_algs.py | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/DaVinciTests/tests/options/option_davinci_filters.py b/DaVinciTests/tests/options/option_davinci_filters.py index 80930840a..10bf0cf09 100644 --- a/DaVinciTests/tests/options/option_davinci_filters.py +++ b/DaVinciTests/tests/options/option_davinci_filters.py @@ -92,10 +92,19 @@ def main(): options.output_level = 3 hlt_dec_reports, spruce_dec_reports = set_hlt_config(options) - filter_B0DsK = add_filter("HDRFilter_B0DsK", "HLT_PASS('SpruceB2OC_BdToDsmK_DsmToHHH_FEST_LineDecision')", hlt_dec_reports, spruce_dec_reports) - filter_B0Dspi = add_filter("HDRFilter_B0Dspi", "HLT_PASS('SpruceB2OC_BdToDsmPi_DsmToHHH_LineDecision')", hlt_dec_reports, spruce_dec_reports) + filter_B0DsK = add_filter( + "HDRFilter_B0DsK", + "HLT_PASS('SpruceB2OC_BdToDsmK_DsmToHHH_FEST_LineDecision')", + hlt_dec_reports, spruce_dec_reports) + filter_B0Dspi = add_filter( + "HDRFilter_B0Dspi", + "HLT_PASS('SpruceB2OC_BdToDsmPi_DsmToHHH_LineDecision')", + hlt_dec_reports, spruce_dec_reports) tools = [] - algs = {"B0DsK": [filter_B0DsK, tuple_B0DsK], "B0Dspi": [filter_B0Dspi, tuple_B0Dspi]} + algs = { + "B0DsK": [filter_B0DsK, tuple_B0DsK], + "B0Dspi": [filter_B0Dspi, tuple_B0Dspi] + } return algs, tools diff --git a/DaVinciTests/tests/options/option_davinci_user_algs.py b/DaVinciTests/tests/options/option_davinci_user_algs.py index f938b8e31..ba54566b8 100644 --- a/DaVinciTests/tests/options/option_davinci_user_algs.py +++ b/DaVinciTests/tests/options/option_davinci_user_algs.py @@ -18,6 +18,7 @@ __date__ = "2021-03-31" from Gaudi.Configuration import ERROR from PyConf.Algorithms import Gaudi__Examples__VoidConsumer as VoidConsumer + def main(): # the "upfront_reconstruction" is what unpacks reconstruction objects, particles and primary vertices # from file and creates protoparticles. -- GitLab From 12ef12e5cb55bfcd7e1a2f076b0f7c39227a20a2 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Wed, 3 Nov 2021 10:24:13 +0100 Subject: [PATCH 26/38] fix test references --- .../davinci.qms/test_davinci_filters.qmt | 86 +++++++++---------- .../tests/refs/test_davinci_sprucing.ref | 44 +++++----- .../tests/refs/test_davinci_tupling.ref | 3 +- 3 files changed, 66 insertions(+), 67 deletions(-) diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt index 2c5bbc115..81fd54a41 100644 --- a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt +++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt @@ -37,49 +37,49 @@ ../options/option_davinci_filters:main -findReferenceBlock("""LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrack/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - MuonPIDUnpacker/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - RichPIDUnpacker/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__HDRFilter/HDRFilter_B0DsK #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| - FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| - LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrack/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - MuonPIDUnpacker/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - RichPIDUnpacker/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__HDRFilter/HDRFilter_B0Dspi #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| - FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| +findReferenceBlock("""LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__HDRFilter/HDRFilter_B0DsK #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| + FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| + LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__HDRFilter/HDRFilter_B0Dspi #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| + FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| """, stdout, result, causes, signature_offset = 0, id = "Stream3") diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 44d2eda64..301ce977b 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -106,28 +106,28 @@ 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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -LAZY_AND: DaVinci #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: FileSummaryRecords #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrack/UnpackTracks #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - MuonPIDUnpacker/UnpackMuonPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - RichPIDUnpacker/UnpackRichPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: FileSummaryRecords #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrackFunctional/UnpackTracks #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack&lt;LHCb__MuonPIDPacker&gt;/UnpackMuonPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + DataPacking__Unpack&lt;LHCb__RichPIDPacker&gt;/UnpackRichPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index 08db94d7b..2d97a3a97 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -1,6 +1,7 @@ INFO No MainOptions specified. DaVinci will import no options file! INFO User algorithm example-tupling-basic-run-mc.main imported successfully! /***** User DVAppOptions/DVAppOptions ************************************************************** +|-annsvc_config = '' (default: '') |-auditors = [] (default: []) |-buffer_events = 20000 (default: 20000) |-callgrind_profile = False (default: False) @@ -12,14 +13,12 @@ INFO User algorithm example-tupling-basic-run-mc.main imported successfully! |-detectors = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'] | (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']) |-dqflags_tag = '' (default: '') -|-enable_moore_location_filters = False (default: True) |-enable_unpack = False (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') |-evt_max = 10 (default: -1) |-evt_pre_filters = {} (default: {}) |-first_evt = 0 (default: 0) |-histo_file = 'DV-example-tupling-basic-his.root' (default: '') -|-hlt2_annsvc_config = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000004_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000043_1.ldst', 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000068_1.ldst'] | (default: []) -- GitLab From cefbb6807964cb850bd79dbb07ce49ab88795d39 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sat, 6 Nov 2021 17:25:38 +0100 Subject: [PATCH 27/38] small changes --- DaVinciTests/tests/refs/test_davinci_user_algs.ref | 1 + 1 file changed, 1 insertion(+) diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index b39ed71b7..428885626 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -61,6 +61,7 @@ RootHistSvc INFO Writing ROOT histograms to: DVHistos HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 +HiveDataBrokerSvc WARNING non-reentrant algorithm: LHCb::Hlt::PackedData::Decoder/HltPackedDataDecoder ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully -- GitLab From bd30be7cf51009ca085d8b54d37493a2ca008253 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sat, 6 Nov 2021 17:34:52 +0100 Subject: [PATCH 28/38] resolve conflicts --- .../tests/refs/test_davinci_sprucing.ref | 51 +++++++++++-------- .../tests/refs/test_davinci_tupling.ref | 44 +++++++++------- .../tests/refs/test_davinci_user_algs.ref | 30 ++++++++--- 3 files changed, 77 insertions(+), 48 deletions(-) diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 301ce977b..cdf6f6f8a 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -72,6 +72,10 @@ FunctorFactory INFO Cache miss for functor: ::Functors:: 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] B0DsK_Tuple INFO Finished initialisation: +HiveDataBrokerSvc WARNING non-reentrant algorithm: LHCb::Hlt::PackedData::Decoder/HltPackedDataDecoder +HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackParticlesAndVertices +HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter +HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -106,28 +110,31 @@ 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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -LAZY_AND: DaVinci #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: FileSummaryRecords #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack&lt;LHCb__MuonPIDPacker&gt;/UnpackMuonPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack&lt;LHCb__RichPIDPacker&gt;/UnpackRichPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: DVAnalysisNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackTracks #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + HltDecReportsDecoder/HltDecReportsDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: DVAlgNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: FSRNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: StandardAlgs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + GaudiHistoAlgorithm/SimpleHistos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index 2d97a3a97..d4ec26b27 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -74,6 +74,9 @@ DimuonsTuple INFO Instatiating ThOr functors! 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] DimuonsTuple INFO Finished initialisation: +HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter +HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos +HiveDataBrokerSvc WARNING non-reentrant algorithm: CombineParticles ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -90,25 +93,28 @@ UnpackRichPIDs SUCCESS #WARNINGS = 10 Message = 'I 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 )%| - 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 )%| - 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 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/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 )%| +LAZY_AND: DaVinci #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| + NONLAZY_OR: UserAnalysis #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| + LAZY_AND: DVAnalysisNode #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| + LAZY_AND: DVAlgNode #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| + LAZY_AND: FSRNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + GaudiHistoAlgorithm/SimpleHistos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| + 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 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + 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 )%| 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 diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index 428885626..4e13993c0 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -61,7 +61,10 @@ RootHistSvc INFO Writing ROOT histograms to: DVHistos HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' 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 HiveDataBrokerSvc WARNING non-reentrant algorithm: LHCb::Hlt::PackedData::Decoder/HltPackedDataDecoder +HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter +HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -71,13 +74,26 @@ EventSelector SUCCESS Reading Event record 1. Record numbe ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 -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=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: DVAnalysisNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: DVAlgNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: FSRNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + GaudiHistoAlgorithm/SimpleHistos #=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 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + 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 )%| ToolSvc INFO Removing all tools created by ToolSvc ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -- GitLab From 55d1eedfb51510fc1920cf8bbe4d6bc58faaa740 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sat, 6 Nov 2021 17:36:37 +0100 Subject: [PATCH 29/38] small changes --- DaVinciTests/tests/refs/test_davinci_user_algs.ref | 1 - 1 file changed, 1 deletion(-) diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index 4e13993c0..476f95684 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -62,7 +62,6 @@ HistogramPersistencySvc INFO Added successfully Conversion servic FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' 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 -HiveDataBrokerSvc WARNING non-reentrant algorithm: LHCb::Hlt::PackedData::Decoder/HltPackedDataDecoder HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully -- GitLab From b4b4dc8f2d4f71e9ba5c9b4145def4db948a4f69 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sun, 7 Nov 2021 10:21:49 +0100 Subject: [PATCH 30/38] fix sprucing test reference --- .../tests/refs/test_davinci_sprucing.ref | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index cdf6f6f8a..626e03503 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -110,31 +110,28 @@ 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=36 {B0_LOKI_MAXPT,B0_LOKI_Muonp_PT,B0_LOKI_Muonm_PT,B0_LOKI_NTRCKS_ABV_THRSHLD,B0_LOK} -LAZY_AND: DaVinci #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAnalysisNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrack/UnpackTracks #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - MuonPIDUnpacker/UnpackMuonPIDs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - RichPIDUnpacker/UnpackRichPIDs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - HltDecReportsDecoder/HltDecReportsDecoder #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAlgNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: FSRNode #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| - FunTupleBase_Particles/B0DsK_Tuple #=3 Sum=3 Eff=|( 100.0000 +- 0.00000 )%| +LAZY_AND: DaVinci #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: FileSummaryRecords #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackTracks #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| + FunTupleBase_Particles/B0DsK_Tuple #=5 Sum=5 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc RFileCnv INFO dumping contents of /NTUPLES/FILE1 TFile: name=sprucing_tuple.root, title=Gaudi Trees, option=CREATE @@ -153,4 +150,4 @@ UnpackParticlesAndVertices INFO Number of counters : 8 | "# UnPacked RecVertices" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "# UnPacked RichPIDs" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "# UnPacked Tracks" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Vertices" | 5 | 83 | 16.600 | 5.1225 | 10.000 | 24.000 | + | "# UnPacked Vertices" | 5 | 83 | 16.600 | 5.1225 | 10.000 | 24.000 | \ No newline at end of file -- GitLab From 22e8ac8f4992d2dc811c92f1f717873a181a1c5d Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Sun, 7 Nov 2021 10:37:03 +0100 Subject: [PATCH 31/38] fix test references --- .../tests/refs/test_davinci_tupling.ref | 41 +++++++++---------- .../tests/refs/test_davinci_user_algs.ref | 28 ++++--------- 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index d4ec26b27..9e498036e 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -93,28 +93,25 @@ UnpackRichPIDs SUCCESS #WARNINGS = 10 Message = 'I 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 )%| - NONLAZY_OR: UserAnalysis #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - LAZY_AND: DVAnalysisNode #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - LAZY_AND: DVAlgNode #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - LAZY_AND: FSRNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - 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 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - MuonPIDUnpacker/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - RichPIDUnpacker/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrack/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - 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 )%| +LAZY_AND: DaVinci #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| + 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 )%| + 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 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + 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 )%| 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 diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index 476f95684..af6ee1413 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -61,7 +61,6 @@ RootHistSvc INFO Writing ROOT histograms to: DVHistos HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' 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 HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully @@ -73,26 +72,13 @@ EventSelector SUCCESS Reading Event record 1. Record numbe ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 -LAZY_AND: DaVinci #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAnalysisNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: DVAlgNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: FSRNode #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: StandardAlgs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - GaudiHistoAlgorithm/SimpleHistos #=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 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - MuonPIDUnpacker/UnpackMuonPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - RichPIDUnpacker/UnpackRichPIDs #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrack/UnpackBestTracks #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| - 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 )%| +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=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully -- GitLab From 1861a5d1d267252ea60f2dbf30da3f8e89a49392 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Mon, 8 Nov 2021 15:56:13 +0100 Subject: [PATCH 32/38] small changes --- DaVinciTests/tests/refs/test_davinci_user_algs.ref | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index af6ee1413..962782331 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -74,10 +74,10 @@ FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 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 )%| + 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=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc ApplicationMgr INFO Application Manager Finalized successfully -- GitLab From b2288299fb21be4b11b716c7207236f466bea764 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Mon, 8 Nov 2021 22:24:30 +0100 Subject: [PATCH 33/38] small changes --- Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py index 8d52845fa..c8b08bd5c 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -16,8 +16,7 @@ from PyConf.Algorithms import EventAccounting from DaVinci.configOptions import (check_options, set_job_options, set_args_options, set_input_file_options) from DaVinci.algorithms import (setup_algorithms, define_fsr_writer, - setup_user_algorithms, set_hlt_config, - apply_filters_and_unpacking) + set_hlt_config, apply_filters_and_unpacking) from DaVinci.config import davinci_control_flow, prepare_davinci_nodes -- GitLab From d01e347cc30505877c1c2099438861dd54c992bc Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Tue, 9 Nov 2021 18:37:33 +0100 Subject: [PATCH 34/38] fix qmtests --- .../davinci.qms/test_davinci_filters.qmt | 86 +++++++++---------- .../tests/refs/test_davinci_sprucing.ref | 7 +- .../tests/refs/test_davinci_user_algs.ref | 9 +- 3 files changed, 47 insertions(+), 55 deletions(-) diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt index 81fd54a41..2c5bbc115 100644 --- a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt +++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt @@ -37,49 +37,49 @@ ../options/option_davinci_filters:main -findReferenceBlock("""LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| - NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| - LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__HDRFilter/HDRFilter_B0DsK #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| - FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| - LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| - LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackTrackFunctional/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| - LoKi__HDRFilter/HDRFilter_B0Dspi #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| - FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| +findReferenceBlock("""LAZY_AND: DaVinci #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + NONLAZY_OR: FileSummaryRecords #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: GenFSR #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + RecordStream/FSROutputStreamDstWriter #=24 Sum=24 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LAZY_AND: B0DsK #=24 Sum=21 Eff=|( 87.50000 +- 6.75077 )%| + LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__HDRFilter/HDRFilter_B0DsK #=22 Sum=21 Eff=|( 95.45455 +- 4.44095 )%| + FunTupleBase_Particles/B0DsK_Tuple #=21 Sum=21 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: B0Dspi #=24 Sum=14 Eff=|( 58.33333 +- 10.0635 )%| + LoKi__HDRFilter/Hlt2TopoLineFilter #=24 Sum=22 Eff=|( 91.66667 +- 5.64169 )%| + LHCb__UnpackRawEvent/UnpackRawEvent #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + HltPackedDataDecoder/HltPackedDataDecoder #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackTrack/UnpackTracks #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackRecVertex/UnpackPVs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackChargedProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackProtoParticle/UnpackNeutralProtos #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloElectrons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloMergedPi0s #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackCaloHypo/UnpackCaloSplitPhotons #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + MuonPIDUnpacker/UnpackMuonPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + RichPIDUnpacker/UnpackRichPIDs #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackParticlesAndVertices/UnpackParticlesAndVertices #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCParticle/UnpackMCParticle #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + UnpackMCVertex/UnpackMCVertex #=22 Sum=22 Eff=|( 100.0000 +- 0.00000 )%| + LoKi__HDRFilter/HDRFilter_B0Dspi #=22 Sum=14 Eff=|( 63.63636 +- 10.2559 )%| + FunTupleBase_Particles/B0Dspi_Tuple #=14 Sum=14 Eff=|( 100.0000 +- 0.00000 )%| """, stdout, result, causes, signature_offset = 0, id = "Stream3") diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index f97f56e00..44d2eda64 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -60,7 +60,6 @@ DetectorDataSvc SUCCESS Detector description database: git:/ NTupleSvc INFO Added stream file:sprucing_tuple.root as FILE1 RootHistSvc INFO Writing ROOT histograms to: sprucing_histos.root HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc -EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 B0DsK_Tuple INFO Initialising the FunTupleBase algorithm @@ -73,10 +72,6 @@ FunctorFactory INFO Cache miss for functor: ::Functors:: 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] B0DsK_Tuple INFO Finished initialisation: -HiveDataBrokerSvc WARNING non-reentrant algorithm: LHCb::Hlt::PackedData::Decoder/HltPackedDataDecoder -HiveDataBrokerSvc WARNING non-reentrant algorithm: UnpackParticlesAndVertices -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -151,4 +146,4 @@ UnpackParticlesAndVertices INFO Number of counters : 8 | "# UnPacked RecVertices" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "# UnPacked RichPIDs" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | | "# UnPacked Tracks" | 5 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 | - | "# UnPacked Vertices" | 5 | 83 | 16.600 | 5.1225 | 10.000 | 24.000 | \ No newline at end of file + | "# UnPacked Vertices" | 5 | 83 | 16.600 | 5.1225 | 10.000 | 24.000 | diff --git a/DaVinciTests/tests/refs/test_davinci_user_algs.ref b/DaVinciTests/tests/refs/test_davinci_user_algs.ref index e6920bfc9..b39ed71b7 100644 --- a/DaVinciTests/tests/refs/test_davinci_user_algs.ref +++ b/DaVinciTests/tests/refs/test_davinci_user_algs.ref @@ -61,9 +61,6 @@ RootHistSvc INFO Writing ROOT histograms to: DVHistos HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' 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 -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -75,10 +72,10 @@ FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 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 )%| + 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=10 Eff=|( 100.0000 +- 0.00000 )%| - LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + NONLAZY_OR: UserAnalysis #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| + LAZY_AND: UserAlgorithms #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer #=10 Sum=10 Eff=|( 100.0000 +- 0.00000 )%| ToolSvc INFO Removing all tools created by ToolSvc ApplicationMgr INFO Application Manager Finalized successfully -- GitLab From cb0ec81e55432ea2b578924d36257cd54ed1916f Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Wed, 10 Nov 2021 17:14:06 +0100 Subject: [PATCH 35/38] fix for not-spruced .dst unpacking --- Phys/DaVinci/python/DaVinci/algorithms.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index b0e840792..a029b64d6 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -238,6 +238,10 @@ def unpack_locations(options): stream_psandvs = get_option_value(options, "unpack_stream") stream = "%s/HLT2" % stream_psandvs + # For standard Hlt2 .dst file we just need of a single stream + if not "Spruce" in stream_psandvs: + stream_psandvs = "" + unpack_raw_event = LHCb__UnpackRawEvent( name='UnpackRawEvent', BankTypes=['ODIN'], -- GitLab From 837ca3f60ecb348133f20c1b3934b70a8bb53679 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Wed, 10 Nov 2021 17:56:29 +0100 Subject: [PATCH 36/38] fix linting --- Phys/DaVinci/python/DaVinci/algorithms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Phys/DaVinci/python/DaVinci/algorithms.py b/Phys/DaVinci/python/DaVinci/algorithms.py index a029b64d6..79d5b21b9 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -239,7 +239,7 @@ def unpack_locations(options): stream = "%s/HLT2" % stream_psandvs # For standard Hlt2 .dst file we just need of a single stream - if not "Spruce" in stream_psandvs: + if "Spruce" not in stream_psandvs: stream_psandvs = "" unpack_raw_event = LHCb__UnpackRawEvent( -- GitLab From 7ad72de1a616c6486a62a9eec198a2ba8c842ea0 Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Thu, 11 Nov 2021 10:22:15 +0100 Subject: [PATCH 37/38] fix test reference --- .../tests/refs/test_davinci_sprucing.ref | 22 ------------------- .../tests/refs/test_davinci_tupling.ref | 7 ------ 2 files changed, 29 deletions(-) diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 44d2eda64..244ba9318 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -62,16 +62,9 @@ RootHistSvc INFO Writing ROOT histograms to: sprucing HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 -B0DsK_Tuple INFO Initialising the FunTupleBase algorithm -B0DsK_Tuple INFO Conducting checks with LoKi -B0DsK_Tuple INFO Conducting checks with ThOr -B0DsK_Tuple INFO Setting the properties of ParticleTupleProp objects! -B0DsK_Tuple INFO Instatiating LoKi functors! -B0DsK_Tuple INFO Instatiating ThOr functors! FunctorFactory INFO Cache miss for functor: ::Functors::Composite::Mass{}, now trying cling with headers [Event/Particle.h, Functors/Composite.h] 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] -B0DsK_Tuple INFO Finished initialisation: ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -80,26 +73,11 @@ EventSelector INFO Stream:EventSelector.DataStreamTool_ EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... RFileCnv INFO opening Root file "sprucing_tuple.root" for writing -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 3. Record number within stream 1: 3 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 4. Record number within stream 1: 4 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 5. Record number within stream 1: 5 -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. -B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index a8f3d37e9..17a642cd0 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -65,15 +65,8 @@ EventClockSvc.FakeEventTime INFO Event times generated from 0 with st 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 -DimuonsTuple INFO Initialising the FunTupleBase algorithm -DimuonsTuple INFO Conducting checks with LoKi -DimuonsTuple INFO Conducting checks with ThOr -DimuonsTuple INFO Setting the properties of ParticleTupleProp objects! -DimuonsTuple INFO Instatiating LoKi functors! -DimuonsTuple INFO Instatiating ThOr functors! 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] -DimuonsTuple INFO Finished initialisation: HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos HiveDataBrokerSvc WARNING non-reentrant algorithm: CombineParticles -- GitLab From 2771c4ae666b6bb0467c37467bc64120dab8582f Mon Sep 17 00:00:00 2001 From: Davide Fazzini Date: Thu, 11 Nov 2021 11:30:04 +0100 Subject: [PATCH 38/38] fixed references --- .../tests/refs/test_davinci_sprucing.ref | 22 +++++++++++++++++++ .../tests/refs/test_davinci_tupling.ref | 10 ++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/DaVinciTests/tests/refs/test_davinci_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 244ba9318..44d2eda64 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -62,9 +62,16 @@ RootHistSvc INFO Writing ROOT histograms to: sprucing HistogramPersistencySvc INFO Added successfully Conversion service:RootHistSvc FSROutputStreamDstWriter INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc' EventClockSvc.FakeEventTime INFO Event times generated from 0 with steps of 0 +B0DsK_Tuple INFO Initialising the FunTupleBase algorithm +B0DsK_Tuple INFO Conducting checks with LoKi +B0DsK_Tuple INFO Conducting checks with ThOr +B0DsK_Tuple INFO Setting the properties of ParticleTupleProp objects! +B0DsK_Tuple INFO Instatiating LoKi functors! +B0DsK_Tuple INFO Instatiating ThOr functors! FunctorFactory INFO Cache miss for functor: ::Functors::Composite::Mass{}, now trying cling with headers [Event/Particle.h, Functors/Composite.h] 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] +B0DsK_Tuple INFO Finished initialisation: ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully @@ -73,11 +80,26 @@ EventSelector INFO Stream:EventSelector.DataStreamTool_ EventSelector SUCCESS Reading Event record 1. Record number within stream 1: 1 HltPackedDataDecoder WARNING TCK in rawbank seems to be 0 -- blindly ASSUMING that the current HltANNSvc somehow has the same configuration as when the input data was written. Proceed at your own risk, good luck... RFileCnv INFO opening Root file "sprucing_tuple.root" for writing +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. RCWNTupleCnv INFO Booked TTree with ID: DecayTree "DecayTree" in directory sprucing_tuple.root:/B0DsK_Tuple EventSelector SUCCESS Reading Event record 2. Record number within stream 1: 2 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 3. Record number within stream 1: 3 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 4. Record number within stream 1: 4 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. EventSelector SUCCESS Reading Event record 5. Record number within stream 1: 5 +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. +B0DsK_Tuple INFO Multiple particles match the decay descriptor. All candidates info will be stored with a suffix. ApplicationMgr INFO Application Manager Stopped successfully FSROutputStreamDstWriter INFO Set up File Summary Record FSROutputStreamDstWriter INFO Events output: 1 diff --git a/DaVinciTests/tests/refs/test_davinci_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index 17a642cd0..86f31c352 100644 --- a/DaVinciTests/tests/refs/test_davinci_tupling.ref +++ b/DaVinciTests/tests/refs/test_davinci_tupling.ref @@ -65,11 +65,15 @@ EventClockSvc.FakeEventTime INFO Event times generated from 0 with st 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 +DimuonsTuple INFO Initialising the FunTupleBase algorithm +DimuonsTuple INFO Conducting checks with LoKi +DimuonsTuple INFO Conducting checks with ThOr +DimuonsTuple INFO Setting the properties of ParticleTupleProp objects! +DimuonsTuple INFO Instatiating LoKi functors! +DimuonsTuple INFO Instatiating ThOr functors! 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] -HiveDataBrokerSvc WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter -HiveDataBrokerSvc WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos -HiveDataBrokerSvc WARNING non-reentrant algorithm: CombineParticles +DimuonsTuple INFO Finished initialisation: ApplicationMgr INFO Application Manager Initialized successfully DeFTDetector INFO Current FT geometry version = 63 ApplicationMgr INFO Application Manager Started successfully -- GitLab