Merge branch 'dfazzini_simplify_useralgs' into 'master'

Simplify user algs functions

See merge request !535

DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc.py

+###############################################################################
+# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration           #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+"""
+Example of a typical DaVinci job:
+ - selection of two detached opposite-charge muons
+ - tuple of the selected candidates
+
+ This example is meant to be run with
+    $ ./run davinci run-mc --testfiledb Upgrade_Bd2KstarMuMu $DAVINCIROOT/options/DaVinciDB-Example.yaml --user_algorithms example-tupling-advanced-run-mc:main
+"""
+
+__author__ = "Davide Fazzini"
+__date__ = "2021-06-18"
+
+import Functors as F
+from PyConf.Algorithms import FunTuple_Particles as FunTuple
+from DaVinci.standard_particles import make_detached_mumu, make_KsDD
+from DaVinci.reco_objects import upfront_reconstruction_from_file as upfront_reconstruction
+from FunTuple import ParticleTupleProp, convert_to_parsable_objs
+
+
+# Define an helper function for creating the tuple
+def CreateSimpleTuple(name, tree_name, parsable_objs, loki_preamble, inputs):
+    ftup = FunTuple(
+        name=name,
+        tree_name=tree_name,
+        branch_names_prefix=parsable_objs[0],
+        decay_descriptors=parsable_objs[1],
+        loki_functors=parsable_objs[2][0],
+        loki_functor_branch_names=parsable_objs[2][1],
+        thor_functors=parsable_objs[3][0],
+        thor_functor_branch_names=parsable_objs[3][1],
+        loki_preamble=loki_preamble,
+        input_location=inputs)
+    return ftup
+
+
+# Prepare the node with the selection
+dimuons = make_detached_mumu()
+kshorts = make_KsDD()
+
+#FunTuple: define list of preambles for loki
+loki_preamble = ['TRACK_MAX_PT = MAXTREE(ISBASIC & HASTRACK, PT, -1)']
+#FunTuple: Jpsi info
+ParticleJpsi = ParticleTupleProp(
+    branch_name_prefix="Jpsi",
+    decay_descriptor="J/psi(1S) -> mu+ mu-",
+    #Dict -> {name:functor}
+    particle_code_loki={
+        'LOKI_P': 'P',
+        'LOKI_PT': 'PT',
+        'LOKI_Muonp_PT': 'CHILD(PT, 1)',
+        'LOKI_Muonm_PT': 'CHILD(PT, 2)',
+        'LOKI_MAXPT': 'TRACK_MAX_PT',
+        'LOKI_N_HIHGPT_TRCKS': 'NINTREE(ISBASIC & HASTRACK & (PT > 1500*MeV))'
+    },
+    particle_code_thor={
+        'THOR_P': F.P,
+        'THOR_PT': F.PT
+    })
+
+#FunTuple: Mu plus info: Can also muon and make a seperate ParticleTupleProp object
+ParticleMuPlus = ParticleTupleProp(
+    branch_name_prefix="MuPlus",
+    decay_descriptor="J/psi(1S) -> ^mu+ mu-",
+    particle_code_loki={'LOKI_P': 'P'},
+    particle_code_thor={'THOR_P': F.P})
+
+#FunTuple: Do not need to do this if a custom gaudi property for ParticleTupleProp is implemented
+parsable_objs_dimuons = convert_to_parsable_objs(
+    [ParticleJpsi, ParticleMuPlus])
+ftup_dimuons = CreateSimpleTuple("DimuonsTuple", "DecayTree",
+                                 parsable_objs_dimuons, loki_preamble, dimuons)
+
+ParticleKS = ParticleTupleProp(
+    branch_name_prefix="Ks",
+    decay_descriptor="KS0 -> pi+ pi-",
+    #Dict -> {name:functor}
+    particle_code_loki={
+        'LOKI_P': 'P',
+        'LOKI_PT': 'PT',
+        'LOKI_Muonp_PT': 'CHILD(PT, 1)',
+        'LOKI_Muonm_PT': 'CHILD(PT, 2)',
+        'LOKI_MAXPT': 'TRACK_MAX_PT',
+        'LOKI_N_HIHGPT_TRCKS': 'NINTREE(ISBASIC & HASTRACK & (PT > 1500*MeV))'
+    },
+    particle_code_thor={
+        'THOR_P': F.P,
+        'THOR_PT': F.PT
+    })
+parsable_objs_kshorts = convert_to_parsable_objs([ParticleKS])
+ftup_kshorts = CreateSimpleTuple("KsTuple", "DecayTree", parsable_objs_kshorts,
+                                 loki_preamble, kshorts)
+
+
+def main():
+    from DaVinci import options
+    options.evt_max = 10
+    options.ntuple_file = 'DV-example-tupling-advanced-ntp.root'
+    options.histo_file = 'DV-example-tupling-advanced-his.root'
+    options.input_raw_format = 4.3
+    options.lumi = False
+
+    tools = []
+    algs = {
+        "Reco": upfront_reconstruction(),
+        "DiMuons": upfront_reconstruction() + [dimuons, ftup_dimuons],
+        "KShorts": upfront_reconstruction() + [kshorts, ftup_kshorts]
+    }
+    return algs, tools

DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.py

+###############################################################################
+# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration           #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+"""
+Example of a typical DaVinci job:
+ - selection of two detached opposite-charge muons
+ - tuple of the selected candidates
+
+ This example is meant to be run with
+    $ ./run davinci run-mc --simplejob --testfiledb Upgrade_Bd2KstarMuMu --joboptfile example-tupling-basic.yaml --user_algorithms example-tupling-basic-run-mc:main
+"""
+
+__author__ = "Maurizio Martinelli"
+__date__ = "2021-05-03"
+
+import Functors as F
+from PyConf.Algorithms import FunTuple_Particles as FunTuple
+from DaVinci.standard_particles import make_detached_mumu
+from DaVinci.reco_objects import upfront_reconstruction_from_file as upfront_reconstruction
+from FunTuple import ParticleTupleProp, convert_to_parsable_objs
+
+
+# Define a helper function to create the FunTuple instance
+def CreateSimpleTuple(name, tree_name, parsable_objs, loki_preamble, inputs):
+    ftup = FunTuple(
+        name=name,
+        tree_name=tree_name,
+        branch_names_prefix=parsable_objs[0],
+        decay_descriptors=parsable_objs[1],
+        loki_functors=parsable_objs[2][0],
+        loki_functor_branch_names=parsable_objs[2][1],
+        thor_functors=parsable_objs[3][0],
+        thor_functor_branch_names=parsable_objs[3][1],
+        loki_preamble=loki_preamble,
+        input_location=inputs)
+    return ftup
+
+
+# Prepare the node with the selection
+dimuons = make_detached_mumu()
+
+#FunTuple: define list of preambles for loki
+loki_preamble = ['TRACK_MAX_PT = MAXTREE(ISBASIC & HASTRACK, PT, -1)']
+#FunTuple: Jpsi info
+ParticleJpsi = ParticleTupleProp(
+    branch_name_prefix="Jpsi",
+    decay_descriptor="J/psi(1S) -> mu+ mu-",
+    #Dict -> {name:functor}
+    particle_code_loki={
+        'LOKI_P': 'P',
+        'LOKI_PT': 'PT',
+        'LOKI_Muonp_PT': 'CHILD(PT, 1)',
+        'LOKI_Muonm_PT': 'CHILD(PT, 2)',
+        'LOKI_MAXPT': 'TRACK_MAX_PT',
+        'LOKI_N_HIHGPT_TRCKS': 'NINTREE(ISBASIC & HASTRACK & (PT > 1500*MeV))'
+    },
+    particle_code_thor={
+        'THOR_P': F.P,
+        'THOR_PT': F.PT
+    })
+
+#FunTuple: Mu plus info: Can also muon and make a seperate ParticleTupleProp object
+ParticleMuPlus = ParticleTupleProp(
+    branch_name_prefix="MuPlus",
+    decay_descriptor="J/psi(1S) -> ^mu+ mu-",
+    particle_code_loki={'LOKI_P': 'P'},
+    particle_code_thor={'THOR_P': F.P})
+
+#FunTuple: Do not need to do this if a custom gaudi property for ParticleTupleProp is implemented
+parsable_objs_dimuons = convert_to_parsable_objs(
+    [ParticleJpsi, ParticleMuPlus])
+ftup_dimuons = CreateSimpleTuple("DimuonsTuple", "DecayTree",
+                                 parsable_objs_dimuons, loki_preamble, dimuons)
+
+
+def main():
+    tools = []
+    algs = upfront_reconstruction() + [dimuons, ftup_dimuons]
+    return algs, tools

Phys/DaVinci/python/DaVinci/configurations.py → DaVinciExamples/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml

@@ -8,35 +8,9 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-"""
-Define configurations for applications, algorithms and external services.
-"""
 
-################################################################################
-# Define configurations for external services
-#
-
-
-def configure_file_record_data(rootSvc, fileDataSvc):
-    """
-    Configure File Record Data service.
-    """
-    rootSvc.CacheBranches = []
-    rootSvc.EnableIncident = True
-    rootSvc.VetoBranches = ["*"]
-
-    fileDataSvc.EnableFaultHandler = True
-    fileDataSvc.ForceLeaves = True
-    fileDataSvc.PersistencySvc = "PersistencySvc/FileRecordPersistencySvc"
-    fileDataSvc.RootCLID = 1
-
-
-def configure_xml(xmlSvc, xmlParser):
-    """
-    Configure xml services.
-    """
-    xmlSvc.AllowGenericConversion = True
-
-    xmlParser.CacheBehavior = 3
-    xmlParser.EntityResolver = "EntityResolverDispatcher/EntityResolverDispatcher"
-    xmlParser.MaxDocNbInCache = 15
+evt_max: 10
+ntuple_file: 'DV-example-tupling-basic-ntp.root'
+histo_file: 'DV-example-tupling-basic-his.root'
+input_raw_format: 4.3
+lumi: False

DaVinciSys/scripts/davinci

@@ -26,8 +26,10 @@ A DaVinci job using simulated data can be run using the command line:
 """
 
 import os, sys, click
