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 163be169c1029c912240ce4ff3b1cc6040356c47..28b476003736d4121335c4c21c13d7047c242f1a 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,27 @@ 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/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml b/DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml index e565b8c0054c5c457c607b893699b61dca1874d2..b7a97d810b7f0fd230ce4e58557a9c53724385ea 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,10 @@ # or submit itself to any jurisdiction. # ############################################################################### +enable_unpack: 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/python/DaVinciTests/QMTest/DaVinciExclusions.py b/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py index 3d436fc506caddc4b5ae363d0cc7dd1a5f90eba6..eb2a2898d85bbbbaa49d38d55e5de7a984c92bf0 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([" D_s- K+]CC", + 'Ds': "[B0 -> ^D_s- K+]CC", + 'Kp': "[B0 -> D_s- ^K+]CC" +} + +branches_dspi = { + 'B0': "[B0 -> D_s- pi+]CC", + 'Ds': "[B0 -> ^D_s- pi+]CC", + 'pip': "[B0 -> D_s- ^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_dspi = { + 'ALL': variables_all, #adds variables to all branches + 'B0': variables, + 'Ds': variables_extra, + 'pip': 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_B0Dspi = Funtuple( + name="B0Dspi_Tuple", + tree_name="DecayTree", + branches=branches_dspi, + variables=variables_dspi, + loki_preamble=loki_preamble, + inputs=bd2dspi_line) + +evt_filter = "HLT_PASS('Hlt2Topo2BodyLineDecision')" + + +def main(): + from DaVinci import options + options.evt_max = -1 + 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": [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 e08e285ca6314f3731d1a6a732299caac955d17d..3f9622ed72986104ce0cd1b1521bca43a9712886 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 -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_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' -unpack_stream: '/Event/Spruce' +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 496aa619d7ad89ff0854c7d8b33297aba4b4a539..ba54566b8f8d5391f5490a3df9678415bf9749bf 100644 --- a/DaVinciTests/tests/options/option_davinci_user_algs.py +++ b/DaVinciTests/tests/options/option_davinci_user_algs.py @@ -15,14 +15,15 @@ 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 2f8c37b1e6c3187036772ea1b3e7d5ad31981ecb..be0f0192e3bc5310891b5a48e18a078b64b3e3d2 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 new file mode 100644 index 0000000000000000000000000000000000000000..2c5bbc115dd96294525042d48b13d9e61bb6ef05 --- /dev/null +++ b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_filters.qmt @@ -0,0 +1,85 @@ + + + + + + davinci + + run-mc + --inputfiledb + FEST_October_2021_dst + ../../../Phys/DaVinci/options/DaVinciDB-Example.yaml + --joboptfile + ../options/option_davinci_sprucing.yaml + --user_algorithms + ../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 )%| +""", stdout, result, causes, signature_offset = 0, id = "Stream3") + + diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_sprucing.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_davinci_sprucing.qmt index 97f248b9c36385066ff14611a30c29d4d1f748e3..538013b784cd855cdf65ae27906ebf5d25533951 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-FSRs-aftermerge.ref b/DaVinciTests/tests/refs/test-FSRs-aftermerge.ref index ddc7a9812b59de13c2ccd2f3b331ca9de08795b0..ce512c94dd01a86dbd87a4238182594f6c367836 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 53b79fc4b06ee08d77441a8223e0b95faa40da42..6053a6a3fa364ea9abde4e344c7eb17ef6bfe622 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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,53 +61,22 @@ 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 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 )%| + 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 -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 5454205549f25b15318acd114f39df16ec91cdfa..b3423a60bb940fd5d104935242ef0ab89bf22e2e 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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 2c4cfd4cfbf320bd0a3717500453e8196042b835..f5cfdb26a0cb172cca3026cfa48224dc14cf0dd4 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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: []) @@ -57,46 +57,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 44b4684a354539cbf506d3648341f554554c7c10..e5fb7554e00b7c49b533b54cdf525ec0f040924e 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (default: '') |-ignore_dq_flags = False (default: False) |-input_files = ['root://eoslhcb.cern.ch//eos/lhcb/wg/HLT/UpgradeMinbias/00069155_00000021_2.ldst'] | (default: []) @@ -57,46 +57,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 04fde416f83545d16d84447b47c370cc0d5a54cb..38193cb5dce58c5c9612e14bde4dbe9cbc7deed4 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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: []) @@ -57,46 +57,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 c7a78439d3a909b4ea518bf8aa43241dac3ed31e..3c715c7bc198a26aeab16650d4e7734d1d6896a0 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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: []) @@ -57,46 +57,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 2248c077fb77b7ba5d0f0988f56597f4a5df34d7..c86426a6e473f310b9fe1c65ddf2b626d5816b2f 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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: []) @@ -57,46 +57,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_sprucing.ref b/DaVinciTests/tests/refs/test_davinci_sprucing.ref index 51adea672e437c8b9af315948c3c7c72d6174ae2..44d2eda645149b6adc044c243673bbec48149730 100644 --- a/DaVinciTests/tests/refs/test_davinci_sprucing.ref +++ b/DaVinciTests/tests/refs/test_davinci_sprucing.ref @@ -1,28 +1,27 @@ 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) -|-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_unpack = True (default: True) |-event_store = 'HiveWhiteBoard' (default: 'HiveWhiteBoard') -|-evt_max = 3 (default: -1) +|-evt_max = 5 (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' -| (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 = ['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') @@ -61,8 +60,8 @@ 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 B0DsK_Tuple INFO Conducting checks with LoKi B0DsK_Tuple INFO Conducting checks with ThOr @@ -72,30 +71,18 @@ 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: -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 = 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='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 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 +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. @@ -105,42 +92,46 @@ 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. 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: 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 NTupleSvc INFO NTuples saved successfully -ChronoStatSvc.finalize() INFO Service finalized successfully ApplicationMgr INFO Application Manager Finalized successfully ApplicationMgr INFO Application Manager Terminated successfully ToolSvc.HybridFactory INFO Number of counters : 1 @@ -148,34 +139,11 @@ ToolSvc.HybridFactory INFO Number of counters : 1 | "# 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 | -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 | + | "# 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 a8d12872e3fbf1c2637397f51f884c3b0e42722b..39cc3296eeb2f80f00b5e37319da4a1417f8e490 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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,53 +61,22 @@ 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 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 )%| + 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_tupling.ref b/DaVinciTests/tests/refs/test_davinci_tupling.ref index 0a3f0b4b04c8f415c08bab25b423d4c4de8c5506..86f31c352edc2294f75bc87628b40d81a592134a 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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: []) @@ -45,7 +45,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: '') @@ -73,21 +73,13 @@ 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: CombineParticles 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 ! 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 @@ -97,33 +89,29 @@ FSROutputStreamDstWriter INFO Events output: 1 DimuonsTuple SUCCESS Booked 1 N-Tuples and 0 Event Tag Collections DimuonsTuple SUCCESS List of booked N-Tuples in directory "FILE1/DimuonsTuple" DimuonsTuple SUCCESS ID=DecayTree Title="DecayTree" #items=10 {Jpsi_LOKI_P,Jpsi_LOKI_PT,Jpsi_LOKI_Muonp_PT,Jpsi_LOKI_Muonm_PT,Jpsi_LOKI_MAXPT,Jp} -LAZY_AND: DaVinci #=10 Sum=3 Eff=|( 30.00000 +- 14.4914 )%| - 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 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 @@ -167,26 +155,3 @@ UnpackMuonPIDs INFO Number of counters : 1 UnpackMuonTracks INFO Number of counters : 1 | Counter | # | sum | mean/eff^* | rms/err^* | min | max | | "# Unpacked Tracks" | 10 | 156 | 15.600 | -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 51acf8190ff1c2ef142877228e2ca5bf96ad8c48..b39ed71b78a163091bc6bb8708ccdaede6aea4db 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) @@ -15,10 +16,9 @@ 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: '') -|-hlt2_annsvc_selid = '' (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,75 +61,22 @@ 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 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: 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 -ChronoStatSvc.finalize() INFO Service finalized successfully 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 | -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/DaVinciDB-Example.yaml b/Phys/DaVinci/options/DaVinciDB-Example.yaml index 4a21f329589a69ed05b54d93c6d1010ec955e4ce..5027fcfcbe8ad70afbd27a7782d03e5cfa2be394 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' + - 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/OctoberFEST/test_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 f0c487f24ad4d20269beab0505f75f2dce4ef24d..5444a473463d13f84b97a454fd8ddda4c94bef9b 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: [] @@ -44,18 +47,15 @@ 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 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."""' - value: '' ignore_dq_flags: text: '"""If False, process only events with good DQ. Default = False."""' value: False @@ -118,4 +118,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 aa382fb22c906c5447bffc7f4fe6eb42bdddc3ba..515e30ac34e46adaef2a3b752c335d2c8982271f 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_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 a1dea3180821cb37a30dcfaa11ac4c04dabe2b50..c8b08bd5c1a99b320e52efe614879686aa0877e8 100644 --- a/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py +++ b/Phys/DaVinci/python/DaVinci/ConfigurationUpgrade.py @@ -12,10 +12,11 @@ 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, unpack_locations +from DaVinci.algorithms import (setup_algorithms, define_fsr_writer, + set_hlt_config, apply_filters_and_unpacking) from DaVinci.config import davinci_control_flow, prepare_davinci_nodes @@ -31,36 +32,30 @@ def add_davinci_configurables(options): - ComponentConfig: Dict of configured Gaudi and DaVinci Configurable instances and user algorithms. """ dvMainFlow = {} - dvAnaNode = "DVAnalysisNode" + fsrAlgs = {} userAlgs, publicTools = setup_algorithms(options) - check_options(options) - config = configure_input(options) - dvMainFlow[dvAnaNode] = [] - if options.enable_unpack: - dvMainFlow[dvAnaNode] += unpack_locations(config, options) - - dvAlgs = {} - if options.simulation and options.write_fsr: - fsrAlgs = {"FSRNode": define_fsr_writer(options)} - dvAlgs.update(fsrAlgs) - - 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] + + 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)) + + if options.write_fsr: + if options.simulation: + fsrAlgs.update({"GenFSR": define_fsr_writer(options)}) + + if options.lumi: + fsrAlgs.update({"Lumi": [EventAccounting(name='EventAccount')]}) + # this should be modified to reflect LumiAlgsConf (configured separately?) + 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 9f023925043616fa84c732c98a59cc9a2bca93d4..79d5b21b9d721a5b335c4eb1bf6c407aa3825b1b 100644 --- a/Phys/DaVinci/python/DaVinci/algorithms.py +++ b/Phys/DaVinci/python/DaVinci/algorithms.py @@ -10,13 +10,14 @@ ############################################################################### import os, sys, importlib, json, XRootD.client -from Gaudi.Configuration import INFO from GaudiKernel.ProcessJobOptions import importOptions from PyConf.components import setup_component +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 - + def setup_algorithms(options): """ Set DaVinci algorithms. @@ -28,8 +29,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 = {} @@ -41,30 +40,86 @@ 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( "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) + if type(userAlgs) == list: userAlgs = {"UserAlgorithms": userAlgs} - dvAlgs.update(userAlgs) return dvAlgs, publicTools +def add_filter(name, code, hlt_dec_reports, spruce_dec_reports): + """ + Adding HDR filter to FunTuple algorithms checking is the corresponding SpruceLine fired. + + Args: + - 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: + - Filter with name and code defined by the user. + """ + 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: + algFilter = VoidFilter(name=name, Code=code) + + return algFilter + + +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 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. + """ + alg_filterd_dict = {} + for name, algs in algs_dict.items(): + algs_list = [] + if options.evt_pre_filters: + 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 + + if options.enable_unpack: + algs_list += unpack_locations(options) + algs_list += algs + + alg_filterd_dict[name] = algs_list + + return alg_filterd_dict + + def define_fsr_writer(options): """ Define Generator FSR writer. @@ -75,10 +130,11 @@ 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 = [] - if get_option_value(options, "merge_genfsr"): + if options.merge_genfsr and options.simulation: mergeGenfsr = GenFSRMerge(name="GenFSRMerge") algs.append(mergeGenfsr) @@ -106,16 +162,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: @@ -166,80 +220,151 @@ 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. + (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 HltDecReportsDecoder - 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 - 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") 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")) - }) - reading_algs += [dec_reports] + # For standard Hlt2 .dst file we just need of a single stream + if "Spruce" not in stream_psandvs: + stream_psandvs = "" - reading_algs = [reading.decoder( + unpack_raw_event = LHCb__UnpackRawEvent( + name='UnpackRawEvent', + BankTypes=['ODIN'], + RawEventLocation=default_raw_event(['ODIN']), + RawBankLocations=['/Event/DAQ/RawBanks/ODIN']) + + reading_algs = [unpack_raw_event] + + 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 get_hltAnn_dict(location): +def set_hlt_config(options, config=None): + """ + Set the Hlt service and algorithms. + + Args: + - options: list of DaVinci options. + - config: dict of configured Configurable instances. + + Returns: + - 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 + annsvc_config = get_option_value(options, "annsvc_config") + + if config: + set_hltAnn_svc(config, annsvc_config) + + hlt_dec_reports = HltDecReportsDecoder( + RawEventLocations=default_raw_event(raw_event_format=options.input_raw_format, + bank_types=["HltDecReports"]), + SourceID='Hlt2', + outputs={ + "OutputHltDecReportsLocation": + force_location("/Event/Hlt2/DecReports") + }) + + spruce_dec_reports = HltDecReportsDecoder( + RawEventLocations=default_raw_event(raw_event_format=options.input_raw_format, + bank_types=["HltDecReports"]), + SourceID="Spruce", + outputs={ + "OutputHltDecReportsLocation": + force_location("/Event/Spruce/DecReports") + }) + + return hlt_dec_reports, spruce_dec_reports + + +def get_hltAnn_dict(annsvc_config): """ Extracts Hlt ANN dictionary from the given location. + + Args: + - 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 annsvc_config: with XRootD.client.File() as f: - status, _ = f.open(location) + status, _ = f.open(annsvc_config) if not status.ok: - raise RuntimeError(f"could not open {location}: {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 {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 {annsvc_config}: {status.message}") + tck = json.loads(data.decode('utf-8')) + elif annsvc_config: + with open(os.path.expandvars(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, 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. + - 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(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() + } + + 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/config.py b/Phys/DaVinci/python/DaVinci/config.py index 66ff329ea80f265ab8d91bffeddd7d001ba089a5..309a279a7178da70099471c63b5d6ece375824f3 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 @@ -84,7 +83,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 +117,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/configOptions.py b/Phys/DaVinci/python/DaVinci/configOptions.py index c347b938c05f342306eae13a02b6884851f5a684..733e0810722113cf1235cceafb7b493ec3eff37a 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 3e2c09a0e7d2dd448f67a310461fd21f5df9a2e2..ca2f4bffb25ee23f8fc5a0bc0838210c29fd5f14 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 = []."""', @@ -74,6 +80,11 @@ __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."""', @@ -85,18 +96,6 @@ __optsDict__ = { '."""', "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."""', - "value": - '' - }, "ignore_dq_flags": { "text": '"""If False, process only events with good DQ. Default = False."""',