diff --git a/DaVinciTests/tests/options/DVTestInitialise.py b/DaVinciTests/tests/options/DVTestInitialise.py
index 665ea3d07e3429890c46793e33c8bf6896f346ab..185c6ebd00befb47cea2c718a15ece33c57055f4 100755
--- a/DaVinciTests/tests/options/DVTestInitialise.py
+++ b/DaVinciTests/tests/options/DVTestInitialise.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
diff --git a/DaVinciTests/tests/options/DVTestReadDst.py b/DaVinciTests/tests/options/DVTestPrintDecay.py
similarity index 52%
rename from DaVinciTests/tests/options/DVTestReadDst.py
rename to DaVinciTests/tests/options/DVTestPrintDecay.py
index 6cea2e5670491053268e1aaf01af3028414d23c6..55558a374d152cc7f5c02cb66ecc431ff76eab91 100755
--- a/DaVinciTests/tests/options/DVTestReadDst.py
+++ b/DaVinciTests/tests/options/DVTestPrintDecay.py
@@ -1,5 +1,6 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+
+# (c) Copyright 2000-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". #
@@ -8,11 +9,14 @@
# granted to it by virtue of its status as an Intergovernmental Organization #
# or submit itself to any jurisdiction. #
###############################################################################
+########################################################################
#
-# Options for a typical DaVinci job reading DSTs with saved candidates.
+# DVTestPrintDecay.py
+#
+# Options for a typical DaVinci job reading DSTs
#
# @author Patrick Koppenburg
-# @date 2009-02-04
+# @date 2021-02-18
#
########################################################################
from Gaudi.Configuration import *
@@ -21,33 +25,32 @@ from Configurables import DaVinci
#
# Print the J/psis
#
-from Configurables import PrintDecayTree, PrintHeader, FilterDesktop
-DaVinci().UserAlgorithms = [PrintHeader()]
-MassRanges = [[3000, 3087], [3088, 3100], [3100, 4000]]
-for i in MassRanges:
- ln = str(i[0])
- hn = str(i[1])
- name = ln + "_" + hn
- location = "/Event/SeqJpsi_" + name + "/Phys/SelJpsi_" + name
- pJpsi = PrintDecayTree('PrintJpsi_' + name, Inputs=[location])
- DaVinci().UserAlgorithms += [pJpsi]
- f = FilterDesktop(
- 'Filter_' + name, Inputs=[location], Code="(MIPCHI2DV(PRIMARY) > 2)")
- DaVinci().UserAlgorithms += [f]
+from PhysSelPython.Wrappers import Selection, DataOnDemand, SelectionSequence
+
+location = 'Phys/StdLooseJpsi2MuMu/Particles'
+
+MyLooseJpsi = DataOnDemand(Location=location)
+
+from Configurables import PrintDecayTree, PrintHeader
+DaVinci().UserAlgorithms = [
+ PrintHeader(), PrintDecayTree('PrintJpsi', Input=location)
+]
##############################################################################
#
#
##############################################################################
-DaVinci().EvtMax = -1
+DaVinci().EvtMax = 100
DaVinci().PrintFreq = 1
-DaVinci().DataType = "2010"
+DaVinci().DataType = "Upgrade"
DaVinci().Simulation = True
-DaVinci().Input = [
- "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3088_3100.dst' TYP='POOL_ROOTTREE' OPT='READ'",
- "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3100_4000.dst' TYP='POOL_ROOTTREE' OPT='READ'",
- "DATAFILE='PFN:$DAVINCITESTSROOT/tests/qmtest/Sel.SeqJpsi_3000_3087.dst' TYP='POOL_ROOTTREE' OPT='READ'"
-]
########################################################################
-MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
+MessageSvc().Format = "% F%40W%S%7W%R%T %0W%M"
+#-- GAUDI jobOptions generated on Mon Jan 17 17:13:58 2011
+#-- Contains event types :
+#-- 13144006 - 1 files - 10000 events - 4.13 GBytes
+# MC 2010 Beam3500GeV-VeloClosed-MagDown-Nu3
+# bs->Jpsi, Phi
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run()
diff --git a/DaVinciTests/tests/options/DVTestWriteDst.py b/DaVinciTests/tests/options/DVTestWriteDst.py
index d15089297d0ad05355c49ab78f8a09f1a52fe1db..6dc8a24fe7a304387f25a35ab05ed6746413a74e 100755
--- a/DaVinciTests/tests/options/DVTestWriteDst.py
+++ b/DaVinciTests/tests/options/DVTestWriteDst.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
diff --git a/DaVinciTests/tests/options/DaVinci-1000events.py b/DaVinciTests/tests/options/DaVinci-1000events.py
deleted file mode 100644
index ade4d555029950d12820575c22757c8f83ed9458..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DaVinci-1000events.py
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-from Gaudi.Configuration import *
-from Configurables import DaVinci
-
-# Number of events etc.
-DaVinci().EvtMax = 1000
-DaVinci().PrintFreq = 10
-
-#DaVinci().SkipEvents = 17100
-
-# Temporary. Force a particular CondDB tag
-#from Configurables import LHCbApp
-#LHCbApp().DDDBtag="head-20120413"
-#LHCbApp().CondDBtag="cond-20131028"
diff --git a/DaVinciTests/tests/options/DisableLoKiCacheFunctors.py b/DaVinciTests/tests/options/DisableLoKiCacheFunctors.py
deleted file mode 100644
index 29dfb9324efe7669c0500155761a439af42dde3d..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DisableLoKiCacheFunctors.py
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-
-from Configurables import ApplicationMgr
-ApplicationMgr().Environment['LOKI_DISABLE_CACHE'] = '1'
diff --git a/DaVinciTests/tests/options/DisableLoKiPythonFunctors.py b/DaVinciTests/tests/options/DisableLoKiPythonFunctors.py
deleted file mode 100644
index 14f8f50f45fbb315484fdef4ac29c036c394025d..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DisableLoKiPythonFunctors.py
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-
-from Configurables import ApplicationMgr
-ApplicationMgr().Environment['LOKI_DISABLE_PYTHON'] = '1'
diff --git a/DaVinciTests/tests/options/EnableCaloReprocessing.py b/DaVinciTests/tests/options/EnableCaloReprocessing.py
deleted file mode 100644
index 3e97ad3d87f881706f817e407c7649412d71ca43..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/EnableCaloReprocessing.py
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-
-from Configurables import PhysConf
-PhysConf().CaloReProcessing = True
diff --git a/DaVinciTests/tests/options/EnableFPEAuditor.py b/DaVinciTests/tests/options/EnableFPEAuditor.py
index c278e1b373b27a5d7a7ac19cfaa38d84f475c23b..b363dbe8830280f6449de0c6c2710e535a505067 100644
--- a/DaVinciTests/tests/options/EnableFPEAuditor.py
+++ b/DaVinciTests/tests/options/EnableFPEAuditor.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
@@ -10,8 +10,8 @@
###############################################################################
from Gaudi.Configuration import *
-ApplicationMgr().ExtSvc + [ "AuditorSvc" ]
-AuditorSvc().Auditors += [ "FPEAuditor" ]
+ApplicationMgr().ExtSvc + ["AuditorSvc"]
+AuditorSvc().Auditors += ["FPEAuditor"]
#from Configurables import FPEAuditor
#FPEAuditor().TrapOn = [ "DivByZero", "Overflow", "Underflow" ]
#FPEAuditor().ActivateAt = ["Execute"]
diff --git a/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py b/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
index e339fae64c3535b5df0bb71b18534ca065fc43d3..bfe8e69525d5efe66985d23ba458af554c3bc4fc 100755
--- a/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
+++ b/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
@@ -16,13 +16,13 @@ from Configurables import DaVinci, PhysConf
from Configurables import CondDB
########################################################################
-DaVinci().EvtMax = 100 # Number of events
-DaVinci().PrintFreq = 10 # Events to skip
-DaVinci().DataType = "Upgrade" # Must be given
+DaVinci().EvtMax = 100 # Number of events
+DaVinci().PrintFreq = 10 # Events to skip
+DaVinci().DataType = "Upgrade" # Must be given
DaVinci().Simulation = True
DaVinci().InputType = 'LDST'
DaVinci().Lumi = False
-CondDB().Upgrade = True
+CondDB().Upgrade = True
DaVinci().CondDBtag = "sim-20171127-vc-md100"
DaVinci().DDDBtag = "dddb-20171126"
@@ -31,7 +31,9 @@ DaVinci().HistogramFile = "dst-annpid.root"
########################################################################
from Configurables import ANNGlobalPID__ChargedProtoANNPIDMoni
-DaVinci().UserAlgorithms += [ ANNGlobalPID__ChargedProtoANNPIDMoni("ANNPIDMoni") ]
+DaVinci().UserAlgorithms += [
+ ANNGlobalPID__ChargedProtoANNPIDMoni("ANNPIDMoni")
+]
########################################################################
diff --git a/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py b/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
index 3105818681b0b48e0e6ed50c1627bd32ba3a7b1f..f03ad7d9b5037970c34bd0f187ed8e47446ae437 100755
--- a/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
+++ b/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
@@ -16,13 +16,13 @@ from Configurables import DaVinci, PhysConf
from Configurables import CondDB
########################################################################
-DaVinci().EvtMax = 100 # Number of events
-DaVinci().PrintFreq = 10 # Events to skip
-DaVinci().DataType = "Upgrade" # Must be given
+DaVinci().EvtMax = 100 # Number of events
+DaVinci().PrintFreq = 10 # Events to skip
+DaVinci().DataType = "Upgrade" # Must be given
DaVinci().Simulation = True
DaVinci().InputType = 'LDST'
DaVinci().Lumi = False
-CondDB().Upgrade = True
+CondDB().Upgrade = True
DaVinci().CondDBtag = "sim-20171127-vc-md100"
DaVinci().DDDBtag = "dddb-20171126"
@@ -31,7 +31,7 @@ DaVinci().HistogramFile = "dst-unpacking.root"
########################################################################
from Configurables import TrackMonitor
-DaVinci().UserAlgorithms += [ TrackMonitor() ]
+DaVinci().UserAlgorithms += [TrackMonitor()]
########################################################################
diff --git a/DaVinciTests/tests/options/SimpleMuSelection.py b/DaVinciTests/tests/options/SimpleMuSelection.py
deleted file mode 100644
index 4985d2a40e8f1d787b64e502ec1ea969bf471d41..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/SimpleMuSelection.py
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-"""
- @ Created by R. LAmbert
- @ date 2009-11-20
- Mu selection for tests
- Long track muons with PT > 1 GeV
-"""
-
-__author__ = 'R. Lambert'
-__date__ = 'November 2009'
-
-import GaudiKernel.SystemOfUnits as Units
-from Gaudi.Configuration import *
-from Configurables import FilterDesktop, DaVinci
-from PhysSelPython.Wrappers import Selection, DataOnDemand, SelectionSequence
-from StandardParticles import StdLooseMuons as MyStdMuons
-
-MuForTests = FilterDesktop("_bachelorMu")
-MuForTests.Code = "((ISLONG) & (PT > 250.*MeV))"
-
-SelMuForTests = Selection(
- "BachelorMuForTests",
- Algorithm=MuForTests,
- RequiredSelections=[MyStdMuons])
-from Configurables import CheckPV
-checkPV = CheckPV('TestCheckPV')
-TestSequence = SelectionSequence(
- "TestSeq", TopSelection=SelMuForTests, EventPreSelector=[checkPV])
-
-dv = DaVinci()
-DaVinci().UserAlgorithms = [TestSequence.sequence()]
diff --git a/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py b/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py
index d94e1186b91287d0e445ffd9d964509b56d36ff3..1dbb230bfb04f44b27f69df1a2457e6f069ee8ce 100644
--- a/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py
+++ b/DaVinciTests/tests/options/Upgrade/DaVinci-Options.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
diff --git a/DaVinciTests/tests/options/Upgrade/Input-DST.py b/DaVinciTests/tests/options/Upgrade/Input-DST.py
index c639d40298ae330e513007e43295e29fc79e3d69..1a440556c49d4323dc2cb06e39ec0e4241056eed 100644
--- a/DaVinciTests/tests/options/Upgrade/Input-DST.py
+++ b/DaVinciTests/tests/options/Upgrade/Input-DST.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
diff --git a/DaVinciTests/tests/options/Upgrade/Input-MDST.py b/DaVinciTests/tests/options/Upgrade/Input-MDST.py
index 708990a43bf8ce4ab865a25b506c3352137671a8..db22fa7e054e85a226ccb0e2771c7f53bfcce413 100644
--- a/DaVinciTests/tests/options/Upgrade/Input-MDST.py
+++ b/DaVinciTests/tests/options/Upgrade/Input-MDST.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
diff --git a/DaVinciTests/tests/options/Upgrade/Upgrade-DB-tags.py b/DaVinciTests/tests/options/Upgrade/Upgrade-DB-tags.py
index 22f14be88d919e1f52a7890e1f85a996f16ff0f1..512fc4b19801388e62ce3398c9d85683c3299218 100644
--- a/DaVinciTests/tests/options/Upgrade/Upgrade-DB-tags.py
+++ b/DaVinciTests/tests/options/Upgrade/Upgrade-DB-tags.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
diff --git a/DaVinciTests/tests/options/check_mc_output.py b/DaVinciTests/tests/options/check_mc_output.py
deleted file mode 100644
index 3c7f42416c6b7085a81b9292b2f0c389a1d50da1..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/check_mc_output.py
+++ /dev/null
@@ -1,49 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-"""Check ntuples made from Turbo MC input for correct truth-matching."""
-from __future__ import print_function
-import sys
-
-import ROOT
-
-tree_branches = {
- 'TupleDstToD0pi_D0ToKpi': (['Dst', 'D0'], ['D0_K', 'D0_pi', 'Dst_pi']),
- 'TupleLcTopKpi': (['Lc'], ['Lc_p', 'Lc_K', 'Lc_pi']),
- 'TupleScToLcpi_LcTopKpi': (['Sc', 'Lc'], ['Lc_p', 'Lc_K', 'Lc_pi', 'Sc_pi'])
-}
-
-fname = sys.argv[-2]
-tname = sys.argv[-1]
-assert fname.endswith('.root'), 'Expected a ROOT file as input, got: ' + fname
-assert tname in tree_branches, 'Cannot handle given tree, got: ' + tname
-print('Looking at file {0!r}, tree {1!r}'.format(fname, tname))
-
-composites, children = tree_branches[tname]
-
-f = ROOT.TFile(fname)
-t = f.Get('{0}/DecayTree'.format(tname))
-
-assert t.GetEntries() > 0, 'Expected non-zero number of entries'
-print('Found {0} entries'.format(t.GetEntries()))
-
-# If the truth-matching fails, we'd see BKGCAT == 60 for all entries
-for p in composites:
- condition = '{0}_BKGCAT < 20'.format(p)
- assert t.GetEntries(condition) > 0, \
- 'Expected non-zero number of entries with {0}'.format(condition)
- print('OK: {0!r}'.format(condition))
-# If the truth-matching fails, we'd see TRUEID == 0 for all entries
-for p in composites + children:
- condition = '{0}_TRUEID != 0'.format(p)
- assert t.GetEntries(condition) > 0, \
- 'Expected non-zero number of entries with {0}'.format(condition)
- print('OK: {0!r}'.format(condition))
-f.Close()
diff --git a/DaVinciTests/tests/options/db-global-2010.py b/DaVinciTests/tests/options/db-global-2010.py
deleted file mode 100644
index 081e9305c7b464ebfd719922f0ef60ee1a505dad..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/db-global-2010.py
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-from Gaudi.Configuration import *
-from Configurables import LHCbApp, CondDB, DDDBConf
-
-dataType="2010"
-
-DDDBConf(DataType=dataType)
-CondDB(IgnoreHeartBeat=True)
-
-if "UseLatestTags" in CondDB().__slots__:
- CondDB().UseLatestTags=[dataType, True]
-else:
- CondDB().useLatestTags(DataType=dataType, OnlyGlobalTags=True)
diff --git a/DaVinciTests/tests/options/db-latest-2010.py b/DaVinciTests/tests/options/db-latest-2010.py
deleted file mode 100644
index 5ebb18ea8b90766a6ad5dbfd8b5294985c0bba75..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/db-latest-2010.py
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-from Gaudi.Configuration import *
-from Configurables import LHCbApp, CondDB, DDDBConf
-
-dataType="2010"
-
-DDDBConf(DataType=dataType)
-CondDB(IgnoreHeartBeat=True)
-
-if "UseLatestTags" in CondDB().__slots__:
- CondDB().UseLatestTags=[dataType]
-else:
- CondDB().useLatestTags(DataType=dataType, OnlyGlobalTags=False)
diff --git a/DaVinciTests/tests/options/dimuon_testfile.py b/DaVinciTests/tests/options/dimuon_testfile.py
deleted file mode 100644
index 7618baf7dc16ec913b534ba6151692243d0b8a19..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/dimuon_testfile.py
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-from PRConfig import TestFileDB
-from Configurables import DaVinci
-
-TestFileDB.test_file_db["2012_DaVinciTests.stripping.test_express_appconfig"].run(configurable=DaVinci())
diff --git a/DaVinciTests/tests/options/fsrs/davinci-merge.py b/DaVinciTests/tests/options/fsrs/davinci-merge.py
deleted file mode 100644
index 6f78a868f4c417f66d8b1d9a0f40eb19ff06ce44..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/fsrs/davinci-merge.py
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# (c) Copyright 2000-2018 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. #
-###############################################################################
-from Gaudi.Configuration import *
-from Configurables import InputCopyStream
-
-InputCopyStream().Output = "DATAFILE='PFN:DaVinci-Merged-2010.dst' TYP='POOL_ROOTTREE' OPT='REC'"
-
-ApplicationMgr().EvtMax = -1
-
-from Configurables import RecordStream
-FileRecords = RecordStream("FileRecords")
-FileRecords.Output = "DATAFILE='PFN:DaVinci-Merged-2010.dst' TYP='POOL_ROOTTREE' OPT='REC'"
diff --git a/DaVinciTests/tests/options/fsrs/test-genfsr.py b/DaVinciTests/tests/options/fsrs/test-genfsr.py
index 1690ae4a50a3c98e9df5e7fc04d5c5e0b55ac6c1..115a199d51a2bb94da23217b401673cd70901130 100644
--- a/DaVinciTests/tests/options/fsrs/test-genfsr.py
+++ b/DaVinciTests/tests/options/fsrs/test-genfsr.py
@@ -1,5 +1,5 @@
###############################################################################
-# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration #
+# (c) Copyright 2000-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". #
@@ -12,19 +12,19 @@ from Gaudi.Configuration import *
from Configurables import GaudiSequencer
seqGenFSR = GaudiSequencer("GenFSRSeq")
-seqGenFSR.Members += [ "GenFSRMerge" ]
-seqGenFSR.Members += [ "GenFSRLog" ]
+seqGenFSR.Members += ["GenFSRMerge"]
+seqGenFSR.Members += ["GenFSRLog"]
from Configurables import DaVinci
-DaVinci().DataType = "Upgrade"
-DaVinci().Simulation = True
+DaVinci().DataType = "Upgrade"
+DaVinci().Simulation = True
DaVinci().InputType = "LDST"
DaVinci().Lumi = False
DaVinci().UserAlgorithms = [seqGenFSR]
from Configurables import LHCbApp, CondDB
-CondDB().Upgrade = True
-LHCbApp().DDDBtag = "dddb-20171126"
+CondDB().Upgrade = True
+LHCbApp().DDDBtag = "dddb-20171126"
LHCbApp().CondDBtag = "sim-20171127-vc-md100"
from PRConfig import TestFileDB
diff --git a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
index 1ca5f63b2460c43e8f21660909c178455ed2eec1..feb745aae45af581c92864ccf3e1dd31d8c1a4bf 100755
--- a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
+++ b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
index 2ab4463e9882258b106e7c544da9a3c9c6c8696b..1dcaaf278d4ddcacfaaff06cc0cdac3678623e7b 100755
--- a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
+++ b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/configure_dst.qmt b/DaVinciTests/tests/qmtest/davinci.qms/configure_dst.qmt
index 645ccd0bf850926a33e4047d325920d3dd65510f..d47fa4728cc0c5b4146c886e789b31ebbb5b1aad 100644
--- a/DaVinciTests/tests/qmtest/davinci.qms/configure_dst.qmt
+++ b/DaVinciTests/tests/qmtest/davinci.qms/configure_dst.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/configure_mdst.qmt b/DaVinciTests/tests/qmtest/davinci.qms/configure_mdst.qmt
index d91f4e090b89eb4c2209547ce59bee664232cdf2..72d536a33c9977346546df4e7b7fccb7484d13da 100644
--- a/DaVinciTests/tests/qmtest/davinci.qms/configure_mdst.qmt
+++ b/DaVinciTests/tests/qmtest/davinci.qms/configure_mdst.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/gaudipython_algs.qmt b/DaVinciTests/tests/qmtest/davinci.qms/gaudipython_algs.qmt
index 0c1598d84e8d11a0ebbdb47f7f0c509812f7d81a..7bef74023f75fdd81fa44fd4f65ee7884edcd557 100644
--- a/DaVinciTests/tests/qmtest/davinci.qms/gaudipython_algs.qmt
+++ b/DaVinciTests/tests/qmtest/davinci.qms/gaudipython_algs.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/test_print_decay.qmt b/DaVinciTests/tests/qmtest/davinci.qms/test_print_decay.qmt
new file mode 100755
index 0000000000000000000000000000000000000000..fe09acc826acce4bb8d59bc2edb88963aaaac5bb
--- /dev/null
+++ b/DaVinciTests/tests/qmtest/davinci.qms/test_print_decay.qmt
@@ -0,0 +1,35 @@
+<?xml version="1.0" ?>
+<!--
+ (c) Copyright 2000-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'>
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+<argument name="program"><text>gaudirun.py</text></argument>
+<argument name="timeout"><integer>3600</integer></argument>
+<argument name="args"><set>
+ <text>../options/DVTestPrintDecay.py</text>
+</set></argument>
+<argument name="validator"><text>
+findReferenceBlock("""
+PrintJpsi.PrintDecayTreeTool INFO Name E M P Pt phi Vz P(C/K) PP(C/K)
+PrintJpsi.PrintDecayTreeTool INFO MeV MeV MeV MeV mrad mm
+PrintJpsi.PrintDecayTreeTool INFO J/psi(1S) 15767.75 3071.71 15465.66 2094.67 2606.38 33.92 0/0 N/A
+PrintJpsi.PrintDecayTreeTool INFO +-->mu+ 10327.51 105.66 10326.97 2823.87 2629.61 64.74 1/4 2/150
+PrintJpsi.PrintDecayTreeTool INFO +-->mu- 5440.94 105.66 5439.91 732.58 -443.98 -29.25 1/1 2/85
+PrintJpsi.PrintDecayTreeTool INFO
+PrintJpsi.PrintDecayTreeTool INFO Used TES locations :-
+PrintJpsi.PrintDecayTreeTool INFO 1 = '/Event/Phys/StdAllLooseMuons/Particles'
+PrintJpsi.PrintDecayTreeTool INFO 0 = '/Event/Phys/StdLooseJpsi2MuMu/Particles'
+PrintJpsi.PrintDecayTreeTool INFO 2 = '/Event/Rec/ProtoP/Charged'
+PrintJpsi.PrintDecayTreeTool INFO
+""", stdout, result, causes, signature_offset = 0)
+countErrorLines({"FATAL":0})
+</text></argument>
+</extension>
diff --git a/DaVinciTests/tests/qmtest/dtfdict.qms/test_dtfdict.qmt b/DaVinciTests/tests/qmtest/dtfdict.qms/test_dtfdict.qmt
index 20463233dcfbb5fb2f44199ae3c458a342903c5a..8a28edb4bdc8f256a60bbd62fd52986b34031051 100644
--- a/DaVinciTests/tests/qmtest/dtfdict.qms/test_dtfdict.qmt
+++ b/DaVinciTests/tests/qmtest/dtfdict.qms/test_dtfdict.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/fsrs.qms/test-genfsr.qmt b/DaVinciTests/tests/qmtest/fsrs.qms/test-genfsr.qmt
index 3aef9e871c50415fb7be265e0baf7c386def909f..b448e67235534dab280588ebce5a6ec8631f599d 100644
--- a/DaVinciTests/tests/qmtest/fsrs.qms/test-genfsr.qmt
+++ b/DaVinciTests/tests/qmtest/fsrs.qms/test-genfsr.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.3/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_digi.qmt b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_digi.qmt
index c4295453124ec852df1d49d511ad76950c5696dc..3ddc4116cc707491399844ef78a964133ff0b128 100644
--- a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_digi.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_digi.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_ldst.qmt b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_ldst.qmt
index 44d2d435c277f86d28da5acc7001d59e8dce40c5..67a8bf2af186062761aba95e9df84b648f81672e 100644
--- a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_ldst.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_ldst.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_mdf.qmt b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_mdf.qmt
index 418b8ad9eeae85e917ce237788bd40075bc42f70..0ca3cbf9933c9ca7c0a062d2c04d2696802f22d9 100644
--- a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_mdf.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_mdf.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_xdigi.qmt b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_xdigi.qmt
index c6244684304c8800109cbbc004a77b79c17bf360..2d12fbbe448ea0364b295fcc839f959e306ba06b 100644
--- a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_xdigi.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_xdigi.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt b/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
index 62541f17f34805a4b4ef32e70e7918021e43ad7b..062beeef30722e9e31cd38bc13bc58e2344a612d 100755
--- a/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_upgrade.qmt b/DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_upgrade.qmt
index 6c26524c68368d2b4bfdd2f9b2a7192c4a91d886..526f65fe59c8ed2dfc513d4223192b6774190321 100755
--- a/DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_upgrade.qmt
+++ b/DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_upgrade.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".
diff --git a/DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_upgrade.qmt b/DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_upgrade.qmt
index 7bc57c91953a6a232ad6cb405fd41b32cd36197d..8045e45b3776020e17b58fae31742b2131a21dc0 100755
--- a/DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_upgrade.qmt
+++ b/DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_upgrade.qmt
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<!--
- (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration
+ (c) Copyright 2000-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".