-from DaVinci.utilities_script import dump_call, get_configurable_opts
+from DaVinci.utilities_script import dump_call, get_configurable_opts, set_testfiledb
 from DaVinci.ConfigurationUpgrade import run_davinci
+from DaVinci.config import options
+from DaVinci.optionChecker import log_click
 
 if "GAUDIAPPVERSION" in os.environ:
     APP_VERSION = str(os.environ["GAUDIAPPVERSION"])
@@ -77,16 +79,41 @@ def run_job(configurables, export=None, with_defaults=False, dry_run=None):
         "ApplicationMgr.AppVersion": '"{}"'.format(APP_VERSION),
     }
 
+    # Using applyConfigurableUsers_old until the new version will not be ready
+    # Marco Clemencic found a bug in applyConfigurableUsers, but the fix caused troubles in existing
+    # configurations as somehow they were relying on the bug, so he had to resurrect the old implementation
+    from GaudiKernel.Proxy.Configurable import Configurable, applyConfigurableUsers_old
+    applyConfigurableUsers_old()
+
+    dict_opts_old = get_configurable_opts(
+        Configurable.allConfigurables.values(), with_defaults)
     dict_opts = get_configurable_opts(configurables, with_defaults)
+
+    conflicts = [
+        n for n in set(dict_opts).intersection(dict_opts_old)
+        if dict_opts[n] != dict_opts_old[n]
+    ]
+    if conflicts:
+        conflicts.sort()
+        log_click(
+            "ERROR",
+            "Some properties are set in old and new style configuration")
+        log_click("WARNING", "name: old -> new")
+        for n in conflicts:
+            log_click("WARNING",
+                      "%s: %s -> %s" % (n, dict_opts_old[n], dict_opts[n]))
+            exit(10)
+
+    opts.update(dict_opts_old)
     opts.update(dict_opts)
 
     if export:
-        click.echo("writing configuration to {}".format(export))
+        log_click("INFO", "writing configuration to {}".format(export))
         with open(export, "w") as f:
             f.writelines("{} = {};\n".format(*item) for item in opts.items())
 
     if dry_run:
-        click.echo("dry-run: not starting the application")
+        log_click("INFO", "dry-run: not starting the application")
     else:
         import Gaudi
         opts["ApplicationMgr.JobOptionsType"] = '"NONE"'
@@ -100,12 +127,12 @@ def run_job(configurables, export=None, with_defaults=False, dry_run=None):
         allow_extra_args=True,
     ))
 @click.option(
-    "--testfiledb",
-    default=("$DAVINCIROOT/options/DaVinciDB-Example.yaml",
-             "Upgrade_Bd2KstarMuMu_ldst"),
+    "--inputfiledb",
+    default=("", "TestFileDB"),
     nargs=2,
     help=
-    "TestFileDB-like file containing job input and conditions information (.yaml). Takes the pair of values 'filedb-path', 'filedb-key'"
+    "TestFileDB-like file containing job input and conditions information (.yaml). Takes the pair of values 'filedb-key', 'filedb-path'."\
+    "If you want to use the standard TestFileDB set 'filedb-path' = '-'."
 )
 @click.option(
     "--joboptfile",
@@ -119,34 +146,36 @@ def run_job(configurables, export=None, with_defaults=False, dry_run=None):
     "Option for running a simple DaVinci jobs without any specific configuration (.py)."
 )
 @click.pass_context
-def run_mc(ctx, testfiledb, joboptfile, simplejob):
+def run_mc(ctx, inputfiledb, joboptfile, simplejob):
     """
-    DaVinci function for running jobs on simulated samples on the command line, using Click.
-    Ctx: click.core.Context class (dict). Predefined click object storing information about the invoked command.
+    DaVinci function for running jobs on simulated samples.
+    Ctx: click.core.Context class (dict).
+    Predefined click object storing information about the invoked command.
     All the options passed by command line which are not recognised by click are stored into the ctx.args element.
     Ctx.args is a simple array and each extra option is stored using two values: the first one is the key
     and the second one is the corresponding value.
     Eg: --evt_max 100 will be stored as: ctx.args[0] = --evt_max, ctx.args[1] = 100
 
-    Click automatically converts "_" in "-", so this function can be invoked calling run-mc as shown in the help.
+    Note:
+        Click automatically converts "_" in "-", so this function can be invoked calling run-mc as shown in the help.
     """
-    assert len(
-        testfiledb
-    ) == 2, "--testfiledb takes two arguments: filedb filename and the relevant key."
-    testfiledb_file = testfiledb[0]
-    testfiledb_key = testfiledb[1]
+
+    # Run on MC sample
+    options.simulation = True
+    # Test file DB key request overrides inputfiledb
+    inputfiledb_key, inputfiledb_file = set_testfiledb(inputfiledb)
 
     ctx_args = (ctx.args if (len(ctx.args) > 1) else [])
-    dump_call(testfiledb_file, testfiledb_key, joboptfile, ctx_args)
+    dump_call(inputfiledb_file, inputfiledb_key, joboptfile, ctx_args)
 
     config = run_davinci(
-        testfiledb_file,
-        testfiledb_key,  #file and key for job input and conditions
+        inputfiledb_key,
+        inputfiledb_file,  #file and key for job input and conditions
         joboptfile,  # file for job options
-        True,  # flag for MC job
         ctx_args,  # list of extra options to be set in the job
         simplejob  # flag for running a simplejob
     )
+
     return config
 
 
@@ -156,49 +185,52 @@ def run_mc(ctx, testfiledb, joboptfile, simplejob):
         allow_extra_args=True,
     ))
 @click.option(
-    "--testfiledb",
-    default=("$DAVINCIROOT/options/DaVinciDB-Example.yaml",
-             "Upgrade_Bd2KstarMuMu_ldst"),
+    "--inputfiledb",
+    default=("", "TestFileDB"),
     nargs=2,
     help=
-    "TestFileDB-like file containing job input and conditions information (.yaml). Takes the pair of values 'filedb-path', 'filedb-key'"
+    "TestFileDB-like file containing job input and conditions information (.yaml). Takes the pair of values 'filedb-key', 'filedb-path'."\
+    "If you want to use the standard TestFileDB set 'filedb-path' = '-'."
 )
 @click.option(
     "--joboption-file",
     default="$DAVINCIROOT/options/jobOptions-Example.yaml",
     help="Option file containing the job information (.yaml, .py)")
 @click.pass_context
-def run_data(ctx, testfiledb, optfile):
+def run_data(ctx, inputfiledb, optfile):
     """
-    DaVinci function for running jobs on real data samples on the command line, using Click.
+    DaVinci function for running jobs on real data samples.
     Ctx: click.core.Context class (dict). Predefined click object storing information about the invoked command.
     All options passed by the command line that are not recognised by click are stored into the ctx.args element.
     Ctx.args is a simple array and each extra option is stored using two values: the first one is the key
     and the second one is the corresponding value.
     Eg: --evt_max 100 will be stored as: ctx.args[0] = --evt_max, ctx.args[1] = 100
 
-    Click automatically converts "_" in "-", so this function can be invoked calling run-data as shown in the help.
+    Note:
+       Click automatically converts "_" in "-", so this function can be invoked calling run-data as shown in the help.
     """
+
     raise ValueError(
         'Data file with upgrade conditions are not yet available. Please use :mc function instead.'
     )
 
-    assert len(
-        testfiledb
-    ) == 2, "--testfiledb takes two arguments: filedb filename and the relevant key."
-    testfiledb_file = testfiledb[0]
-    testfiledb_key = testfiledb[1]
+    # Run on data sample
+    options.simulation = False
+
+    # Test file DB key request overrides inputfiledb
+    inputfiledb_key, inputfiledb_file = set_testfiledb(inputfiledb)
+
     ctx_args = (ctx.args if (len(ctx.args) > 1) else [])
-    dump_call(testfiledb_file, testfiledb_key, joboptfile, ctx_args)
+    dump_call(inputfiledb_file, inputfiledb_key, joboptfile, ctx_args)
 
     config = run_davinci(
-        testfiledb_file,
-        testfiledb_key,  #file and key for job input and conditions
+        inputfiledb_key,
+        inputfiledb_file,  #file and key for job input and conditions
         joboptfile,  # file for job options
-        False,  # flag for MC job
         ctx_args,  # list of extra options to be set in the job
         simplejob  # flag for running a simplejob
     )
+
     return config
 
 

DaVinciTests/tests/options/option_davinci_user_algs.py

@@ -15,17 +15,13 @@ Example of a DaVinci job printing run and event numbers on every read event.
 __author__ = "Davide Fazzini"
 __date__ = "2021-03-31"
 
-from PyConf.control_flow import CompositeNode, NodeLogic
-from DaVinci import options
 from DaVinci.reco_objects import upfront_reconstruction_from_file as upfront_reconstruction
 
 
 def main():
     # the "upfront_reconstruction" is what unpacks reconstruction objects, particles and primary vertices
     # from file and creates protoparticles.
+    tools = []
     algs = upfront_reconstruction()
 
-    node = CompositeNode(
-        "PrintJpsiNode", children=algs, combine_logic=NodeLogic.NONLAZY_AND)
-
-    return node
+    return algs, tools

DaVinciTests/tests/qmtest/davinci.qms/test_davinci_control_flow.qmt

@@ -19,13 +19,18 @@
 # Author: dfazzini
 # Purpose: Very simple test of DaVinci configurable for testing the click feature
 # Prerequisites: None
+# inputfiledb Upgrade_Bd2KstarMuMu_ldst $DAVINCIROOT/options/DaVinciDB-Example.yaml
 # joboptfile $DAVINCITESTSROOT/tests/options/option_davinci_initialise_upgrade.yaml
+# evt_max 150
 #######################################################
 -->
 <extension class="GaudiTest.GaudiExeTest" kind="test">
   <argument name="program"><text>davinci</text></argument>
   <argument name="args"><set>
   <text>run-mc</text>
+  <text>--inputfiledb</text>
+  <text>Upgrade_Bd2KstarMuMu_ldst</text>
+  <text>$DAVINCIROOT/options/DaVinciDB-Example.yaml</text>
   <text>--joboptfile</text>
   <text>$DAVINCITESTSROOT/tests/options/option_davinci_initialise_upgrade.yaml</text>
   <text>--evt_max</text>

DaVinciTests/tests/qmtest/davinci.qms/test_davinci_initialise_upgrade.qmt

@@ -19,6 +19,8 @@
 # Author: dfazzini
 # Purpose: Very simple test of DaVinci configurable for testing the click feature
 # Prerequisites: None
+# dry-run
+# inputfiledb Upgrade_Bd2KstarMuMu_ldst $DAVINCIROOT/options/DaVinciDB-Example.yaml
 # joboptfile $DAVINCITESTSROOT/tests/options/option_davinci_initialise_upgrade.yaml
 #######################################################
 -->
@@ -27,6 +29,9 @@
   <argument name="args"><set>
   <text>--dry-run</text>
   <text>run-mc</text>
+  <text>--inputfiledb</text>
+  <text>Upgrade_Bd2KstarMuMu_ldst</text>
+  <text>$DAVINCIROOT/options/DaVinciDB-Example.yaml</text>
   <text>--joboptfile</text>
   <text>$DAVINCITESTSROOT/tests/options/option_davinci_initialise_upgrade.yaml</text>
   </set></argument>

DaVinciTests/tests/qmtest/davinci.qms/test_davinci_simplejob.qmt

@@ -19,7 +19,8 @@
 # Author: dfazzini
 # Purpose: Very simple test of DaVinci configurable for testing the click feature
 # Prerequisites: None
-# user_algorithms $DAVINCITESTSROOT/tests/options/option_davinci_simplejob:main
+# simplejob
+# inputfiledb Upgrade_Bd2KstarMuMu_ldst $DAVINCIROOT/options/DaVinciDB-Example.yaml
 #######################################################
 -->
 <extension class="GaudiTest.GaudiExeTest" kind="test">
@@ -27,6 +28,9 @@
   <argument name="args"><set>
   <text>run-mc</text>
   <text>--simplejob</text>
+  <text>--inputfiledb</text>
+  <text>Upgrade_Bd2KstarMuMu_ldst</text>
+  <text>$DAVINCIROOT/options/DaVinciDB-Example.yaml</text>
   </set></argument>
   <argument name="reference"><text>$DAVINCITESTSROOT/tests/refs/test_davinci_simplejob.ref</text></argument>
   <argument name="error_reference"><text>$DAVINCITESTSROOT/tests/refs/empty.ref</text></argument>

DaVinciTests/tests/qmtest/davinci.qms/test_davinci_testfiledb.qmt

+<?xml version="1.0" ?>
+<!--
+###############################################################################
+# (c) Copyright 2020-2021 CERN for the benefit of the LHCb Collaboration      #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+-->
+<!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
+<!--
+#######################################################
+# SUMMARY OF THIS TEST
+# ...................
+# Author: dfazzini
+# Purpose: Very simple test for the new DaVinci configuration checking the correct access to the TestFileDB
+# Prerequisites: None
+# inputfiledb Upgrade_Bd2KstarMuMu -
+#######################################################
+-->
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+  <argument name="program"><text>davinci</text></argument>
+  <argument name="args"><set>
+  <text>run-mc</text>
+  <text>--inputfiledb</text>
+  <text>Upgrade_Bd2KstarMuMu</text>
+  <text>-</text>
+  </set></argument>
+  <argument name="reference"><text>$DAVINCITESTSROOT/tests/refs/test_davinci_testfiledb.ref</text></argument>
+  <argument name="error_reference"><text>$DAVINCITESTSROOT/tests/refs/empty.ref</text></argument>
+  <argument name="validator"><text>
+from DaVinciTests.QMTest.DaVinciExclusions import preprocessor
+validateWithReference(preproc = preprocessor)
+countErrorLines({"FATAL":0})
+  </text></argument>
+</extension>

DaVinciTests/tests/qmtest/davinci.qms/test_davinci_tupling.qmt

+<?xml version="1.0" ?>
+<!--
+###############################################################################
+# (c) Copyright 2020-2021 CERN for the benefit of the LHCb Collaboration      #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+-->
+<!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
+<!--
+#######################################################
+# SUMMARY OF THIS TEST
+# ...................
+# Author: dfazzini
+# Purpose: Very simple test of DaVinci configurable for testing the click feature
+# Prerequisites: None
+# inputfiledb Upgrade_Bd2KstarMuMu_ldst $DAVINCIROOT/options/DaVinciDB-Example.yaml
+# joboptfile $DAVINCIEXAMPLESROOT/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml
+# user_algorithms $DAVINCIEXAMPLESROOT/python/DaVinciExamples/tupling/example-tupling-basic-run-mc:main
+#######################################################
+-->
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+  <argument name="program"><text>davinci</text></argument>
+  <argument name="args"><set>
+  <text>run-mc</text>
+  <text>--inputfiledb</text>
+  <text>Upgrade_Bd2KstarMuMu_ldst</text>
+  <text>$DAVINCIROOT/options/DaVinciDB-Example.yaml</text>
+  <text>--joboptfile</text>
+  <text>$DAVINCIEXAMPLESROOT/python/DaVinciExamples/tupling/example-tupling-basic-run-mc.yaml</text>
+  <text>--user_algorithms</text>
+  <text>$DAVINCIEXAMPLESROOT/python/DaVinciExamples/tupling/example-tupling-basic-run-mc:main</text>
+  </set></argument>
+  <argument name="reference"><text>$DAVINCITESTSROOT/tests/refs/test_davinci_tupling.ref</text></argument>
+  <argument name="error_reference"><text>$DAVINCITESTSROOT/tests/refs/empty.ref</text></argument>
+  <argument name="validator"><text>
+from DaVinciTests.QMTest.DaVinciExclusions import preprocessor
+validateWithReference(preproc = preprocessor)
+countErrorLines({"FATAL":0})
+  </text></argument>
+</extension>

DaVinciTests/tests/qmtest/davinci.qms/test_davinci_tupling_advanced.qmt

+<?xml version="1.0" ?>
+<!--
+###############################################################################
+# (c) Copyright 2020-2021 CERN for the benefit of the LHCb Collaboration      #
+#                                                                             #
+# This software is distributed under the terms of the GNU General Public      #
+# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".   #
+#                                                                             #
+# In applying this licence, CERN does not waive the privileges and immunities #
+# granted to it by virtue of its status as an Intergovernmental Organization  #
+# or submit itself to any jurisdiction.                                       #
+###############################################################################
+-->
+<!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
+<!--
+#######################################################
+# SUMMARY OF THIS TEST
+# ...................
+# Author: dfazzini
+# Purpose: Test for the new DaVinci configurable cheking the correct advanced tupling behaviour
+# Prerequisites: None
+# inputfiledb Upgrade_Bd2KstarMuMu_ldst $DAVINCIROOT/options/DaVinciDB-Example.yaml
+# user_algorithms $DAVINCIEXAMPLESROOT/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc:main
+#######################################################
+-->
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+  <argument name="program"><text>davinci</text></argument>
+  <argument name="args"><set>
+  <text>run-mc</text>
+  <text>--inputfiledb</text>
+  <text>Upgrade_Bd2KstarMuMu_ldst</text>
+  <text>$DAVINCIROOT/options/DaVinciDB-Example.yaml</text>
+  <text>--user_algorithms</text>
+  <text>$DAVINCIEXAMPLESROOT/python/DaVinciExamples/tupling/example-tupling-advanced-run-mc:main</text>
+  </set></argument>
+  <argument name="reference"><text>$DAVINCITESTSROOT/tests/refs/test_davinci_tupling_advanced.ref</text></argument>
+  <argument name="error_reference"><text>$DAVINCITESTSROOT/tests/refs/empty.ref</text></argument>
+  <argument name="validator"><text>
+from DaVinciTests.QMTest.DaVinciExclusions import preprocessor
+validateWithReference(preproc = preprocessor)
+countErrorLines({"FATAL":0})
+  </text></argument>
+</extension>

DaVinciTests/tests/qmtest/davinci.qms/test_davinci_user_algs.qmt

@@ -19,6 +19,7 @@
 # Author: dfazzini
 # Purpose: Very simple test of DaVinci configurable for testing the click feature
 # Prerequisites: None
+# inputfiledb Upgrade_Bd2KstarMuMu_ldst $DAVINCIROOT/options/DaVinciDB-Example.yaml
 # user_algorithms $DAVINCITESTSROOT/tests/options/option_davinci_simplejob:main
 #######################################################
 -->
@@ -26,6 +27,9 @@
   <argument name="program"><text>davinci</text></argument>
   <argument name="args"><set>
   <text>run-mc</text>
+  <text>--inputfiledb</text>
+  <text>Upgrade_Bd2KstarMuMu_ldst</text>
+  <text>$DAVINCIROOT/options/DaVinciDB-Example.yaml</text>  
   <text>--user_algorithms</text>
   <text>$DAVINCITESTSROOT/tests/options/option_davinci_user_algs:main</text>
   </set></argument>

DaVinciTests/tests/refs/test_davinci_control_flow.ref

@@ -2,11 +2,11 @@
 |-auditors               = []  (default: [])
 |-buffer_events          = 20000  (default: 20000)
 |-callgrind_profile      = False  (default: False)
-|-conddb_tag             = 'HEAD'  (default: '')
+|-conddb_tag             = 'sim-20171127-vc-md100'  (default: '')
 |-control_flow_file      = ''  (default: '')
 |-data_flow_file         = ''  (default: '')
 |-data_type              = 'Upgrade'  (default: '')
-|-dddb_tag               = 'dddb-20200424-2'  (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: '')
@@ -45,19 +45,23 @@
 |-user_algorithms        = ''  (default: '')
 |-write_fsr              = True  (default: True)
 \----- (End of User DVAppOptions/DVAppOptions) -----------------------------------------------------
+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.
 ApplicationMgr    SUCCESS
 ====================================================================================================================================
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
+DetectorPersistencySvc                 INFO Added successfully Conversion service:XmlCnvSvc
+DetectorDataSvc                     SUCCESS Detector description database: git:/lhcb.xml
 NTupleSvc                              INFO Added stream file:DVNtuple.root as FILE1
 RootHistSvc                            INFO Writing ROOT histograms to: DVHistos.root
 HistogramPersistencySvc                INFO Added successfully Conversion service:RootHistSvc
 FSROutputStreamDstWriter               INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
-DetectorDataSvc                        INFO Detector description not requested to be loaded
 EventClockSvc.FakeEventTime            INFO Event times generated from 0 with steps of 0
-HiveDataBrokerSvc                   WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter
 HiveDataBrokerSvc                   WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter
 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'
@@ -69,13 +73,13 @@ SimpleHistos                           INFO GaudiHistoAlgorithm:: Filling Histog
 ApplicationMgr                         INFO Application Manager Stopped successfully
 FSROutputStreamDstWriter               INFO Set up File Summary Record
 FSROutputStreamDstWriter               INFO Events output: 1
-NONLAZY_OR: DaVinci                      #=150     Sum=150         Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: WriteFSR                    #=150     Sum=150         Eff=|( 100.0000 +- 0.00000 )%|
-  RecordStream/FSROutputStreamDstWriter  #=150     Sum=150         Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_AND: DVStdAlgs                  #=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: UserAnalysis                 #=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: WriteFSR                      #=150     Sum=150         Eff=|( 100.0000 +- 0.00000 )%|
+   RecordStream/FSROutputStreamDstWriter  #=150     Sum=150         Eff=|( 100.0000 +- 0.00000 )%|
 ToolSvc                                INFO Removing all tools created by ToolSvc
-*****Chrono*****                       INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 ChronoStatSvc.finalize()               INFO  Service finalized successfully
 ApplicationMgr                         INFO Application Manager Finalized successfully
 ApplicationMgr                         INFO Application Manager Terminated successfully

DaVinciTests/tests/refs/test_davinci_initialise_upgrade.ref

@@ -2,11 +2,11 @@
 |-auditors               = []  (default: [])
 |-buffer_events          = 20000  (default: 20000)
 |-callgrind_profile      = False  (default: False)
-|-conddb_tag             = 'HEAD'  (default: '')
+|-conddb_tag             = 'sim-20171127-vc-md100'  (default: '')
 |-control_flow_file      = ''  (default: '')
 |-data_flow_file         = ''  (default: '')
 |-data_type              = 'Upgrade'  (default: '')
-|-dddb_tag               = 'dddb-20200424-2'  (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: '')
@@ -45,4 +45,6 @@
 |-user_algorithms        = ''  (default: '')
 |-write_fsr              = True  (default: True)
 \----- (End of User DVAppOptions/DVAppOptions) -----------------------------------------------------
-dry-run: not starting the application
+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.
+INFO dry-run: not starting the application

DaVinciTests/tests/refs/test_davinci_simplejob.ref

@@ -2,11 +2,11 @@
 |-auditors               = []  (default: [])
 |-buffer_events          = 20000  (default: 20000)
 |-callgrind_profile      = False  (default: False)
-|-conddb_tag             = 'HEAD'  (default: '')
+|-conddb_tag             = 'sim-20171127-vc-md100'  (default: '')
 |-control_flow_file      = ''  (default: '')
 |-data_flow_file         = ''  (default: '')
 |-data_type              = 'Upgrade'  (default: '')
-|-dddb_tag               = 'dddb-20200424-2'  (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: '')
@@ -45,16 +45,19 @@
 |-user_algorithms        = ''  (default: '')
 |-write_fsr              = True  (default: True)
 \----- (End of User DVAppOptions/DVAppOptions) -----------------------------------------------------
+WARNING DV option file or main function not defined. No user algorithms will be used.
 ApplicationMgr    SUCCESS
 ====================================================================================================================================
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
+DetectorPersistencySvc                 INFO Added successfully Conversion service:XmlCnvSvc
+DetectorDataSvc                     SUCCESS Detector description database: git:/lhcb.xml
 NTupleSvc                              INFO Added stream file:ExampleTuple.root as FILE1
 RootHistSvc                            INFO Writing ROOT histograms to: ExampleHistos.root
 HistogramPersistencySvc                INFO Added successfully Conversion service:RootHistSvc
-DetectorDataSvc                        INFO Detector description not requested to be loaded
 EventClockSvc.FakeEventTime            INFO Event times generated from 0 with steps of 0
 ApplicationMgr                         INFO Application Manager Initialized successfully
+DeFTDetector                           INFO Current FT geometry version =   63
 ApplicationMgr                         INFO Application Manager Started successfully
 EventPersistencySvc                    INFO Added successfully Conversion service:RootCnvSvc
 EventSelector                          INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/MC/Upgrade/LDST/00076720/0000/00076720_00000002_1.ldst' SVC='Gaudi::RootEvtSelector' OPT='READ' IgnoreChecksum='YES'
@@ -160,8 +163,10 @@ Gaudi__Examples__VoidConsumer          INFO executing VoidConsumer
 Gaudi__Examples__VoidConsumer          INFO executing VoidConsumer
 Gaudi__Examples__VoidConsumer          INFO executing VoidConsumer
 ApplicationMgr                         INFO Application Manager Stopped successfully
-LAZY_AND: DummyNode                                           #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
- Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+LAZY_AND: DaVinci                                               #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+ NONLAZY_OR: UserAnalysis                                       #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: UserAlgorithms                                      #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   Gaudi__Examples__VoidConsumer/Gaudi__Examples__VoidConsumer  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
 ToolSvc                                INFO Removing all tools created by ToolSvc
 ApplicationMgr                         INFO Application Manager Finalized successfully
 ApplicationMgr                         INFO Application Manager Terminated successfully

DaVinciTests/tests/refs/test_davinci_testfiledb.ref

+/***** User DVAppOptions/DVAppOptions **************************************************************
+|-auditors               = []  (default: [])
+|-buffer_events          = 20000  (default: 20000)
+|-callgrind_profile      = False  (default: False)
+|-conddb_tag             = 'sim-20171127-vc-md100'  (default: '')
+|-control_flow_file      = ''  (default: '')
+|-data_flow_file         = ''  (default: '')
+|-data_type              = 'Upgrade'  (default: '')
+|-dddb_tag               = 'dddb-20171126'  (default: '')
+|-detectors              = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']
+|                        (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'])
+|-dqflags_tag            = ''  (default: '')
+|-enable_unpack          = None
+|-event_store            = 'HiveWhiteBoard'  (default: 'HiveWhiteBoard')
+|-evt_max                = 100  (default: -1)
+|-first_evt              = 0  (default: 0)
+|-histo_file             = 'ExampleHistos.root'  (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: [])
+|-input_raw_format       = 0.3  (default: 0.3)
+|-input_type             = 'ROOT'  (default: 'DST')
+|-lines_maker            = None
+|-lumi                   = False  (default: False)
+|-main_options           = ''  (default: '')
+|-memory_pool_size       = 10485760  (default: 10485760)
+|-merge_genfsr           = False  (default: False)
+|-msg_svc_format         = '% F%35W%S %7W%R%T %0W%M'  (default: '% F%35W%S %7W%R%T %0W%M')
+|-msg_svc_time_format    = '%Y-%m-%d %H:%M:%S UTC'  (default: '%Y-%m-%d %H:%M:%S UTC')
+|-n_event_slots          = 1  (default: -1)
+|-n_threads              = 1  (default: 1)
+|-ntuple_file            = 'ExampleTuple.root'  (default: '')
+|-output_file            = ''  (default: '')
+|-output_level           = 3  (default: 3)
+|-output_type            = ''  (default: '')
+|-overwrite_data_options = False  (default: False)
+|-print_freq             = 1000  (default: 1000)
+|-python_logging_level   = 30  (default: 30)
+|-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
+|-scheduler_legacy_mode  = True  (default: True)
+|-simulation             = True  (default: False)
+|-skip_events            = 2  (default: 0)
+|-tck                    = 0  (default: 0)
+|-use_iosvc              = False  (default: False)
+|-user_algorithms        = ''  (default: '')
+|-write_fsr              = True  (default: True)
+\----- (End of User DVAppOptions/DVAppOptions) -----------------------------------------------------
+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.
+ApplicationMgr    SUCCESS
+====================================================================================================================================
+====================================================================================================================================
+ApplicationMgr       INFO Application Manager Configured successfully
+DetectorPersistencySvc                 INFO Added successfully Conversion service:XmlCnvSvc
+DetectorDataSvc                     SUCCESS Detector description database: git:/lhcb.xml
+NTupleSvc                              INFO Added stream file:ExampleTuple.root as FILE1
+RootHistSvc                            INFO Writing ROOT histograms to: ExampleHistos.root
+HistogramPersistencySvc                INFO Added successfully Conversion service:RootHistSvc
+FSROutputStreamDstWriter               INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
+EventClockSvc.FakeEventTime            INFO Event times generated from 0 with steps of 0
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: GaudiHistoAlgorithm/SimpleHistos
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter
+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<CLHEP::RanluxEngine>
+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                         #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+ NONLAZY_OR: UserAnalysis                 #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: StandardAlgs                  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   GaudiHistoAlgorithm/SimpleHistos       #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: WriteFSR                      #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   RecordStream/FSROutputStreamDstWriter  #=100     Sum=100         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"                                 |   100   |      1.141 | 1.0488     |     1.1417 |    0.71718 |
+ | 102                       | "Breit"                                       |   100   |   -0.15117 | 1.1275     |   -0.32351 |     2.0377 |
+ | 1111                      | "Forced Numeric ID time test"                 |   100   |  -0.047428 | 0.89797    |   -0.25222 |    0.14476 |
+ | AutoID time test          | "AutoID time test"                            |   100   |  -0.047428 | 0.89797    |   -0.25222 |    0.14476 |
+ | Gaussian mean=0, sigma=1  | "Gaussian mean=0, sigma=1"                    |   100   |  -0.047428 | 0.89797    |   -0.25222 |    0.14476 |
+ | poisson                   | "Poisson"                                     |   100   |     1.8947 | 1.1376     |    0.42462 |   -0.74327 |
+ | subdir1/bino              | "Binominal"                                   |   100   |     1.8788 | 1.0567     |    0.38496 |   -0.44547 |
+ | subdir2/bino              | "Binominal"                                   |   100   |     1.8788 | 1.0567     |    0.38496 |   -0.44547 |
+ | test1                     | "Forced Alpha ID time test"                   |   100   |  -0.047428 | 0.89797    |   -0.25222 |    0.14476 |
+ | varBinning/x              | "1D Variable Binning"                         |   100   |   -0.22236 | 2.6506     |   0.026186 |   -0.97273 |
+SimpleHistos                        SUCCESS 1D profile histograms in directory "SimpleHistos" : 9
+ | ID                        |   Title                                       |    #    |     Mean   |    RMS     |  Skewness  |  Kurtosis  |
+ | Expo V Gauss 1DProf       | "Expo V Gauss 1DProf"                         |   100   |  -0.047428 | 0.89797    |    -2.3629 |     9.4136 |
+ | Expo V Gauss 1DProf s     | "Expo V Gauss 1DProf s"                       |   100   |  -0.047428 | 0.89797    |    -2.3629 |     9.4136 |
+ | Gauss V Flat 1DProf       | "Gauss V Flat 1DProf"                         |   100   |    0.18402 | 5.688      |          0 |         -3 |
+ | Gauss V Flat 1DProf S     | "Gauss V Flat 1DProf S"                       |   100   |    0.18402 | 5.688      |          0 |         -3 |
+ | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I"          |    45   |    0.24192 | 5.5416     |   -0.26447 |    -1.0149 |
+ | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-I  s"       |    45   |    0.24192 | 5.5416     |   -0.26447 |    -1.0149 |
+ | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II"         |    55   |    0.13664 | 5.8046     |          0 |         -3 |
+ | Gauss V Flat 1DProf, with | "Gauss V Flat 1DProf, with limits-II s"       |    55   |    0.13664 | 5.8046     |          0 |         -3 |
+ | varBinning/a              | "1D Profile Variable Binning"                 |   100   |   -0.22236 | 2.6506     |     7.4264 |     29.421 |

DaVinciTests/tests/refs/test_davinci_tupling.ref

+/***** User DVAppOptions/DVAppOptions **************************************************************
+|-auditors               = []  (default: [])
+|-buffer_events          = 20000  (default: 20000)
+|-callgrind_profile      = False  (default: False)
+|-conddb_tag             = 'sim-20171127-vc-md100'  (default: '')
+|-control_flow_file      = ''  (default: '')
+|-data_flow_file         = ''  (default: '')
+|-data_type              = 'Upgrade'  (default: '')
+|-dddb_tag               = 'dddb-20171126'  (default: '')
+|-detectors              = ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr']
+|                        (default: ['VP', 'UT', 'FT', 'Rich1Pmt', 'Rich2Pmt', 'Ecal', 'Hcal', 'Muon', 'Magnet', 'Tr'])
+|-dqflags_tag            = ''  (default: '')
+|-enable_unpack          = None
+|-event_store            = 'HiveWhiteBoard'  (default: 'HiveWhiteBoard')
+|-evt_max                = 10  (default: -1)
+|-first_evt              = 0  (default: 0)
+|-histo_file             = 'DV-example-tupling-basic-his.root'  (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: [])
+|-input_raw_format       = 4.3  (default: 0.3)
+|-input_type             = 'ROOT'  (default: 'DST')
+|-lines_maker            = None
+|-lumi                   = False  (default: False)
+|-main_options           = ''  (default: '')
+|-memory_pool_size       = 10485760  (default: 10485760)
+|-merge_genfsr           = False  (default: False)
+|-msg_svc_format         = '% F%35W%S %7W%R%T %0W%M'  (default: '% F%35W%S %7W%R%T %0W%M')
+|-msg_svc_time_format    = '%Y-%m-%d %H:%M:%S UTC'  (default: '%Y-%m-%d %H:%M:%S UTC')
+|-n_event_slots          = 1  (default: -1)
+|-n_threads              = 1  (default: 1)
+|-ntuple_file            = 'DV-example-tupling-basic-ntp.root'  (default: '')
+|-output_file            = ''  (default: '')
+|-output_level           = 3  (default: 3)
+|-output_type            = ''  (default: '')
+|-overwrite_data_options = False  (default: False)
+|-print_freq             = 1000  (default: 1000)
+|-python_logging_level   = 30  (default: 30)
+|-root_compression_level = 'LZMA:6'  (default: 'LZMA:6')
+|-scheduler_legacy_mode  = True  (default: True)
+|-simulation             = True  (default: False)
+|-skip_events            = 0  (default: 0)
+|-tck                    = 0  (default: 0)
+|-use_iosvc              = False  (default: False)
+|-user_algorithms        = '$DAVINCIEXAMPLESROOT/python/DaVinciExamples/tupling/example-tupling-basic-run-mc:main'
+|                        (default: '')
+|-write_fsr              = True  (default: True)
+\----- (End of User DVAppOptions/DVAppOptions) -----------------------------------------------------
+INFO No MainOptions specified. DaVinci() will import no options file!
+INFO User algorithm example-tupling-basic-run-mc.main imported successfully!
+ApplicationMgr    SUCCESS
+====================================================================================================================================
+====================================================================================================================================
+ApplicationMgr       INFO Application Manager Configured successfully
+DetectorPersistencySvc                 INFO Added successfully Conversion service:XmlCnvSvc
+DetectorDataSvc                     SUCCESS Detector description database: git:/lhcb.xml
+NTupleSvc                              INFO Added stream file:DV-example-tupling-basic-ntp.root as FILE1
+RootHistSvc                            INFO Writing ROOT histograms to: DV-example-tupling-basic-his.root
+HistogramPersistencySvc                INFO Added successfully Conversion service:RootHistSvc
+UnpackChargedProtos.ChargedProto...    INFO Using retuned RICH el and mu DLL values in combined DLLs
+FunctionalParticleMaker.LoKi::Hy...    INFO CUT: ' ( (TrTYPE==3) &TrALL) '
+DimuonsTuple                           INFO Initialising the FunTuple algorithm
+DimuonsTuple                           INFO Conducting checks with LoKi
+DimuonsTuple                           INFO Conducting checks with ThOr
+DimuonsTuple                           INFO Setting the properties of ParticleTupleProp objects!
+DimuonsTuple                           INFO Instatiating LoKi functors!
+DimuonsTuple                           INFO Instatiating ThOr functors!
+FunctorFactory                         INFO Cache miss for functor: ::Functors::Track::Momentum{}, now trying cling with headers [Event/Particle.h, Functors/TrackLike.h]
+FunctorFactory                         INFO Cache miss for functor: ::Functors::Track::TransverseMomentum{}, now trying cling with headers [Event/Particle.h, Functors/TrackLike.h]
+FunctorFactory                         INFO Reusing cling compiled factory for functor: ::Functors::Track::Momentum{}
+DimuonsTuple                           INFO Finished initialisation:
+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: GaudiHistoAlgorithm/SimpleHistos
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: UnpackRecVertex/UnpackRecVertices
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: DataPacking::Unpack<LHCb::MuonPIDPacker>/UnpackMuonPIDs
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: DataPacking::Unpack<LHCb::RichPIDPacker>/UnpackRichPIDs
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackNeutralProtos
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackChargedProtos
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: CombineParticles
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter
+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<CLHEP::RanluxEngine>
+SimpleHistos                           INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient !
+MagneticFieldSvc                       INFO Map scaled by factor 1 with polarity internally used: -1 signed relative current: -1
+ToolSvc.LoKi::VertexFitter             INFO Option for Optimised Kalman Filter fit is activated
+RFileCnv                               INFO opening Root file "DV-example-tupling-basic-ntp.root" for writing
+RCWNTupleCnv                           INFO Booked TTree with ID: DecayTree "DecayTree" in directory DV-example-tupling-basic-ntp.root:/DimuonsTuple
+ApplicationMgr                         INFO Application Manager Stopped successfully
+UnpackRichPIDs                      SUCCESS  #WARNINGS   = 10       Message = 'Incorrect data version 0 for packing version > 3. Correcting data to version 2.'
+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}
+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: 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 )%|
+   DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs  #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
+   DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs  #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackTrackFunctional/UnpackBestTracks                   #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackTrackFunctional/UnpackMuonTracks                   #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackProtoParticle/UnpackNeutralProtos                  #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackProtoParticle/UnpackChargedProtos                  #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
+   CombineParticles/CombineParticles                        #=10      Sum=3           Eff=|( 30.00000 +- 14.4914 )%|
+   FunTuple_Particles/DimuonsTuple                          #=3       Sum=3           Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: WriteFSR                                        #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
+   RecordStream/FSROutputStreamDstWriter                    #=10      Sum=10          Eff=|( 100.0000 +- 0.00000 )%|
+ToolSvc                                INFO Removing all tools created by ToolSvc
+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
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "# FunctionalParticleMaker/Particles"           |        10 |       1106 |     110.60 |     43.140 |      33.000 |      158.00 |
+ | "# J/psi(1S) -> mu+  mu+ "                      |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "# J/psi(1S) -> mu+  mu- "                      |        10 |          3 |    0.30000 |    0.45826 |       0.0000 |      1.0000 |
+ | "# J/psi(1S) -> mu-  mu- "                      |        10 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ | "# input particles"                             |        10 |       1106 |     110.60 |     43.140 |      33.000 |      158.00 |
+ | "# mu+"                                         |        10 |          5 |    0.50000 |    0.50000 |       0.0000 |      1.0000 |
+ | "# mu-"                                         |        10 |          6 |    0.60000 |    0.48990 |       0.0000 |      1.0000 |
+ | "# selected"                                    |        10 |          3 |    0.30000 |
+ |*"#accept"                                       |        10 |          3 |( 30.00000 +- 14.49138)% |
+ | "#pass combcut"                                 |         3 |          3 |     1.0000 |
+ | "#pass mother cut"                              |         3 |          3 |     1.0000 |
+FunctionalParticleMaker                INFO Number of counters : 4
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ |*"# passed ProtoParticle filter"                 |      1106 |       1106 |( 100.0000 +-  0.000000)% |
+ |*"# passed Track filter"                         |      1667 |       1106 |( 66.34673 +- 1.157326)% |
+ | "Nb created anti-particles"                     |        10 |        570 |     57.000 |     25.072 |      11.000 |      93.000 |
+ | "Nb created particles"                          |        10 |        536 |     53.600 |     19.643 |      22.000 |      77.000 |
+ToolSvc.HybridFactory                  INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "# loaded from PYTHON"                          |        11 |
+ToolSvc.LoKi::VertexFitter             INFO Number of counters : 2
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "#iterations/1"                                 |         3 |          3 |     1.0000 |      0.0000 |      1.0000 |      1.0000 |
+ | "#iterations/Opt"                               |         3 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
+ToolSvc.PPFactoryHybridFactory         INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "# loaded from PYTHON"                          |         1 |
+ToolSvc.TrackFunctorFactory            INFO Number of counters : 1
+ |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
+ | "# loaded from PYTHON"                          |         1 |
+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 |

DaVinciTests/tests/refs/test_davinci_user_algs.ref

@@ -2,11 +2,11 @@
 |-auditors               = []  (default: [])
 |-buffer_events          = 20000  (default: 20000)
 |-callgrind_profile      = False  (default: False)
-|-conddb_tag             = 'HEAD'  (default: '')
+|-conddb_tag             = 'sim-20171127-vc-md100'  (default: '')
 |-control_flow_file      = ''  (default: '')
 |-data_flow_file         = ''  (default: '')
 |-data_type              = 'Upgrade'  (default: '')
-|-dddb_tag               = 'dddb-20200424-2'  (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: '')
@@ -45,25 +45,29 @@
 |-user_algorithms        = '$DAVINCITESTSROOT/tests/options/option_davinci_user_algs:main'  (default: '')
 |-write_fsr              = True  (default: True)
 \----- (End of User DVAppOptions/DVAppOptions) -----------------------------------------------------
+INFO No MainOptions specified. DaVinci() will import no options file!
+INFO User algorithm option_davinci_user_algs.main imported successfully!
 ApplicationMgr    SUCCESS
 ====================================================================================================================================
 ====================================================================================================================================
 ApplicationMgr       INFO Application Manager Configured successfully
+DetectorPersistencySvc                 INFO Added successfully Conversion service:XmlCnvSvc
+DetectorDataSvc                     SUCCESS Detector description database: git:/lhcb.xml
 NTupleSvc                              INFO Added stream file:ExampleTuple.root as FILE1
 RootHistSvc                            INFO Writing ROOT histograms to: ExampleHistos.root
 HistogramPersistencySvc                INFO Added successfully Conversion service:RootHistSvc
-FSROutputStreamDstWriter               INFO Data source: EventDataSvc output: SVC='Gaudi::RootCnvSvc'
 UnpackChargedProtos.ChargedProto...    INFO Using retuned RICH el and mu DLL values in combined DLLs
-DetectorDataSvc                        INFO Detector description not requested to be loaded
+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
 HiveDataBrokerSvc                   WARNING non-reentrant algorithm: UnpackRecVertex/UnpackRecVertices
 HiveDataBrokerSvc                   WARNING non-reentrant algorithm: DataPacking::Unpack<LHCb::MuonPIDPacker>/UnpackMuonPIDs
 HiveDataBrokerSvc                   WARNING non-reentrant algorithm: DataPacking::Unpack<LHCb::RichPIDPacker>/UnpackRichPIDs
 HiveDataBrokerSvc                   WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackNeutralProtos
 HiveDataBrokerSvc                   WARNING non-reentrant algorithm: UnpackProtoParticle/UnpackChargedProtos
+HiveDataBrokerSvc                   WARNING non-reentrant algorithm: RecordStream/FSROutputStreamDstWriter
 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'
@@ -73,28 +77,28 @@ RndmGenSvc.Engine                      INFO Current Seed:1234567 Luxury:3
 RndmGenSvc                             INFO Using Random engine:HepRndm::Engine<CLHEP::RanluxEngine>
 SimpleHistos                           INFO GaudiHistoAlgorithm:: Filling Histograms...... Please be patient !
 ApplicationMgr                         INFO Application Manager Stopped successfully
+UnpackRichPIDs                      SUCCESS  #WARNINGS   = 100      Message = 'Incorrect data version 0 for packing version > 3. Correcting data to version 2.'
 FSROutputStreamDstWriter               INFO Set up File Summary Record
 FSROutputStreamDstWriter               INFO Events output: 1
-UnpackRichPIDs                      SUCCESS  #WARNINGS   = 100      Message = 'Incorrect data version 0 for packing version > 3. Correcting data to version 2.'
-NONLAZY_OR: DaVinci                                        #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_OR: WriteFSR                                      #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  RecordStream/FSROutputStreamDstWriter                    #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_AND: DVStdAlgs                                    #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  GaudiHistoAlgorithm/SimpleHistos                         #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
- NONLAZY_AND: PrintJpsiNode                                #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackRecVertex/UnpackRecVertices                        #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackCaloHypo/UnpackCaloElectrons                       #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackCaloHypo/UnpackCaloPhotons                         #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackCaloHypo/UnpackCaloMergedPi0s                      #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackCaloHypo/UnpackCaloSplitPhotons                    #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackTrackFunctional/UnpackBestTracks                   #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackTrackFunctional/UnpackMuonTracks                   #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackProtoParticle/UnpackNeutralProtos                  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
-  UnpackProtoParticle/UnpackChargedProtos                  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+LAZY_AND: DaVinci                                           #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+ NONLAZY_OR: UserAnalysis                                   #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: StandardAlgs                                    #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   GaudiHistoAlgorithm/SimpleHistos                         #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: UserAlgorithms                                  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackRecVertex/UnpackRecVertices                        #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackCaloHypo/UnpackCaloElectrons                       #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackCaloHypo/UnpackCaloPhotons                         #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackCaloHypo/UnpackCaloMergedPi0s                      #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackCaloHypo/UnpackCaloSplitPhotons                    #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   DataPacking__Unpack<LHCb__MuonPIDPacker>/UnpackMuonPIDs  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   DataPacking__Unpack<LHCb__RichPIDPacker>/UnpackRichPIDs  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackTrackFunctional/UnpackBestTracks                   #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackTrackFunctional/UnpackMuonTracks                   #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackProtoParticle/UnpackNeutralProtos                  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   UnpackProtoParticle/UnpackChargedProtos                  #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+  LAZY_AND: WriteFSR                                        #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
+   RecordStream/FSROutputStreamDstWriter                    #=100     Sum=100         Eff=|( 100.0000 +- 0.00000 )%|
 ToolSvc                                INFO Removing all tools created by ToolSvc
-*****Chrono*****                       INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 ChronoStatSvc.finalize()               INFO  Service finalized successfully
 ApplicationMgr                         INFO Application Manager Finalized successfully
 ApplicationMgr                         INFO Application Manager Terminated successfully

Phys/DaVinci/options/DaVinciDB-Example.yaml

@@ -36,8 +36,8 @@ Upgrade_Bd2KstarMuMu_ldst:
       data_type: Upgrade
       input_type: LDST
       simulation: true
-      conddb_tag: HEAD
-      dddb_tag: dddb-20200424-2
+      conddb_tag: sim-20171127-vc-md100
+      dddb_tag: dddb-20171126
    metadata: 
       Author: 'Patrick Koppenburg'
       Date: '2020-05-28 11:12:55'