diff --git a/DaVinciSys/tests/options/DVTestInitialise.py b/DaVinciSys/tests/options/DVTestInitialise.py
index 7becd1b0b9621c0169d0e67e18501a70b3f909d1..d4fbd2678fe83940a2a6066623b2b508086a69d6 100755
--- a/DaVinciSys/tests/options/DVTestInitialise.py
+++ b/DaVinciSys/tests/options/DVTestInitialise.py
@@ -28,7 +28,7 @@ DaVinci().UserAlgorithms = [ ]
DaVinci().EvtMax = 0 # No running
DaVinci().SkipEvents = 0
DaVinci().PrintFreq = 1
-DaVinci().DataType = '2009'
+DaVinci().DataType = 'Upgrade'
DaVinci().Lumi = True
########################################################################
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/doc/release.notes b/DaVinciTests/doc/release.notes
index 4e4f6b79d901bd462cae23073da87af6ea36963f..4c14a9e578f08f3454ad1ec5f0386fd8f9fb74df 100644
--- a/DaVinciTests/doc/release.notes
+++ b/DaVinciTests/doc/release.notes
@@ -3,6 +3,7 @@
! Responsible : DaVinci coordinator
! Purpose : QMTests for DaVinci
!-----------------------------------------------------------------------------
+
!======================= DaVinciTests v3r5 2016-04-21 ========================
- 2016-07-20
diff --git a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
index 9e1562e86ddb87360b7ec6069d8c3e33b8be703f..4c217b8c4efe5e317d6c90315c801287263f704f 100644
--- a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
+++ b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
@@ -40,10 +40,19 @@ DaVinci().HistogramFile = "DVStandardIntermediate.root"
# Most of this will be configured from Dirac
#
##############################################################################
+from Configurables import CondDB
+
DaVinci().UserAlgorithms = [ CP ] # count them all
DaVinci().EvtMax = 500
-DaVinci().DataType = "2015"
-DaVinci().Simulation = False
-DaVinci().InputType = "DST"
+DaVinci().DataType = "Upgrade" # Must be given
+DaVinci().Simulation = True
+DaVinci().InputType = 'LDST'
+DaVinci().Lumi = False
+CondDB().Upgrade = True
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
+
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run()
diff --git a/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py b/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
index fc374b9a4905b95a3c15c09f99b55e558061ba7d..d2dcc9abc2e9076e12da5dcb5da6f68fbe304cc0 100644
--- a/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
+++ b/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
@@ -13,7 +13,6 @@
syntax: gaudirun.py $DAVINCIMONITORSROOT/options/TestStandardIntermediateCuts.py
Author: Juan Palacios <palacios@physik.uzh.ch>
-
"""
##############################################################################
from DaVinci.Configuration import DaVinci
@@ -26,12 +25,16 @@ List = []
for a,b in StandardIntermediate.locations.iteritems():
print "DVTestCommonParticles adding location", a
- List.append(b) # ist of algorithms
+ List.append(b) # list of algorithms
DaVinci( UserAlgorithms = List,
EvtMax = 1,
- DataType = "2010",
- Simulation = False,
- InputType = "DST" )
+ DataType = "Upgrade",
+ Simulation = True,
+ InputType = "LDST"
+ )
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
+
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run()
diff --git a/DaVinciTests/tests/options/DVTestInitialise.py b/DaVinciTests/tests/options/DVTestInitialise.py
index 9601df6429982e0e2af287a7347efabafc46d459..c4a5e23aaeded81b26e7cbe86955f1221b9904c1 100755
--- a/DaVinciTests/tests/options/DVTestInitialise.py
+++ b/DaVinciTests/tests/options/DVTestInitialise.py
@@ -22,14 +22,17 @@ Test for DaVinci initialisation
"""
from Gaudi.Configuration import *
from Configurables import DaVinci
+
DaVinci().MainOptions = ""
DaVinci().UserAlgorithms = [ ]
DaVinci().EvtMax = 0 # No running
DaVinci().SkipEvents = 0
DaVinci().PrintFreq = 1
-DaVinci().DataType = '2009'
+DaVinci().DataType = 'Upgrade'
+DaVinci().Simulation = False
DaVinci().Lumi = True
+
########################################################################
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/DVTestTurbo2016.py b/DaVinciTests/tests/options/DVTestTurbo2016.py
deleted file mode 100644
index c725bd641d5390a4fc1a4da655259dc0abfd04f2..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DVTestTurbo2016.py
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# (c) Copyright 2020 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. #
-###############################################################################
-'''Test accessing candidates on Turbo mdst.'''
-
-from Configurables import DaVinci, LoKi__HDRFilter
-from GaudiConf import IOHelper
-from PhysSelPython.Wrappers import AutomaticData, ValidBPVSelection, SelectionSequence
-
-# 2018 Turbo data.
-IOHelper('ROOT').inputFiles([
- 'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000005_1.charmtwobody.mdst',
- 'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000012_1.charmtwobody.mdst',
- 'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/LHCb/Collision18/CHARMTWOBODY.MDST/00075136/0000/00075136_00000026_1.charmtwobody.mdst',
-])
-
-# Configure the data settings.
-DaVinci().TurboStream = 'Charmtwobody'
-DaVinci().DataType = '2018'
-DaVinci().DDDBtag = 'dddb-20190206-3'
-DaVinci().CondDBtag = 'cond-20191004-3'
-DaVinci().EvtMax = 1000
-
-# Get particles from an HLT2 line and check that they have a valid BPV
-line = 'Hlt2CharmHadDstp2D0Pip_D02KmPipTurbo'
-data = AutomaticData(line + '/Particles')
-validbpv = ValidBPVSelection([data])
-selseq = SelectionSequence(line + 'Seq', TopSelection=validbpv)
-DaVinci().UserAlgorithms.append(selseq.sequence())
-DaVinci().EventPreFilters = [
- LoKi__HDRFilter(
- 'PreFilter',
- Code='HLT_PASS({0!r})'.format(line + 'Decision'),
- Location='Hlt2/DecReports')
-]
diff --git a/DaVinciTests/tests/options/DVTestWriteDst.py b/DaVinciTests/tests/options/DVTestWriteDst.py
index eb66d5cdb9053c430b4e2e261ad79a2d9cb1e165..c7560e2552882bf1c812ffe9d588fa8172847b8b 100755
--- a/DaVinciTests/tests/options/DVTestWriteDst.py
+++ b/DaVinciTests/tests/options/DVTestWriteDst.py
@@ -60,7 +60,7 @@ for i in MassRanges :
SelJpsi = Selection('SelJpsi_'+name,
Algorithm = filter,
RequiredSelections = [ MyLooseJpsi ])
-
+
printer = PrintDecayTree("Print_"+name,
Inputs = [SelJpsi.outputLocation()])
@@ -81,11 +81,17 @@ seq = dstWriter.sequence()
DaVinci().UserAlgorithms = [ seq ]
##############################################################################
-DaVinci().EvtMax = 100
+from Configurables import CondDB
+DaVinci().EvtMax = 1000
DaVinci().PrintFreq = 100
# DaVinci().SkipEvents = 0
-DaVinci().DataType = "2010"
-DaVinci().Simulation = True
+DaVinci().DataType = "Upgrade"
+DaVinci().Simulation = True
+DaVinci().InputType = 'LDST'
+DaVinci().Lumi = False
+CondDB().Upgrade = True
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
########################################################################
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
##############################################################################
@@ -95,7 +101,5 @@ MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
#-- 13144006 - 1 files - 10000 events - 4.13 GBytes
# MC 2010 Beam3500GeV-VeloClosed-MagDown-Nu3
# bs->Jpsi, Phi
-from Gaudi.Configuration import *
-
-EventSelector().Input = [
- "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/swtest/MC2010_BsJPsiPhi_00008405_00000506_1.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run()
diff --git a/DaVinciTests/tests/options/DV_MCuDST.py b/DaVinciTests/tests/options/DV_MCuDST.py
deleted file mode 100755
index f0572fad38929bb7648e7c662bf60aa34afd4825..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DV_MCuDST.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env gaudirun.py
-###############################################################################
-# (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. #
-###############################################################################
-# -*- coding: utf-8 -*-
-# =============================================================================
-# @file
-# Test for processing of MC-uDSTs
-# @author Vanya BELYAEV Ivan.Belyaev@itep.ru
-# @date 2017-05-16
-# =============================================================================
-
-
-from StandardParticles import StdTightKaons as kaons
-
-from PhysConf.Selections import RebuildSelection
-kaons = RebuildSelection ( kaons )
-
-from PhysConf.Selections import CombineSelection
-phi = CombineSelection (
- 'Phi' , ## the name
- kaons , ## input selection(s)
- ## algorithm properties
- DecayDescriptor = 'phi(1020) -> K+ K-' ,
- CombinationCut = " AM < 1050*MeV " ,
- MotherCut = " ( CHI2VX < 10 ) & ( M < 1045 * MeV )"
- )
-
-from PhysConf.Selections import FilterSelection
-phi = FilterSelection (
- "TruePhi" , ## the name
- phi , ## input selection(s)
- ## algorithm properties
- Code = "mcMatch('phi(1020) => K+ K-', 2 )" , ## use mcTruth for only long protoparticles
- Preambulo = [ 'from LoKiPhysMC.functions import mcMatch' ] ,
- )
-
-## from PhysConf.Selections import PrintSelection
-## phi = PrintSelection ( phi )
-
-from PhysConf.Selections import FilterSelection
-phi = FilterSelection (
- "MassPhi" , ## the name
- phi , ## input selection(s)
- ## algorithm properties
- Code = "0 < monitor( M/GeV , 'MASSPHI', 'MassKK' , histo)" ,
- Preambulo = [
- 'from LoKiCore.functions import monitor, Gaudi' ,
- 'histo = Gaudi.Histo1DDef( "mass(K+K-)" , 1. , 1.04 , 80 )'
- ]
- )
-
-
-from Configurables import DaVinci
-
-daVinci = DaVinci (
- InputType = 'MDST' ,
- DataType = "2016" ,
- Simulation = True ,
- StrippingStream='AllStreams' ,
- ##
- HistogramFile = "DVHistos.root" ,
- ##
- CondDBtag = 'sim-20160820-vc-md100' ,
- DDDBtag = 'dddb-20150724'
- )
-
-
-from PhysConf.Selections import SelectionSequence
-seq = SelectionSequence( 'SEQ' , phi ).sequence()
-
-
-## assume here the merge request !62
-daVinci.UserAlgorithms = [ phi ]
-
-daVinci.EvtMax = 2000
-
-daVinci.Input = [
- "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/MC/2016/ALLSTREAMS.MDST/00054389/0000/00054389_00000078_3.AllStreams.mdst' SVC='Gaudi::RootEvtSelector' OPT='READ'",
- ]
-
-# =============================================================================
-# The END
-# =============================================================================
-
diff --git a/DaVinciTests/tests/options/DV_Turbo_Error.py b/DaVinciTests/tests/options/DV_Turbo_Error.py
deleted file mode 100644
index 97545ef58d4ad5cc10f6a5ac472b4be61cd1ca0e..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DV_Turbo_Error.py
+++ /dev/null
@@ -1,19 +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. #
-###############################################################################
-"""Invalid configuration for running over Turbo data."""
-from Configurables import DaVinci
-
-dv = DaVinci()
-dv.DataType = '2016'
-dv.InputType = 'MDST'
-dv.Turbo = True
-# The absence of this setting should cause DaVinci to throw an exception
-# dv.RootInTES = '/Event/Turbo'
diff --git a/DaVinciTests/tests/options/DV_Turbo_Implicit.py b/DaVinciTests/tests/options/DV_Turbo_Implicit.py
deleted file mode 100755
index 8a3714dbe44a4fbe8a83d5a2876f9268d6f63377..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DV_Turbo_Implicit.py
+++ /dev/null
@@ -1,24 +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. #
-###############################################################################
-"""Valid configuration for running over Turbo data.
-
-We don't set InputType to MDST explicitly, but this should be done by the
-DaVinci configuration.
-"""
-from Configurables import DaVinci
-
-dv = DaVinci()
-dv.DataType = '2016'
-# This value should be set automatically as Turbo = True (although it's better
-# to set it explicitly anyway)
-# dv.InputType = 'MDST'
-dv.Turbo = True
-dv.RootInTES = '/Event/Turbo'
diff --git a/DaVinciTests/tests/options/DV_Turbo_OK.py b/DaVinciTests/tests/options/DV_Turbo_OK.py
deleted file mode 100755
index 17eae855d8ca29f1b3651a9b327b8232586a41aa..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/DV_Turbo_OK.py
+++ /dev/null
@@ -1,18 +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. #
-###############################################################################
-"""Valid configuration for running over Turbo data."""
-from Configurables import DaVinci
-
-dv = DaVinci()
-dv.DataType = '2016'
-dv.InputType = 'MDST'
-dv.Turbo = True
-dv.RootInTES = '/Event/Turbo'
diff --git a/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Stripping20-Test.py b/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
similarity index 74%
rename from DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Stripping20-Test.py
rename to DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
index 56e1c65e6963084e2de9b98b4126cfaf6388767e..1193d553d4da329385105f2472b25c07f09b4d68 100755
--- a/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Stripping20-Test.py
+++ b/DaVinciTests/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py
@@ -13,14 +13,30 @@
from Gaudi.Configuration import *
from Configurables import GaudiSequencer
from Configurables import DaVinci, PhysConf
+from Configurables import CondDB
########################################################################
DaVinci().EvtMax = 100 # Number of events
DaVinci().PrintFreq = 10 # Events to skip
-DaVinci().DataType = "2012" # Must be given
+DaVinci().DataType = "Upgrade" # Must be given
+DaVinci().Simulation = True
+DaVinci().InputType = 'LDST'
+DaVinci().Lumi = False
+CondDB().Upgrade = True
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
+
DaVinci().HistogramFile = "dst-annpid.root"
########################################################################
+from Configurables import L0Conf
+L0Conf().EnsureKnownTCK=False
+
from Configurables import ANNGlobalPID__ChargedProtoANNPIDMoni
DaVinci().UserAlgorithms += [ ANNGlobalPID__ChargedProtoANNPIDMoni("ANNPIDMoni") ]
+
+########################################################################
+
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run()
diff --git a/DaVinciTests/tests/options/PID/DaVinci-uDST-ANNPID-Stripping20-Test.py b/DaVinciTests/tests/options/PID/DaVinci-uDST-ANNPID-Stripping20-Test.py
deleted file mode 100755
index 87d3c38c7305c5a514074528d396acf242e17176..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/PID/DaVinci-uDST-ANNPID-Stripping20-Test.py
+++ /dev/null
@@ -1,38 +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 GaudiSequencer
-from Configurables import DaVinci, PhysConf
-########################################################################
-
-DaVinci().EvtMax = 1000 # Number of events
-DaVinci().PrintFreq = 100 # Events to skip
-DaVinci().DataType = "2012" # Must be given
-DaVinci().HistogramFile = "udst-annpid.root"
-DaVinci().InputType = "MDST"
-
-########################################################################
-
-from Configurables import ( ANNGlobalPID__ChargedProtoANNPIDMoni,
- TESCheck, GaudiSequencer )
-protoLoc = "/Event/Bhadron/Rec/ProtoP/Charged"
-seq = GaudiSequencer("ANNPIDCheckSeq")
-seq.Members += [
- TESCheck( "CheckProtos",
- Inputs = [protoLoc],
- OutputLevel = 5,
- Stop = False ),
- ANNGlobalPID__ChargedProtoANNPIDMoni( "ANNPIDMoni",
- ProtoParticleLocation = protoLoc )
- ]
-DaVinci().UserAlgorithms = [seq]
diff --git a/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Stripping20-Test.py b/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
similarity index 73%
rename from DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Stripping20-Test.py
rename to DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
index fff2b1618a9ccb76f37eef3f99396a35760596e1..95716a4ddff12bd65fd214b7d46ac60108727c27 100755
--- a/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Stripping20-Test.py
+++ b/DaVinciTests/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py
@@ -13,14 +13,30 @@
from Gaudi.Configuration import *
from Configurables import GaudiSequencer
from Configurables import DaVinci, PhysConf
+from Configurables import CondDB
########################################################################
DaVinci().EvtMax = 100 # Number of events
DaVinci().PrintFreq = 10 # Events to skip
-DaVinci().DataType = "2012" # Must be given
+DaVinci().DataType = "Upgrade" # Must be given
+DaVinci().Simulation = True
+DaVinci().InputType = 'LDST'
+DaVinci().Lumi = False
+CondDB().Upgrade = True
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
+
DaVinci().HistogramFile = "dst-unpacking.root"
########################################################################
+from Configurables import L0Conf
+L0Conf().EnsureKnownTCK=False
+
from Configurables import TrackMonitor
DaVinci().UserAlgorithms += [ TrackMonitor() ]
+
+########################################################################
+
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run()
diff --git a/DaVinciTests/tests/options/Packing/DaVinci-uDSTUnpacking-Stripping20-Test.py b/DaVinciTests/tests/options/Packing/DaVinci-uDSTUnpacking-Stripping20-Test.py
deleted file mode 100755
index fc2f9b1d215c7ec35b9d640a7dd06e116da4a72f..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/Packing/DaVinci-uDSTUnpacking-Stripping20-Test.py
+++ /dev/null
@@ -1,67 +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 GaudiSequencer
-from Configurables import DaVinci, PhysConf
-########################################################################
-
-DaVinci().EvtMax = 1000 # Number of events
-DaVinci().PrintFreq = 100 # Events to skip
-DaVinci().DataType = "2012" # Must be given
-DaVinci().HistogramFile = "udst-unpacking.root"
-DaVinci().InputType = "MDST"
-
-########################################################################
-
-from Configurables import DataObjectVersionFilter
-DaVinci().UserAlgorithms += [
- DataObjectVersionFilter( "CheckDecReports",
- DataObjectLocation = "/Event/Strip/Phys/DecReports",
- MaxVersion = 999,
- OutputLevel = 3 ),
- DataObjectVersionFilter( "CheckTracks",
- DataObjectLocation = "/Event/Bhadron/Rec/Track/Best",
- MaxVersion = 999 ),
- DataObjectVersionFilter( "CheckVeloClusters",
- DataObjectLocation = "/Event/Bhadron/Raw/Velo/Clusters",
- MaxVersion = 999,
- OutputLevel = 3 ),
- DataObjectVersionFilter( "CheckCaloElectrons",
- DataObjectLocation = "/Event/Bhadron/Rec/Calo/Electrons",
- MaxVersion = 999,
- OutputLevel = 3 ),
- DataObjectVersionFilter( "CheckCaloPhotons",
- DataObjectLocation = "/Event/Bhadron/Rec/Calo/Photons",
- MaxVersion = 999,
- OutputLevel = 3 ),
-# DataObjectVersionFilter( "CheckLiteTTClusters",
-# DataObjectLocation = "/Event/Bhadron/Raw/TT/LiteClusters",
-# MaxVersion = 999,
-# OutputLevel = 3 ),
-# DataObjectVersionFilter( "CheckLiteITClusters",
-# DataObjectLocation = "/Event/Bhadron/Raw/IT/LiteClusters",
-# MaxVersion = 999,
-# OutputLevel = 3 ),
-# DataObjectVersionFilter( "CheckLiteVeloClusters",
-# DataObjectLocation = "/Event/Bhadron/Raw/Velo/LiteClusters",
-# MaxVersion = 999,
-# OutputLevel = 3 ),
- DataObjectVersionFilter( "CheckBhadronKaons",
- DataObjectLocation = "/Event/Bhadron/Phys/StdAllNoPIDsKaons/Particles",
- MaxVersion = 999,
- OutputLevel = 3 ),
- DataObjectVersionFilter( "CheckPVs",
- DataObjectLocation = "/Event/Bhadron/Rec/Vertex/Primary",
- MaxVersion = 999,
- OutputLevel = 3 )
- ]
diff --git a/DaVinciTests/tests/options/Tagging/DVTestTagging-MC12.py b/DaVinciTests/tests/options/Tagging/DVTestTagging-MC12.py
deleted file mode 100644
index 623fc9e57bc636961898983791ab7f274d9f67f4..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/Tagging/DVTestTagging-MC12.py
+++ /dev/null
@@ -1,105 +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. #
-###############################################################################
-########################################################################
-#
-# Example Options for BTagging algorithm
-#
-# @author Marco Musy
-# @date 2010-09-29
-#
-########################################################################
-from Gaudi.Configuration import *
-import GaudiPython
-from Configurables import GaudiSequencer
-########################################################################
-#
-# Some selections.
-#
-from Configurables import CheatedSelection, BDecayTool, MCDecayFinder
-
-from GaudiKernel import ROOT6WorkAroundEnabled
-if ROOT6WorkAroundEnabled('ROOT-7492'):
- # trigger autoloading of LHCbKernel dictionary
- GaudiPython.gbl.LHCb.LHCbID
- # trigger autoloading of DigiEvent dictionary
- GaudiPython.gbl.LHCb.CaloDigit
-
-
-myDecay = '[B+ -> (J/psi(1S) => mu+ mu- ) K+]cc'
-
-cheatsel = CheatedSelection("CheatedSelection")
-cheatsel.Inputs = [ "Phys/TaggingPions" ]
-cheatsel.AssociatorInputData = [ "Phys/CheatedSelection/Particles" ]
-cheatsel.OutputLevel = 5
-
-cheatsel.addTool( BDecayTool )
-cheatsel.BDecayTool.addTool( MCDecayFinder )
-cheatsel.BDecayTool.MCDecayFinder.Decay = myDecay
-########################################################################
-#
-# Flavour tagging.
-#
-location = "Phys/CheatedSelection"
-
-####
-from Configurables import BTagging, BTaggingTool, BTaggingChecker, BDecayTool, MCDecayFinder
-
-tag = BTagging("BTagging")
-tag.Inputs = [ location ]
-#tag.OutputLevel = 5
-tag.addTool( BDecayTool )
-tag.BDecayTool.addTool( MCDecayFinder )
-tag.BDecayTool.MCDecayFinder.Decay = myDecay
-tag.addTool( BTaggingTool )
-tag.BTaggingTool.ChoosePVCriterium = "PVbyIP" #needed by CheatedSel
-
-
-# Reco14
-from FlavourTagging.Tunings import TuneTool
-TuneTool(tag,"Stripping23")
-
-# Flavour tagging Checker:
-tagcheck = BTaggingChecker("BTaggingChecker")
-tagcheck.Inputs = [ location ]
-tagcheck.TagsLocation = location+"/FlavourTags"
-#tagcheck.OutputLevel = 1
-tagcheck.addTool( BDecayTool )
-tagcheck.BDecayTool.addTool( MCDecayFinder )
-tagcheck.BDecayTool.MCDecayFinder.Decay = myDecay
-MessageSvc().Format = "% F%40W%S%7W%R%T %0W%M"
-########################################################################
-#
-# Standard configuration
-#
-from Configurables import DaVinci
-DaVinci().EvtMax = 1000 # Number of events
-DaVinci().SkipEvents = 0 # Events to skip
-DaVinci().PrintFreq = 100
-DaVinci().DataType = "2012"
-DaVinci().CondDBtag = 'sim-20121025-vc-mu100'
-DaVinci().DDDBtag = "dddb-20120831"
-DaVinci().Simulation = True
-from Configurables import StoreExplorerAlg, PrintDecayTree
-PrintDecayTree().Inputs = [ location ]
-DaVinci().MoniSequence = [ #PrintDecayTree()
- cheatsel
- ,tag
- ,tagcheck
- ] # The algorithms
-
-#from GaudiConf import IOHelper
-#IOHelper().inputFiles(['PFN:root://eoslhcb.cern.ch//eos/lhcb/freezer/lhcb/MC/2012/ALLSTREAMS.DST/00021062/0000/00021062_00000001_1.allstreams.dst']) # Bu2JpsiK
-
-importOptions( '$PRCONFIGOPTS/DaVinci/FlavourTagging/MC12-B2JPsiMuMuK.py' )
-
-appMgr = GaudiPython.AppMgr()
-
-appMgr.run( DaVinci().EvtMax )
diff --git a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
similarity index 80%
rename from DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py
rename to DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
index 07282ee99c6e58bcb19cfa24a3461ee1658a9664..71a7b2c671f169ade3b851162e16bafa2add3be8 100644
--- a/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Run1.py
+++ b/DaVinciTests/tests/options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py
@@ -30,7 +30,8 @@ if ROOT6WorkAroundEnabled('ROOT-7492'):
# trigger autoloading of DigiEvent dictionary
GaudiPython.gbl.LHCb.CaloDigit
-myDecay = '[B+ -> (J/psi(1S) => mu+ mu- ) K+]cc'
+#myDecay = '[B0 -> (J/psi(1S) => mu+ mu- ) X+]cc'
+myDecay = '[B0 -> pi+ pi- pi0]cc'
cheatsel = CheatedSelection("CheatedSelection")
cheatsel.Inputs = [ "Phys/TaggingPions" ]
@@ -73,13 +74,22 @@ MessageSvc().Format = "% F%40W%S%7W%R%T %0W%M"
# standard configuration
from Configurables import DaVinci
-DaVinci().EvtMax = 1000 # Number of events
-DaVinci().SkipEvents = 0 # Events to skip
+from Configurables import CondDB
+
+DaVinci().EvtMax = 5000 # Number of events
+DaVinci().SkipEvents = 0 # Events to skip
DaVinci().PrintFreq = 100
-DaVinci().DataType = "2012"
-DaVinci().CondDBtag = 'sim-20121025-vc-mu100'
-DaVinci().DDDBtag = "dddb-20120831"
-DaVinci().Simulation = True
+DaVinci().DataType = "Upgrade"
+DaVinci().Simulation = True
+DaVinci().InputType = 'LDST'
+DaVinci().Lumi = False
+CondDB().Upgrade = True
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
+
+from Configurables import L0Conf
+L0Conf().EnsureKnownTCK=False
+
from Configurables import StoreExplorerAlg, PrintDecayTree
PrintDecayTree().Inputs = [ location ]
DaVinci().MoniSequence = [
@@ -91,7 +101,11 @@ DaVinci().MoniSequence = [
#from GaudiConf import IOHelper
#IOHelper().inputFiles(['PFN:root://eoslhcb.cern.ch//eos/lhcb/freezer/lhcb/MC/2012/ALLSTREAMS.DST/00021062/0000/00021062_00000001_1.allstreams.dst']) # Bu2JpsiK
-importOptions( '$PRCONFIGOPTS/DaVinci/FlavourTagging/MC12-B2JPsiMuMuK.py' )
+#importOptions( '$PRCONFIGOPTS/DaVinci/FlavourTagging/MC12-B2JPsiMuMuK.py' )
+
+from PRConfig import TestFileDB
+#TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run()
+TestFileDB.test_file_db["Upgrade_Bd_pi+pi-pi0_LDST"].run()
appMgr = GaudiPython.AppMgr()
diff --git a/DaVinciTests/tests/options/TurboMC_2015.py b/DaVinciTests/tests/options/TurboMC_2015.py
deleted file mode 100644
index 516a32f5960c038c5c9aeac0479ddce18b6329b6..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/TurboMC_2015.py
+++ /dev/null
@@ -1,54 +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 DaVinci, DecayTreeTuple
-from DecayTreeTuple import Configuration
-from GaudiConf import IOHelper
-from PhysConf.Filters import LoKi_Filters
-from TeslaTools import TeslaTruthUtils
-
-hlt2_line = 'Hlt2CharmHadDstp2D0Pip_D02KmPipTurbo'
-
-dtt = DecayTreeTuple('TupleDstToD0pi_D0ToKpi')
-# Don't run TupleToolANNPID; we don't have access to Run 2 tunings on the
-# master branch
-dtt.ToolList = ['TupleToolGeometry', 'TupleToolKinematic', 'TupleToolPid']
-dtt.Inputs = ['{0}/Particles'.format(hlt2_line)]
-dtt.Decay = '[D*(2010)+ -> ^(D0 -> ^K- ^pi+) ^pi+]CC'
-dtt.addBranches({
- 'Dst': '[D*(2010)+ -> (D0 -> K- pi+) pi+]CC',
- 'D0': '[D*(2010)+ -> ^(D0 -> K- pi+) pi+]CC',
- 'D0_K': '[D*(2010)+ -> (D0 -> ^K- pi+) pi+]CC',
- 'D0_pi': '[D*(2010)+ -> (D0 -> K- ^pi+) pi+]CC',
- 'Dst_pi': '[D*(2010)+ -> (D0 -> K- pi+) ^pi+]CC'
-})
-dtt.ToolList += [
- 'TupleToolMCBackgroundInfo',
- 'TupleToolMCTruth'
-]
-relations = [TeslaTruthUtils.getRelLoc('')]
-mc_tools = [
- 'MCTupleToolKinematic'
-]
-TeslaTruthUtils.makeTruth(dtt, relations, mc_tools)
-
-trigger_filter = LoKi_Filters(
- HLT2_Code="HLT_PASS_RE('^{0}Decision$')".format(hlt2_line)
-)
-
-DaVinci().EventPreFilters = trigger_filter.filters('TriggerFilters')
-DaVinci().UserAlgorithms = [dtt]
-DaVinci().TupleFile = 'TurboMC_2015.root'
-DaVinci().EvtMax = 1000
-
-# Found with `lb-run LHCbDirac dirac-dms-lfn-accessURL --Protocol=xroot /lhcb/MC/2015/DST/00064085/0000/00064085_00000001_1.dst`
-IOHelper().inputFiles([
- 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/MC/2015/DST/00064085/0000/00064085_00000001_1.dst'
-])
diff --git a/DaVinciTests/tests/options/TurboMC_2016.py b/DaVinciTests/tests/options/TurboMC_2016.py
deleted file mode 100644
index 875ee5131fb24cdfda7ec0492620977a26086680..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/TurboMC_2016.py
+++ /dev/null
@@ -1,53 +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 DaVinci, DecayTreeTuple
-from DecayTreeTuple import Configuration
-from GaudiConf import IOHelper
-from PhysConf.Filters import LoKi_Filters
-from TeslaTools import TeslaTruthUtils
-
-hlt2_line = 'Hlt2CharmHadDstp2D0Pip_D02KmPipTurbo'
-
-dtt = DecayTreeTuple('TupleDstToD0pi_D0ToKpi')
-# Don't run TupleToolANNPID; we don't have access to Run 2 tunings on the
-# master branch
-dtt.ToolList = ['TupleToolGeometry', 'TupleToolKinematic', 'TupleToolPid']
-dtt.Inputs = ['{0}/Particles'.format(hlt2_line)]
-dtt.Decay = '[D*(2010)+ -> ^(D0 -> ^K- ^pi+) ^pi+]CC'
-dtt.addBranches({
- 'Dst': '[D*(2010)+ -> (D0 -> K- pi+) pi+]CC',
- 'D0': '[D*(2010)+ -> ^(D0 -> K- pi+) pi+]CC',
- 'D0_K': '[D*(2010)+ -> (D0 -> ^K- pi+) pi+]CC',
- 'D0_pi': '[D*(2010)+ -> (D0 -> K- ^pi+) pi+]CC',
- 'Dst_pi': '[D*(2010)+ -> (D0 -> K- pi+) ^pi+]CC'
-})
-dtt.ToolList += [
- 'TupleToolMCBackgroundInfo',
- 'TupleToolMCTruth'
-]
-relations = [TeslaTruthUtils.getRelLoc('')]
-mc_tools = [
- 'MCTupleToolKinematic'
-]
-TeslaTruthUtils.makeTruth(dtt, relations, mc_tools)
-
-trigger_filter = LoKi_Filters(
- HLT2_Code="HLT_PASS_RE('^{0}Decision$')".format(hlt2_line)
-)
-
-DaVinci().EventPreFilters = trigger_filter.filters('TriggerFilters')
-DaVinci().UserAlgorithms = [dtt]
-DaVinci().TupleFile = 'TurboMC_2016.root'
-
-# Found with `lb-run LHCbDirac dirac-dms-lfn-accessURL --Protocol=xroot /lhcb/MC/2016/DST/00066623/0000/00066623_00000001_1.dst`
-IOHelper().inputFiles([
- 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/MC/2016/DST/00066623/0000/00066623_00000001_1.dst'
-])
diff --git a/DaVinciTests/tests/options/TurboMC_2016_uDST.py b/DaVinciTests/tests/options/TurboMC_2016_uDST.py
deleted file mode 100644
index 6fcfe39b1fb890d2ed2b8c0cf64cf36850d2195a..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/TurboMC_2016_uDST.py
+++ /dev/null
@@ -1,109 +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 DaVinci, DecayTreeTuple, GaudiSequencer
-from DecayTreeTuple import Configuration
-from GaudiConf import IOHelper
-from PhysConf.Filters import LoKi_Filters
-from PhysSelPython.Selections import (
- AutomaticData,
- CombineSelection,
- RebuildSelection,
- SelectionSequence
-)
-from StandardParticles import StdAllLooseANNPions
-from TeslaTools import TeslaTruthUtils
-
-hlt2_line = 'Hlt2CharmHadLcpToPpKmPipTurbo'
-
-dtt = DecayTreeTuple('TupleLcTopKpi')
-# Don't run TupleToolANNPID; we don't have access to Run 2 tunings on the
-# master branch
-dtt.ToolList = ['TupleToolGeometry', 'TupleToolKinematic', 'TupleToolPid']
-dtt.Inputs = ['{0}/Particles'.format(hlt2_line)]
-dtt.Decay = '[Lambda_c+ -> ^p+ ^K- ^pi+]CC'
-dtt.addBranches({
- 'Lc': '[Lambda_c+ -> p+ K- pi+]CC',
- 'Lc_p': '[Lambda_c+ -> ^p+ K- pi+]CC',
- 'Lc_K': '[Lambda_c+ -> p+ ^K- pi+]CC',
- 'Lc_pi': '[Lambda_c+ -> p+ K- ^pi+]CC'
-})
-dtt.ToolList += [
- 'TupleToolMCBackgroundInfo',
- 'TupleToolMCTruth'
-]
-relations = [
- TeslaTruthUtils.getRelLoc(''),
- # This location is required for truth-matching objects from Turbo++
- '/Event/Turbo/Relations/Hlt2/Protos/Charged'
-]
-mc_tools = [
- 'MCTupleToolKinematic'
-]
-TeslaTruthUtils.makeTruth(dtt, relations, mc_tools)
-
-# The Lcp line was a PersistReco line in 2016, so we have access to the whole
-# HLT2 reconstruction here
-combiner_sel = CombineSelection(
- 'CombineLcpi',
- inputs=[
- AutomaticData('{0}/Particles'.format(hlt2_line)),
- RebuildSelection(StdAllLooseANNPions)
- ],
- DecayDescriptors=[
- '[Sigma_c++ -> Lambda_c+ pi+]cc',
- '[Sigma_c0 -> Lambda_c+ pi-]cc'
- ],
- DaughtersCuts={
- 'pi+': 'PROBNNpi > 0.2'
- },
- CombinationCut=(
- 'in_range(0, (AM - AM1 - AM2), 170)'
- ),
- MotherCut=(
- '(VFASPF(VCHI2PDOF) < 10) &'
- 'in_range(0, (M - M1 - M2), 150)'
- )
-)
-selseq = SelectionSequence(
- combiner_sel.name() + 'Sequence',
- TopSelection=combiner_sel
-)
-sc_dtt = DecayTreeTuple('TupleScToLcpi_LcTopKpi')
-sc_dtt.ToolList = dtt.ToolList
-sc_dtt.Inputs = [combiner_sel.outputLocation()]
-sc_dtt.Decay = '[(Sigma_c++|Sigma_c0) -> ^(Lambda_c+ -> ^p+ ^K- ^pi+) ^X]CC'
-sc_dtt.addBranches({
- 'Sc': '[Charm -> (Lambda_c+ -> p+ K- pi+) X]CC',
- 'Lc': '[Charm -> ^(Lambda_c+ -> p+ K- pi+) X]CC',
- 'Lc_p': '[Charm -> (Lambda_c+ -> ^p+ K- pi+) X]CC',
- 'Lc_K': '[Charm -> (Lambda_c+ -> p+ ^K- pi+) X]CC',
- 'Lc_pi': '[Charm -> (Lambda_c+ -> p+ K- ^pi+) X]CC',
- 'Sc_pi': '[Charm -> (Lambda_c+ -> p+ K- pi+) ^X]CC'
-})
-sc_dtt.ToolList += [
- 'TupleToolMCBackgroundInfo',
- 'TupleToolMCTruth'
-]
-TeslaTruthUtils.makeTruth(sc_dtt, relations, mc_tools)
-sc_seq = GaudiSequencer('SigmacSequence', Members=[selseq.sequence(), sc_dtt])
-
-trigger_filter = LoKi_Filters(
- HLT2_Code="HLT_PASS_RE('^{0}Decision$')".format(hlt2_line)
-)
-
-DaVinci().EventPreFilters = trigger_filter.filters('TriggerFilters')
-DaVinci().UserAlgorithms = [dtt, sc_seq]
-DaVinci().TupleFile = 'TurboMC_2016_uDST.root'
-
-# Found with `lb-run LHCbDirac dirac-dms-lfn-accessURL --Protocol=xroot /lhcb/MC/2016/ALLSTREAMS.MDST/00063447/0000/00063447_00000001_7.AllStreams.mdst`
-IOHelper().inputFiles([
- 'root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/swtest/lhcb/MC/2016/ALLSTREAMS.MDST/00063447/0000/00063447_00000001_7.AllStreams.mdst'
-])
diff --git a/DaVinciTests/tests/options/dtfdict.py b/DaVinciTests/tests/options/dtfdict.py
index 371ebc8b4153de0aaf16d48c2a5443af75ea74ea..8dbc713b9392abc16cb4a3724a096538477f7b79 100644
--- a/DaVinciTests/tests/options/dtfdict.py
+++ b/DaVinciTests/tests/options/dtfdict.py
@@ -14,7 +14,7 @@
Test of the DFTDict module
"""
-__author__ = "Alessio PIUCCI alessio.piucci@cern.ch"
+__author__ = "Davide Fazzini davide.fazzini@cern.ch"
from Configurables import DaVinci
@@ -29,13 +29,14 @@ from PhysSelPython.Wrappers import DataOnDemand
from Configurables import TupleToolDecayTreeFitter, TupleToolDecay, TupleToolKinematic
from Configurables import LoKi__Hybrid__DictOfFunctors, LoKi__Hybrid__Dict2Tuple
from Configurables import LoKi__Hybrid__DTFDict as DTFDict
+from Configurables import CondDB
def get_selection_sequence(name):
"""Get the selection from stripping stream"""
alg = FilterDesktop('SelFilterFor{}B2D'.format(name))
alg.Code = 'ALL'
- reqSels = [DataOnDemand(Location = 'Phys/Lb2LcDD2HHHPIDBeauty2CharmLine/Particles')]
+ reqSels = [DataOnDemand(Location = '/Phys/BetaSBd2JpsiKstarDetachedLine/Particles')]
sel = Selection('Sel' + name, Algorithm=alg, RequiredSelections=reqSels)
return SelectionSequence('SelSeq' + name, TopSelection=sel)
@@ -43,50 +44,59 @@ def get_selection_sequence(name):
####################
# some options
-DaVinci().Simulation = False
-DaVinci().Lumi = True
-DaVinci().DataType = '2012'
+DaVinci().EvtMax = -1 # 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
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
+
+from Configurables import L0Conf
+L0Conf().EnsureKnownTCK=False
#for MDST
-DaVinci(StrippingStream = 'Bhadron', InputType = 'MDST')
+DaVinci(StrippingStream = 'AllStreams', InputType = 'LDST')
DaVinci().EvtMax = 1000
DaVinci().TupleFile = 'test_DFTDict.root'
# define the sequence
-seq = GaudiSequencer('MyLb2LcDsDTTupleSeq')
+seq = GaudiSequencer('MyBd2KstMuMuDTTupleSeq')
-sel = get_selection_sequence('Lb2LcDs')
+sel = get_selection_sequence('Bd2JpsiKstarSel')
seq.Members += [sel.sequence()]
tuple_input = sel.outputLocation()
print "sequence test: passed"
# make a tuple
-tpl = DecayTreeTuple('Lb2LcDsDTTuple')
+tpl = DecayTreeTuple("Bd2JpsiKstar")
tpl.Inputs = [tuple_input]
tpl.ToolList = ['TupleToolKinematic']
-tpl.Decay = '[Lambda_b0 -> ^(Lambda_c+ -> ^p+ ^K- ^pi+) ^(D- -> ^K+ ^K- ^pi-)]CC'
+tpl.Decay = "[B0 -> ^(J/psi(1S) -> ^mu+ ^mu-) ^(K*(892)0 -> ^K+ ^pi-)]CC"
# add a branch
-tpl.addBranches({"Lb" : "[Lambda_b0 -> Lambda_c+ D-]CC"})
+tpl.addBranches({"B0" : "[B0 -> J/psi(1S) K*(892)0]CC"})
-tpl.Lb.ToolList = ["TupleToolDecayTreeFitter/Cons"] # fit with mass constraint
-tpl.Lb.addTool(TupleToolDecayTreeFitter("Cons"))
+tpl.B0.ToolList = ["TupleToolDecayTreeFitter/Cons"] # fit with mass constraint
+tpl.B0.addTool(TupleToolDecayTreeFitter("Cons"))
-DictTuple = tpl.Lb.addTupleTool(LoKi__Hybrid__Dict2Tuple, "DTFTuple")
+DictTuple = tpl.B0.addTupleTool(LoKi__Hybrid__Dict2Tuple, "DTFTuple")
DictTuple.addTool(DTFDict, "Cons")
DictTuple.Source = "LoKi::Hybrid::DTFDict/Cons"
DictTuple.NumVar = 100
DictTuple.Cons.constrainToOriginVertex = True
-DictTuple.Cons.daughtersToConstrain = ["Lambda_c+","D_s-"]
+DictTuple.Cons.daughtersToConstrain = ["J/psi(1S)", "K*(892)0"]
DictTuple.Cons.Substitutions = {
- 'Lambda_b0 -> Lambda_c+ ^D-' : 'D_s-',
- 'Lambda_b~0 -> Lambda_c~- ^D+' : 'D_s+',
+ 'J/psi(1S) -> ^mu+ mu-' : 'e+',
+ 'J/psi(1S) -> mu+ ^mu-' : 'e-',
}
print "LoKi__Hybrid__Dict2Tuple test: passed"
diff --git a/DaVinciTests/tests/options/fsrs/davinci-dumpfsrs.py b/DaVinciTests/tests/options/fsrs/davinci-dumpfsrs.py
deleted file mode 100644
index cfcc6654d2f1ca49ba4911912f2e762667efaa3f..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/options/fsrs/davinci-dumpfsrs.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 (DaVinci, DumpFSR)
-
-DaVinci().UserAlgorithms=[DumpFSR()]
diff --git a/DaVinciTests/tests/options/fsrs/test-genfsr.py b/DaVinciTests/tests/options/fsrs/test-genfsr.py
index c46d91c16e36e065f12a8e55280e82d5c1d10786..1690ae4a50a3c98e9df5e7fc04d5c5e0b55ac6c1 100644
--- a/DaVinciTests/tests/options/fsrs/test-genfsr.py
+++ b/DaVinciTests/tests/options/fsrs/test-genfsr.py
@@ -15,15 +15,17 @@ seqGenFSR = GaudiSequencer("GenFSRSeq")
seqGenFSR.Members += [ "GenFSRMerge" ]
seqGenFSR.Members += [ "GenFSRLog" ]
-from Configurables import LHCbApp
-LHCbApp().DDDBtag = "dddb-20130929-1"
-LHCbApp().CondDBtag = "sim-20130522-1-vc-md100"
-
from Configurables import DaVinci
-DaVinci().InputType = "DST"
-DaVinci().DataType = "2012"
+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"
+LHCbApp().CondDBtag = "sim-20171127-vc-md100"
+
from PRConfig import TestFileDB
-TestFileDB.test_file_db["genFSR_2012_dst"].run(configurable=DaVinci())
+TestFileDB.test_file_db["genFSR_upgrade_ldst"].run(configurable=DaVinci())
diff --git a/DaVinciTests/tests/options/gpython_algs.py b/DaVinciTests/tests/options/gpython_algs.py
index 55434b42b72b95b0410f33be037894c3936745ed..57044c99da0ba6d590ee8d76bc8f5c21fa9341d8 100755
--- a/DaVinciTests/tests/options/gpython_algs.py
+++ b/DaVinciTests/tests/options/gpython_algs.py
@@ -25,9 +25,10 @@
##
from Configurables import DaVinci, MessageSvc
dv = DaVinci(
- DataType = '2015' ,
- InputType = 'DST' ,
- Lumi = True
+ DataType = "Upgrade",
+ Simulation = True,
+ InputType = 'LDST',
+ Lumi = False
)
##
@@ -47,8 +48,7 @@ dv.UserAlgorithms += [ seq.sequence() ]
## get some input data
from PRConfig import TestFileDB
-TestFileDB.test_file_db["2015_DaVinciTests.davinci.gaudipython_algs"].run(configurable=DaVinci())
-
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run(configurable=DaVinci())
##
## GaudiPython
@@ -67,7 +67,6 @@ from GaudiPython.Bindings import AppMgr
gaudi = AppMgr()
-
alg = gaudi.algorithm('KAONS')
mainseq = 'DaVinciEventSeq'
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 7ca3bd366c53a466abd3266f7e79ad5ca8409c13..1ca5f63b2460c43e8f21660909c178455ed2eec1 100755
--- a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
+++ b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_init.qmt
@@ -15,7 +15,6 @@
<argument name="timeout"><integer>6400</integer></argument>
<argument name="args"><set>
<text>../options/CommonParticles/TestStandardIntermediateCuts.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-FULLDST.py</text>
</set></argument>
<argument name="validator"><text>
findReferenceBlock("""
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 4a9598fcea71c8c7d2a27eaa02db1e5316334c85..cff2cb398e1bce3febd7300e9ad6fec79e10583b 100755
--- a/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
+++ b/DaVinciTests/tests/qmtest/commonparticles.qms/test_standardintermediate_reco14_run.qmt
@@ -15,7 +15,6 @@
<argument name="timeout"><integer>6400</integer></argument>
<argument name="args"><set>
<text>../options/CommonParticles/DVTestStandardIntermediate.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-FULLDST.py</text>
</set></argument>
<argument name="prerequisites"><set>
<tuple><text>commonparticles.test_standardbasic_reco14_init</text><enumeral>PASS</enumeral></tuple>
@@ -27,53 +26,53 @@ DaVinciInitAlg SUCCESS 500 events p
DaVinciInitAlg SUCCESS ==================================================================
CountParticles SUCCESS Number of counters : 97
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Phys/StdAllLooseMuPion" | 500 | 11668 | 23.336 | 51.196 | 0.0000 | 541.00 |
- | "# Phys/StdDiElectronFromTracks" | 500 | 11976 | 23.952 | 41.569 | 0.0000 | 378.00 |
- | "# Phys/StdDiElectronGamma" | 500 | 11988 | 23.976 | 41.603 | 0.0000 | 378.00 |
- | "# Phys/StdKs2PiPiDD" | 500 | 177 | 0.35400 | 0.66984 | 0.0000 | 4.0000 |
- | "# Phys/StdKs2PiPiLL" | 500 | 319 | 0.63800 | 0.99144 | 0.0000 | 8.0000 |
- | "# Phys/StdLTUnbiasedJpsi2MuMu" | 500 | 13 | 0.026000 | 0.15914 | 0.0000 | 1.0000 |
- | "# Phys/StdLambda2PPiDD" | 500 | 58 | 0.11600 | 0.35573 | 0.0000 | 3.0000 |
- | "# Phys/StdLambda2PPiLL" | 500 | 139 | 0.27800 | 0.61377 | 0.0000 | 4.0000 |
- | "# Phys/StdLooseD02KK" | 500 | 952 | 1.9040 | 6.1272 | 0.0000 | 64.000 |
- | "# Phys/StdLooseD02KPi" | 500 | 1143 | 2.2860 | 6.5946 | 0.0000 | 74.000 |
- | "# Phys/StdLooseD02KPiDCS" | 500 | 1143 | 2.2860 | 6.5946 | 0.0000 | 74.000 |
- | "# Phys/StdLooseD02KsKK" | 500 | 100 | 0.20000 | 2.0337 | 0.0000 | 42.000 |
- | "# Phys/StdLooseD02KsPiPi" | 500 | 108 | 0.21600 | 1.0589 | 0.0000 | 14.000 |
- | "# Phys/StdLooseD02PiPi" | 500 | 1134 | 2.2680 | 6.0147 | 0.0000 | 78.000 |
- | "# Phys/StdLooseDalitzPi0" | 500 | 117 | 0.23400 | 0.88501 | 0.0000 | 10.000 |
- | "# Phys/StdLooseDetachedDiElectron" | 500 | 593 | 1.1860 | 2.3982 | 0.0000 | 19.000 |
- | "# Phys/StdLooseDetachedDiElectronLU" | 500 | 810 | 1.6200 | 8.5800 | 0.0000 | 186.00 |
- | "# Phys/StdLooseDetachedDipion" | 500 | 3193 | 6.3860 | 7.4614 | 0.0000 | 59.000 |
- | "# Phys/StdLooseDetachedKpi" | 500 | 27494 | 54.988 | 116.83 | 0.0000 | 1231.0 |
- | "# Phys/StdLooseDetachedKst2Kpi" | 500 | 10255 | 20.510 | 41.454 | 0.0000 | 437.00 |
- | "# Phys/StdLooseDetachedPhi2KK" | 500 | 914 | 1.8280 | 4.7932 | 0.0000 | 48.000 |
- | "# Phys/StdLooseDetachedTau3pi" | 500 | 1337 | 2.6740 | 7.3506 | 0.0000 | 108.00 |
- | "# Phys/StdLooseDetachedTau3piNonPhys" | 500 | 343 | 0.68600 | 1.9109 | 0.0000 | 21.000 |
- | "# Phys/StdLooseDiElectron" | 500 | 322 | 0.64400 | 1.7903 | 0.0000 | 14.000 |
- | "# Phys/StdLooseDiMuon" | 500 | 1603 | 3.2060 | 10.551 | 0.0000 | 134.00 |
- | "# Phys/StdLooseDiMuonSameSign" | 500 | 1944 | 3.8880 | 10.777 | 0.0000 | 114.00 |
- | "# Phys/StdLooseDplus2KKK" | 500 | 4 | 0.0080000 | 0.17871 | 0.0000 | 4.0000 |
- | "# Phys/StdLooseDplus2KKPi" | 500 | 1772 | 3.5440 | 18.410 | 0.0000 | 320.00 |
- | "# Phys/StdLooseDplus2KPiPi" | 500 | 1400 | 2.8000 | 14.692 | 0.0000 | 280.00 |
- | "# Phys/StdLooseDplus2KPiPiOppSignPi" | 500 | 2817 | 5.6340 | 30.756 | 0.0000 | 587.00 |
- | "# Phys/StdLooseDplus2PiPiPi" | 500 | 2004 | 4.0080 | 24.352 | 0.0000 | 491.00 |
- | "# Phys/StdLooseDplus2hhh" | 500 | 14785 | 29.570 | 113.32 | 0.0000 | 1566.0 |
- | "# Phys/StdLooseDsplus2KKPi" | 500 | 1772 | 3.5440 | 18.410 | 0.0000 | 320.00 |
- | "# Phys/StdLooseDsplus2KKPiOppSign" | 500 | 5 | 0.010000 | 0.14799 | 0.0000 | 3.0000 |
- | "# Phys/StdLooseDstarWithD02KK" | 500 | 76 | 0.15200 | 0.76478 | 0.0000 | 9.0000 |
- | "# Phys/StdLooseDstarWithD02KPi" | 500 | 95 | 0.19000 | 0.82091 | 0.0000 | 12.000 |
- | "# Phys/StdLooseDstarWithD02KPiDCS" | 500 | 113 | 0.22600 | 0.99545 | 0.0000 | 13.000 |
- | "# Phys/StdLooseDstarWithD02PiPi" | 500 | 115 | 0.23000 | 0.87926 | 0.0000 | 9.0000 |
- | "# Phys/StdLooseJpsi2MuMu" | 500 | 30 | 0.060000 | 0.24576 | 0.0000 | 2.0000 |
- | "# Phys/StdLooseJpsi2ee" | 500 | 184 | 0.36800 | 1.0975 | 0.0000 | 9.0000 |
- | "# Phys/StdLooseKsDD" | 500 | 2454 | 4.9080 | 6.9446 | 0.0000 | 50.000 |
- | "# Phys/StdLooseKsLD" | 500 | 4543 | 9.0860 | 12.906 | 0.0000 | 105.00 |
- | "# Phys/StdLooseKsLD_NegLong" | 500 | 2373 | 4.7460 | 7.7241 | 0.0000 | 64.000 |
- | "# Phys/StdLooseKsLD_PosLong" | 500 | 2170 | 4.3400 | 6.2907 | 0.0000 | 54.000 |
- | "# Phys/StdLooseKsLL" | 500 | 421 | 0.84200 | 1.6640 | 0.0000 | 17.000 |
- | "# Phys/StdLooseKstar2Kpi" | 500 | 103638 | 207.28 | 262.54 | 0.0000 | 2112.0 |
- | "# Phys/StdLooseLambdaDD" | 500 | 2001 | 4.0020 | 5.4529 | 0.0000 | 36.000 |
+ | "# Phys/StdAllLooseMuPion" | 500 | 20624 | 41.248 | 56.654 | 0.0000 | 583.00 |
+ | "# Phys/StdDiElectronFromTracks" | 500 | 686583 | 1373.2 | 1503.7 | 0.0000 | 11649. |
+ | "# Phys/StdDiElectronGamma" | 500 | 686790 | 1373.6 | 1504.0 | 0.0000 | 11649. |
+ | "# Phys/StdKs2PiPiDD" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
+ | "# Phys/StdKs2PiPiLL" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
+ | "# Phys/StdLTUnbiasedJpsi2MuMu" | 500 | 4 | 0.0080000 | 0.089084 | 0.0000 | 1.0000 |
+ | "# Phys/StdLambda2PPiDD" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
+ | "# Phys/StdLambda2PPiLL" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
+ | "# Phys/StdLooseD02KK" | 500 | 410 | 0.82000 | 1.6515 | 0.0000 | 14.000 |
+ | "# Phys/StdLooseD02KPi" | 500 | 571 | 1.1420 | 1.8894 | 0.0000 | 22.000 |
+ | "# Phys/StdLooseD02KPiDCS" | 500 | 571 | 1.1420 | 1.8894 | 0.0000 | 22.000 |
+ | "# Phys/StdLooseD02KsKK" | 500 | 14 | 0.028000 | 0.32127 | 0.0000 | 6.0000 |
+ | "# Phys/StdLooseD02KsPiPi" | 500 | 16 | 0.032000 | 0.30818 | 0.0000 | 4.0000 |
+ | "# Phys/StdLooseD02PiPi" | 500 | 592 | 1.1840 | 2.0333 | 0.0000 | 20.000 |
+ | "# Phys/StdLooseDalitzPi0" | 500 | 8461 | 16.922 | 23.647 | 0.0000 | 188.00 |
+ | "# Phys/StdLooseDetachedDiElectron" | 500 | 21431 | 42.862 | 46.608 | 0.0000 | 480.00 |
+ | "# Phys/StdLooseDetachedDiElectronLU" | 500 | 10625 | 21.250 | 23.101 | 0.0000 | 161.00 |
+ | "# Phys/StdLooseDetachedDipion" | 500 | 3706 | 7.4120 | 7.5192 | 0.0000 | 61.000 |
+ | "# Phys/StdLooseDetachedKpi" | 500 | 21612 | 43.224 | 52.960 | 0.0000 | 593.00 |
+ | "# Phys/StdLooseDetachedKst2Kpi" | 500 | 9621 | 19.242 | 22.917 | 0.0000 | 187.00 |
+ | "# Phys/StdLooseDetachedPhi2KK" | 500 | 1066 | 2.1320 | 3.0962 | 0.0000 | 21.000 |
+ | "# Phys/StdLooseDetachedTau3pi" | 500 | 1656 | 3.3120 | 7.6278 | 0.0000 | 84.000 |
+ | "# Phys/StdLooseDetachedTau3piNonPhys" | 500 | 501 | 1.0020 | 2.4121 | 0.0000 | 19.000 |
+ | "# Phys/StdLooseDiElectron" | 500 | 10550 | 21.100 | 23.460 | 0.0000 | 169.00 |
+ | "# Phys/StdLooseDiMuon" | 500 | 2446 | 4.8920 | 10.096 | 0.0000 | 123.00 |
+ | "# Phys/StdLooseDiMuonSameSign" | 500 | 2607 | 5.2140 | 11.732 | 0.0000 | 134.00 |
+ | "# Phys/StdLooseDplus2KKK" | 500 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
+ | "# Phys/StdLooseDplus2KKPi" | 500 | 910 | 1.8200 | 5.1548 | 0.0000 | 70.000 |
+ | "# Phys/StdLooseDplus2KPiPi" | 500 | 633 | 1.2660 | 3.0697 | 0.0000 | 38.000 |
+ | "# Phys/StdLooseDplus2KPiPiOppSignPi" | 500 | 1168 | 2.3360 | 5.8182 | 0.0000 | 72.000 |
+ | "# Phys/StdLooseDplus2PiPiPi" | 500 | 730 | 1.4600 | 3.3759 | 0.0000 | 41.000 |
+ | "# Phys/StdLooseDplus2hhh" | 500 | 6038 | 12.076 | 38.120 | 0.0000 | 760.00 |
+ | "# Phys/StdLooseDsplus2KKPi" | 500 | 910 | 1.8200 | 5.1548 | 0.0000 | 70.000 |
+ | "# Phys/StdLooseDsplus2KKPiOppSign" | 500 | 1 | 0.0020000 | 0.044677 | 0.0000 | 1.0000 |
+ | "# Phys/StdLooseDstarWithD02KK" | 500 | 25 | 0.050000 | 0.32787 | 0.0000 | 4.0000 |
+ | "# Phys/StdLooseDstarWithD02KPi" | 500 | 76 | 0.15200 | 1.0977 | 0.0000 | 21.000 |
+ | "# Phys/StdLooseDstarWithD02KPiDCS" | 500 | 80 | 0.16000 | 0.80895 | 0.0000 | 13.000 |
+ | "# Phys/StdLooseDstarWithD02PiPi" | 500 | 74 | 0.14800 | 0.71140 | 0.0000 | 8.0000 |
+ | "# Phys/StdLooseJpsi2MuMu" | 500 | 22 | 0.044000 | 0.21463 | 0.0000 | 2.0000 |
+ | "# Phys/StdLooseJpsi2ee" | 500 | 4737 | 9.4740 | 11.935 | 0.0000 | 121.00 |
+ | "# Phys/StdLooseKsDD" | 500 | 2877 | 5.7540 | 8.4258 | 0.0000 | 117.00 |
+ | "# Phys/StdLooseKsLD" | 500 | 6218 | 12.436 | 15.331 | 0.0000 | 209.00 |
+ | "# Phys/StdLooseKsLD_NegLong" | 500 | 3185 | 6.3700 | 8.8772 | 0.0000 | 112.00 |
+ | "# Phys/StdLooseKsLD_PosLong" | 500 | 3033 | 6.0660 | 7.9936 | 0.0000 | 97.000 |
+ | "# Phys/StdLooseKsLL" | 500 | 282 | 0.56400 | 0.89325 | 0.0000 | 6.0000 |
+ | "# Phys/StdLooseKstar2Kpi" | 500 | 275144 | 550.29 | 542.31 | 1.0000 | 3762.0 |
+ | "# Phys/StdLooseLambdaDD" | 500 | 2941 | 5.8820 | 8.2435 | 0.0000 | 99.000 |
""", stdout, result, causes,
signature_offset = 0, id='Particles')
countErrorLines({"FATAL":0})
diff --git a/DaVinciTests/tests/qmtest/upgrade.qms/configure_dst.qmt b/DaVinciTests/tests/qmtest/davinci.qms/configure_dst.qmt
similarity index 100%
rename from DaVinciTests/tests/qmtest/upgrade.qms/configure_dst.qmt
rename to DaVinciTests/tests/qmtest/davinci.qms/configure_dst.qmt
diff --git a/DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt b/DaVinciTests/tests/qmtest/davinci.qms/configure_mdst.qmt
similarity index 100%
rename from DaVinciTests/tests/qmtest/upgrade.qms/configure_mdst.qmt
rename to DaVinciTests/tests/qmtest/davinci.qms/configure_mdst.qmt
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_mcudst.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_mcudst.qmt
deleted file mode 100644
index 294ce90a2072449066897c679cc560472484404c..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_mcudst.qmt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.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.
--->
-<!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="args"><set>
- <text>../options/DV_MCuDST.py</text>
- </set></argument>
-<argument name="validator"><text>
-findReferenceBlock("""
-TruePhi SUCCESS Number of counters : 5
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Phys/Phi" | 902 | 1112 | 1.2328 | 0.87659 | 1.0000 | 15.000 |
- | "# input particles" | 902 | 1112 | 1.2328 | 0.87659 | 1.0000 | 15.000 |
- |*"#accept" | 902 | 774 |( 85.80931 +- 1.161892)% |
- | "#passed" | 902 | 797 | 0.88359 | 0.39506 | 0.0000 | 3.0000 |
- |*"efficiency" | 1112 | 797 |( 71.67266 +- 1.351224)%| ------- | ------- |
-""")
-</text></argument>
-</extension>
-
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_2016_read.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_2016_read.qmt
deleted file mode 100644
index 3a9cda39e19e6d42e42a57d9646b87bdb2d54860..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_2016_read.qmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- (c) Copyright 2020 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>$DAVINCITESTSROOT/tests/options/DVTestTurbo2016.py</text>
-</set></argument>
-<argument name="validator"><text>
-findReferenceBlock("""
-SELECT:Hlt2Char...SUCCESS Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- |*"#passed" | 281 | 281 |( 100.0000 +- 0.000000)%| ------- | ------- |""", stdout, result, causes)
-findReferenceBlock("""VALIDBPV_Hlt2Ch...SUCCESS Number of counters : 5
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Hlt2CharmHadDstp2D0Pip_D02KmPipTurbo" | 281 | 297 | 1.0569 | 0.24661 | 1.0000 | 3.0000 |
- | "# input particles" | 281 | 297 | 1.0569 | 0.24661 | 1.0000 | 3.0000 |
- |*"#accept" | 281 | 281 |( 100.0000 +- 0.000000)% |
- | "#passed" | 281 | 297 | 1.0569 | 0.24661 | 1.0000 | 3.0000 |
- |*"efficiency" | 297 | 297 |( 100.0000 +- 0.000000)%| ------- | ------- |""", stdout, result, causes)
-countErrorLines({"FATAL":0})
-</text></argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_error.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_error.qmt
deleted file mode 100644
index 8b56943466c5ee2d68a37405b589dda8329fd1bf..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_error.qmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.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.
--->
-<!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="args"><set>
- <text>../options/DV_Turbo_Error.py</text>
- </set></argument>
- <argument name="validator"><text>
-expected = "DaVinci.Configuration.DaVinciConfigurationError: You must set DaVinci().RootInTES when DaVinci().Turbo is `True`"
-if stderr.find(expected) == -1:
- causes.append('missing string in stderr')
- result['GaudiTest.expected_string'] = result.Quote(expected)
- </text></argument>
- <argument name="exit_code">
- <integer>1</integer>
- </argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_implicit.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_implicit.qmt
deleted file mode 100644
index 7ced7899bf930b7504d206cd877469653dde78fb..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_implicit.qmt
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.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.
--->
-<!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="args"><set>
- <text>../options/DV_Turbo_Implicit.py</text>
- </set></argument>
- <argument name="validator">
- <text>
-findReferenceBlock("""
-# |-InputType = 'MDST' (default: 'DST')
-""")
- </text>
- </argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2015_dst.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2015_dst.qmt
deleted file mode 100644
index 581091e0ffa453e961008cd44b6387c219f3cb1c..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2015_dst.qmt
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.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.
--->
-<!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="args"><set>
- <text>../options/DV_Turbo_OK.py</text>
- <text>../options/TurboMC_2015.py</text>
- <text>$APPCONFIGOPTS/DaVinci/DataType-2015.py</text>
- <text>$APPCONFIGOPTS/DaVinci/Simulation.py</text>
- </set></argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2015_dst_read.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2015_dst_read.qmt
deleted file mode 100644
index 8aa43285d043ceb480b092c822cd041a71335507..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2015_dst_read.qmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.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.
--->
-<!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>python</text>
- </argument>
- <argument name="args"><set>
- <text>../options/check_mc_output.py</text>
- <text>TurboMC_2015.root</text>
- <text>TupleDstToD0pi_D0ToKpi</text>
- </set></argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
- <argument name="prerequisites"><set>
- <tuple><text>davinci.davinci_turbo_mc_2015_dst</text><enumeral>PASS</enumeral></tuple>
- </set></argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_dst.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_dst.qmt
deleted file mode 100644
index d3c192e55102e0bde0e527c07f5d5caf9b4badf7..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_dst.qmt
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.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.
--->
-<!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="args"><set>
- <text>../options/DV_Turbo_OK.py</text>
- <text>../options/TurboMC_2016.py</text>
- <text>$APPCONFIGOPTS/DaVinci/DataType-2016.py</text>
- <text>$APPCONFIGOPTS/DaVinci/Simulation.py</text>
- </set></argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_dst_read.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_dst_read.qmt
deleted file mode 100644
index 298b43c7fcb62e2a781b532ae0e7d39ebbcf8efd..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_dst_read.qmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.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.
--->
-<!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>python</text>
- </argument>
- <argument name="args"><set>
- <text>../options/check_mc_output.py</text>
- <text>TurboMC_2016.root</text>
- <text>TupleDstToD0pi_D0ToKpi</text>
- </set></argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
- <argument name="prerequisites"><set>
- <tuple><text>davinci.davinci_turbo_mc_2016_dst</text><enumeral>PASS</enumeral></tuple>
- </set></argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst.qmt
deleted file mode 100644
index 76f23f983c0ce1a48f3215a8b2567154dc4382df..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst.qmt
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.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.
--->
-<!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="args"><set>
- <text>../options/DV_Turbo_OK.py</text>
- <text>../options/TurboMC_2016_uDST.py</text>
- <text>$APPCONFIGOPTS/DaVinci/DataType-2016.py</text>
- <text>$APPCONFIGOPTS/DaVinci/Simulation.py</text>
- </set></argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst_read.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst_read.qmt
deleted file mode 100644
index eee58241aaa985ef2461c231cb5dbd606011a749..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst_read.qmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.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.
--->
-<!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>python</text>
- </argument>
- <argument name="args"><set>
- <text>../options/check_mc_output.py</text>
- <text>TurboMC_2016_uDST.root</text>
- <text>TupleLcTopKpi</text>
- </set></argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
- <argument name="prerequisites"><set>
- <tuple><text>davinci.davinci_turbo_mc_2016_udst</text><enumeral>PASS</enumeral></tuple>
- </set></argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst_read_pr.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst_read_pr.qmt
deleted file mode 100644
index 0a486220430c353d5573a8f9573fdb955e95fa2d..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_mc_2016_udst_read_pr.qmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.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.
--->
-<!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>python</text>
- </argument>
- <argument name="args"><set>
- <text>../options/check_mc_output.py</text>
- <text>TurboMC_2016_uDST.root</text>
- <text>TupleScToLcpi_LcTopKpi</text>
- </set></argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
- <argument name="prerequisites"><set>
- <tuple><text>davinci.davinci_turbo_mc_2016_udst</text><enumeral>PASS</enumeral></tuple>
- </set></argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_ok.qmt b/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_ok.qmt
deleted file mode 100644
index 0326be599c75e804f7b4514702920bb26ab43f8c..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/davinci.qms/davinci_turbo_ok.qmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.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.
--->
-<!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="args"><set>
- <text>../options/DV_Turbo_OK.py</text>
- </set></argument>
- <argument name="exit_code">
- <integer>0</integer>
- </argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/dtfdict.qms/test_dtfdict.qmt b/DaVinciTests/tests/qmtest/dtfdict.qms/test_dtfdict.qmt
index 516ef3504501d79733792abc7d72b768cbfd7321..20463233dcfbb5fb2f44199ae3c458a342903c5a 100644
--- a/DaVinciTests/tests/qmtest/dtfdict.qms/test_dtfdict.qmt
+++ b/DaVinciTests/tests/qmtest/dtfdict.qms/test_dtfdict.qmt
@@ -15,6 +15,9 @@
<argument name="args"><set>
<text>../options/dtfdict.py</text>
<text>--option</text>
- <text>from PRConfig import TestFileDB; from Configurables import DaVinci; TestFileDB.test_file_db['R14S20-bhadron.mdst'].run(configurable=DaVinci())</text>
+ <text>from PRConfig import TestFileDB; from Configurables import DaVinci; TestFileDB.test_file_db['Upgrade_Bd2KstarMuMu'].run(configurable=DaVinci())</text>
</set></argument>
+ <argument name="validator"><text>
+countErrorLines({"FATAL":0, "ERROR":0})
+ </text></argument>
</extension>
diff --git a/DaVinciTests/tests/qmtest/fsrs.qms/davinci-dumpfsrs-tofile.qmt b/DaVinciTests/tests/qmtest/fsrs.qms/davinci-dumpfsrs-tofile.qmt
deleted file mode 100644
index 49bfadfdcd266785efcd1a7d2b9ef28fef52bb96..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/qmtest/fsrs.qms/davinci-dumpfsrs-tofile.qmt
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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
-
- 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.
--->
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: rlambert
-# Purpose: To record which FSRs are there before merging
-# Prerequisites: This is a full test suite, and this test provides input for later.
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MINOR: additional FSRs in the input files, probably indicates the input files have been replaced by something else.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="args"><set>
- <text>$DAVINCIROOT/options/DaVinci-Default.py</text>
- <text>$DAVINCITESTSROOT/tests/options/fsrs/davinci-dumpfsrs.py</text>
- <text>--option</text>
- <text>from Configurables import DaVinci; from PRConfig import TestFileDB; TestFileDB.test_file_db["brunel-v37r3-fsrs-md"].run(configurable=DaVinci()); TestFileDB.test_file_db["brunel-v37r3-fsrs-mu"].run(configurable=DaVinci()); </text>
- </set></argument>
- <argument name="timeout"><integer>3000</integer></argument>
- <argument name="use_temp_dir"><enumeral>true</enumeral></argument>
- <argument name="validator"><text>
-#print stdout
-import os
-f=open(os.path.expandvars('$DAVINCITESTSROOT/tests/refs/test-FSRs.ref'),'r')
-reflines=f.readlines()
-reflines=[r.strip() for r in reflines]
-stdlines=stdout
-
-#print reflines, 'test'
-
-if '\n' in stdout:
- stdlines=stdout.split('\n')
-
-foundlines=[line.strip() for line in stdlines if ('DumpFSR' in line and '/FileRecords' in line and '-' in line)]
-
-#print foundlines
-
-######## Check for consistency #############
-if foundlines!=reflines:
- t=open(os.path.expandvars('$DAVINCITESTSROOT/tests/refs/test-FSRs.ref.new'),'w')
- t.write('\n'.join(foundlines))
- t.close()
- f.close()
- causes.append('unexpected FSRs')
- result['fsrs.davinci-dumpfsrs-tofile']=result.Quote('\n'.join(['+'+line for line in foundlines if line not in reflines]+['-'+line for line in reflines if line not in foundlines]))
-
-f.close()
-
-</text></argument>
-</extension>
diff --git a/DaVinciTests/tests/qmtest/pid.qms/test_udstannpid_stripping20.qmt b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_digi.qmt
old mode 100755
new mode 100644
similarity index 61%
rename from DaVinciTests/tests/qmtest/pid.qms/test_udstannpid_stripping20.qmt
rename to DaVinciTests/tests/qmtest/io.qms/test_read_mc_digi.qmt
index 88d51075afe9c6e68dac2fb2ebce258c7414a571..c4295453124ec852df1d49d511ad76950c5696dc
--- a/DaVinciTests/tests/qmtest/pid.qms/test_udstannpid_stripping20.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_digi.qmt
@@ -12,14 +12,9 @@
<!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>600</integer></argument>
<argument name="args"><set>
- <text>-T</text>
- <text>$DAVINCITESTSROOT/tests/options/PID/DaVinci-uDST-ANNPID-Stripping20-Test.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-Stripping20-BHADRON.MDST.py</text>
- <text>$DAVINCITESTSROOT/tests/options/EnableFPEAuditor.py</text>
+ <text>--option</text>
+ <text>from Configurables import DaVinci; from GaudiConf import IOHelper; from PRConfig import TestFileDB; DaVinci().DataType = 'Upgrade'; DaVinci().Simulation = True; DaVinci().EvtMax = 200; TestFileDB.test_file_db["upgrade-magdown-sim09c-up02-34112100-digi"].run(configurable=DaVinci(),withDB=False)</text>
</set></argument>
-<argument name="reference"><text>../refs/test_udstannpid_stripping20.ref</text></argument>
-<argument name="validator"><text>
-countErrorLines({"FATAL":0, "WARNING":0, "ERROR":0})
-</text></argument>
</extension>
diff --git a/DaVinciTests/tests/qmtest/packing.qms/test_udstunpacking_stripping20.qmt b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_ldst.qmt
old mode 100755
new mode 100644
similarity index 61%
rename from DaVinciTests/tests/qmtest/packing.qms/test_udstunpacking_stripping20.qmt
rename to DaVinciTests/tests/qmtest/io.qms/test_read_mc_ldst.qmt
index 6a05c02bd44d725140751fea856a2b7e5f6917a8..44d2d435c277f86d28da5acc7001d59e8dce40c5
--- a/DaVinciTests/tests/qmtest/packing.qms/test_udstunpacking_stripping20.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_ldst.qmt
@@ -12,14 +12,9 @@
<!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>600</integer></argument>
<argument name="args"><set>
- <text>-T</text>
- <text>$DAVINCITESTSROOT/tests/options/Packing/DaVinci-uDSTUnpacking-Stripping20-Test.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-Stripping20-BHADRON.MDST.py</text>
- <text>$DAVINCITESTSROOT/tests/options/EnableFPEAuditor.py</text>
+ <text>--option</text>
+ <text>from Configurables import DaVinci; from GaudiConf import IOHelper; from PRConfig import TestFileDB; DaVinci().DataType = 'Upgrade'; DaVinci().Simulation = True; DaVinci().EvtMax = 200; TestFileDB.test_file_db['upgrade-magdown-sim09c-up02-reco-up01-minbias-ldst'].run(configurable=DaVinci(),withDB=False)</text>
</set></argument>
-<argument name="reference"><text>../refs/test_udstunpacking_stripping20.ref</text></argument>
-<argument name="validator"><text>
-countErrorLines({"FATAL":0, "WARNING":0, "ERROR":0})
-</text></argument>
</extension>
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_read_mc2012dst.qmt b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_mdf.qmt
similarity index 85%
rename from DaVinciTests/tests/qmtest/io.qms/test_read_mc2012dst.qmt
rename to DaVinciTests/tests/qmtest/io.qms/test_read_mc_mdf.qmt
index c885419c0a4a01b09d4ce2cde2bcfb9ea970ce98..418b8ad9eeae85e917ce237788bd40075bc42f70 100644
--- a/DaVinciTests/tests/qmtest/io.qms/test_read_mc2012dst.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_mdf.qmt
@@ -15,6 +15,6 @@
<argument name="timeout"><integer>600</integer></argument>
<argument name="args"><set>
<text>--option</text>
- <text>from Configurables import DaVinci; from GaudiConf import IOHelper; from PRConfig import TestFileDB; DaVinci().DataType = '2012'; DaVinci().Simulation = True; DaVinci().EvtMax = 200; TestFileDB.test_file_db["MC2012.dst"].run(configurable=DaVinci(),withDB=False)</text>
+ <text>from Configurables import DaVinci; from GaudiConf import IOHelper; from PRConfig import TestFileDB; DaVinci().DataType = 'Upgrade'; DaVinci().Simulation = True; DaVinci().EvtMax = 200; TestFileDB.test_file_db["UpgradeHLT1FilteredMinbias"].run(configurable=DaVinci(),withDB=False)</text>
</set></argument>
</extension>
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_read_mc_xdigi.qmt b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_xdigi.qmt
new file mode 100644
index 0000000000000000000000000000000000000000..c6244684304c8800109cbbc004a77b79c17bf360
--- /dev/null
+++ b/DaVinciTests/tests/qmtest/io.qms/test_read_mc_xdigi.qmt
@@ -0,0 +1,20 @@
+<?xml version="1.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.
+-->
+<!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>600</integer></argument>
+<argument name="args"><set>
+ <text>--option</text>
+ <text>from Configurables import DaVinci; from GaudiConf import IOHelper; from PRConfig import TestFileDB; DaVinci().DataType = 'Upgrade'; DaVinci().Simulation = True; DaVinci().EvtMax = 200; TestFileDB.test_file_db["upgrade_DC19_01_Bs2JPsiPhi_MD"].run(configurable=DaVinci(),withDB=False)</text>
+</set></argument>
+</extension>
diff --git a/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt b/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
index 1f7b8b8eecd6e6da9c03cbac78dc32cae935098a..7f0e55669ff2ca97e64e1a87f2f0d75b6e1d6107 100755
--- a/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
+++ b/DaVinciTests/tests/qmtest/io.qms/test_write_dst.qmt
@@ -20,23 +20,23 @@
findReferenceBlock("""
Print_3000_3087 SUCCESS Number of counters : 3
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Phys/SelJpsi_3000_3087" | 14 | 14 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- | "# input particles" | 14 | 14 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- |*"#accept" | 14 | 14 |( 100.0000 +- 0.000000)% |
+ | "# Phys/SelJpsi_3000_3087" | 28 | 30 | 1.0714 | 0.25754 | 1.0000 | 2.0000 |
+ | "# input particles" | 28 | 30 | 1.0714 | 0.25754 | 1.0000 | 2.0000 |
+ |*"#accept" | 28 | 28 |( 100.0000 +- 0.000000)% |
""", stdout, result, causes, signature_offset = 0, id = "Stream1")
findReferenceBlock("""
Print_3088_3100 SUCCESS Number of counters : 3
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Phys/SelJpsi_3088_3100" | 13 | 13 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- | "# input particles" | 13 | 13 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
- |*"#accept" | 13 | 13 |( 100.0000 +- 0.000000)% |
+ | "# Phys/SelJpsi_3088_3100" | 4 | 4 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
+ | "# input particles" | 4 | 4 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
+ |*"#accept" | 4 | 4 |( 100.0000 +- 0.000000)% |
""", stdout, result, causes, signature_offset = 0, id = "Stream2")
findReferenceBlock("""
Print_3100_4000 SUCCESS Number of counters : 3
| Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Phys/SelJpsi_3100_4000" | 5 | 6 | 1.2000 | 0.40000 | 1.0000 | 2.0000 |
- | "# input particles" | 5 | 6 | 1.2000 | 0.40000 | 1.0000 | 2.0000 |
- |*"#accept" | 5 | 5 |( 100.0000 +- 0.000000)% |
+ | "# Phys/SelJpsi_3100_4000" | 6 | 6 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
+ | "# input particles" | 6 | 6 | 1.0000 | 0.0000 | 1.0000 | 1.0000 |
+ |*"#accept" | 6 | 6 |( 100.0000 +- 0.000000)% |
""", stdout, result, causes, signature_offset = 0, id = "Stream3")
</text></argument>
</extension>
diff --git a/DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_stripping20.qmt b/DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_upgrade.qmt
similarity index 88%
rename from DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_stripping20.qmt
rename to DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_upgrade.qmt
index 2bb2e197856593172b10853b2949a96546d6d3b5..6c26524c68368d2b4bfdd2f9b2a7192c4a91d886 100755
--- a/DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_stripping20.qmt
+++ b/DaVinciTests/tests/qmtest/packing.qms/test_dstunpacking_upgrade.qmt
@@ -14,8 +14,7 @@
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set>
<text>-T</text>
- <text>$DAVINCITESTSROOT/tests/options/Packing/DaVinci-DSTUnpacking-Stripping20-Test.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-Stripping20-BHADRONCOMPLETEEVENT.DST.py</text>
+ <text>$DAVINCITESTSROOT/tests/options/Packing/DaVinci-DSTUnpacking-Upgrade-Test.py</text>
<text>$DAVINCITESTSROOT/tests/options/EnableFPEAuditor.py</text>
</set></argument>
<argument name="reference"><text>../refs/test_dstunpacking_stripping20.ref</text></argument>
diff --git a/DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_stripping20.qmt b/DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_upgrade.qmt
similarity index 79%
rename from DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_stripping20.qmt
rename to DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_upgrade.qmt
index 859c97e2b7ba53323f506655b5904e3724b58907..7bc57c91953a6a232ad6cb405fd41b32cd36197d 100755
--- a/DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_stripping20.qmt
+++ b/DaVinciTests/tests/qmtest/pid.qms/test_dstannpid_upgrade.qmt
@@ -14,12 +14,12 @@
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set>
<text>-T</text>
- <text>$DAVINCITESTSROOT/tests/options/PID/DaVinci-DST-ANNPID-Stripping20-Test.py</text>
- <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision12-4TeV-Reco14-Stripping20-BHADRONCOMPLETEEVENT.DST.py</text>
+ <text>$DAVINCITESTSROOT/tests/options/PID/DaVinci-DST-ANNPID-Upgrade-Test.py</text>
<text>$DAVINCITESTSROOT/tests/options/EnableFPEAuditor.py</text>
</set></argument>
<argument name="reference"><text>../refs/test_dstannpid_stripping20.ref</text></argument>
<argument name="validator"><text>
-countErrorLines({"FATAL":0, "WARNING":0, "ERROR":0})
+<!--countErrorLines({"FATAL":0, "WARNING":0, "ERROR":0})-->
+countErrorLines({"FATAL":0, "ERROR":0})
</text></argument>
</extension>
diff --git a/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt b/DaVinciTests/tests/qmtest/tagging.qms/test_tag_upgrade.qmt
similarity index 69%
rename from DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt
rename to DaVinciTests/tests/qmtest/tagging.qms/test_tag_upgrade.qmt
index 1274740b4fa468519edd8ba04f8774c54fca18aa..d70b4a65f73c37c2f10d9ef404d215d70dbf710d 100644
--- a/DaVinciTests/tests/qmtest/tagging.qms/test_tag_mc12.qmt
+++ b/DaVinciTests/tests/qmtest/tagging.qms/test_tag_upgrade.qmt
@@ -14,29 +14,28 @@
<argument name="program"><text>python</text></argument>
<argument name="timeout"><integer>3600</integer></argument>
<argument name="args"><set>
- <text>../options/Tagging/DVTestTagging-Summer2017Opt-Run1.py</text>
+ <text>../options/Tagging/DVTestTagging-Summer2017Opt-Upgrade.py</text>
</set></argument>
<argument name="validator"><text>
findReferenceBlock("""
-BTagging SUCCESS #ERRORS = 1 Message = 'Tagging Tool returned error.'
BTaggingChecker INFO =======================================================
BTaggingChecker INFO WARNING: The following numbers do not represent the correct tagging powers.
BTaggingChecker INFO Summary: EXCLUSIVE TAGGING PERFORMANCE
BTaggingChecker INFO Category EFF. Etag Wrong TF r w
BTaggingChecker INFO ---------------------------------------------------------
-BTaggingChecker INFO ** OS elec 1.31195+-0.937816 2.33236+-0.814941 12.5+-11.6927 7 1
-BTaggingChecker INFO ** OS kaon 1.04956+-1.06684 11.6618+-1.73305 35+-7.54155 26 14
-BTaggingChecker INFO ** SS kaon 0.155491+-0.422897 8.74636+-1.52543 56.6667+-9.0472 13 17
-BTaggingChecker INFO ** SS pion 1.45773+-1.17262 5.8309+-1.26525 25+-9.68246 15 5
-BTaggingChecker INFO ** VertexCh 3.51937+-1.84515 16.3265+-1.99569 26.7857+-5.91774 41 15
-BTaggingChecker INFO ** OS nnetkaon 1.62377+-1.35408 44.0233+-2.68039 40.3974+-3.9932 90 61
-BTaggingChecker INFO ** SS nnetkaon 0.30722+-0.597056 54.2274+-2.69008 53.7634+-3.65578 86 100
-BTaggingChecker INFO ** OS Charm 0+-0 2.91545+-0.908408 50+-15.8114 5 5
+BTaggingChecker INFO ** OS muon 22.2222+-9.79908 22.2222+-9.79908 0+-0 4 0
+BTaggingChecker INFO ** OS kaon 5.55556+-9.92945 22.2222+-9.79908 25+-21.6506 3 1
+BTaggingChecker INFO ** SS kaon 5.55556+-5.39903 5.55556+-5.39903 100+-0 0 1
+BTaggingChecker INFO ** SS pion 5.55556+-5.39903 5.55556+-5.39903 0+-0 1 0
+BTaggingChecker INFO ** VertexCh 22.2222+-9.79908 22.2222+-9.79908 0+-0 4 0
+BTaggingChecker INFO ** OS nnetkaon 19.8413+-15.8218 38.8889+-11.4904 14.2857+-13.226 6 1
+BTaggingChecker INFO ** SS nnetkaon 0.793651+-4.16314 38.8889+-11.4904 42.8571+-18.7044 4 3
BTaggingChecker INFO ---------------------------------------------------------
BTaggingChecker INFO Tagging efficiency = 0 +/- 0 %
BTaggingChecker INFO Wrong Tag fraction = -nan +/- -nan %
-BTaggingChecker INFO EFFECTIVE COMB. TE = 0 +/- 0 % (Total events= 343)
-""", stdout, result, causes, signature_offset = 1)
+BTaggingChecker INFO EFFECTIVE COMB. TE = 0 +/- 0 % (Total events= 18)
+BTaggingChecker SUCCESS =========================================================
+""", stdout, result, causes, signature_offset = 1, id='rest')
countErrorLines({"FATAL":0})
</text></argument>
</extension>
diff --git a/DaVinciTests/tests/refs/GeneratorLogFSR_expected.xml b/DaVinciTests/tests/refs/GeneratorLogFSR_expected.xml
index a8dff5c2763e2625e93f584f7b01b2ebc942794a..a91266b9ad3a5ffb40a28e945c6fa6f428e899a9 100644
--- a/DaVinciTests/tests/refs/GeneratorLogFSR_expected.xml
+++ b/DaVinciTests/tests/refs/GeneratorLogFSR_expected.xml
@@ -11,48 +11,48 @@
-->
<generatorCounters>
<version>1.1</version>
- <eventType> 13114005 </eventType>
+ <eventType> 12143001 </eventType>
<counter name = "all events (including empty events)">
- <value> 21116 </value>
+ <value> 2206 </value>
</counter>
<counter name = "events with 0 interactions">
- <value> 1702 </value>
+ <value> 1 </value>
</counter>
<counter name = "generated events">
- <value> 19414 </value>
+ <value> 2205 </value>
</counter>
<counter name = "generated interactions">
- <value> 53016 </value>
+ <value> 17000 </value>
</counter>
<counter name = "accepted events">
- <value> 40 </value>
+ <value> 20 </value>
</counter>
<counter name = "interactions in accepted events">
- <value> 120 </value>
+ <value> 196 </value>
</counter>
<counter name = "generated interactions with >= 1b">
- <value> 304 </value>
+ <value> 167 </value>
</counter>
<counter name = "generated interactions with >= 3b">
- <value> 0 </value>
+ <value> 1 </value>
</counter>
<counter name = "generated interactions with 1 prompt B">
- <value> 2 </value>
+ <value> 3 </value>
</counter>
<counter name = "generated interactions with >= 1c">
- <value> 3186 </value>
+ <value> 1625 </value>
</counter>
<counter name = "generated interactions with >= 3c">
- <value> 294 </value>
+ <value> 229 </value>
</counter>
<counter name = "generated interactions with 1 prompt C">
- <value> 246 </value>
+ <value> 40 </value>
</counter>
<counter name = "generated interactions with b and c">
- <value> 50 </value>
+ <value> 46 </value>
</counter>
<counter name = "accepted interactions with >= 1b">
- <value> 42 </value>
+ <value> 21 </value>
</counter>
<counter name = "accepted interactions with >= 3b">
<value> 0 </value>
@@ -61,468 +61,228 @@
<value> 0 </value>
</counter>
<counter name = "accepted interactions with >= 1c">
- <value> 12 </value>
+ <value> 24 </value>
</counter>
<counter name = "accepted interactions with >= 3c">
- <value> 0 </value>
+ <value> 4 </value>
</counter>
<counter name = "accepted interactions with 1 prompt C">
<value> 0 </value>
</counter>
<counter name = "accepted interactions with b and c">
- <value> 8 </value>
+ <value> 7 </value>
</counter>
<efficiency name = "generator level cut">
- <after> 20 </after>
- <before> 170 </before>
- <value> 0.117647 </value>
- <error> 0.0247108 </error>
+ <after> 9 </after>
+ <before> 68 </before>
+ <value> 0.132353 </value>
+ <error> 0.0410945 </error>
</efficiency>
<counter name = "z-inverted events">
- <value> 20 </value>
+ <value> 11 </value>
</counter>
<efficiency name = "generator particle level cut">
- <after> 12 </after>
- <before> 82 </before>
- <value> 0.146341 </value>
- <error> 0.0390318 </error>
+ <after> 3 </after>
+ <before> 37 </before>
+ <value> 0.0810811 </value>
+ <error> 0.0448743 </error>
</efficiency>
<efficiency name = "generator anti-particle level cut">
- <after> 8 </after>
- <before> 88 </before>
- <value> 0.0909091 </value>
- <error> 0.0306454 </error>
+ <after> 6 </after>
+ <before> 31 </before>
+ <value> 0.193548 </value>
+ <error> 0.0709583 </error>
</efficiency>
<fraction name = "accepted B0">
- <number> 6 </number>
- <value> 0.428571 </value>
- <error> 0.13226 </error>
+ <number> 5 </number>
+ <value> 0.555556 </value>
+ <error> 0.165635 </error>
</fraction>
<fraction name = "accepted B0bar">
- <number> 8 </number>
- <value> 0.307692 </value>
- <error> 0.0905151 </error>
+ <number> 5 </number>
+ <value> 0.454545 </value>
+ <error> 0.150131 </error>
</fraction>
<fraction name = "accepted B+">
- <number> 6 </number>
- <value> 0.428571 </value>
- <error> 0.13226 </error>
+ <number> 4 </number>
+ <value> 0.444444 </value>
+ <error> 0.165635 </error>
</fraction>
<fraction name = "accepted B-">
- <number> 12 </number>
- <value> 0.461538 </value>
- <error> 0.0977675 </error>
- </fraction>
- <fraction name = "accepted Bs0">
- <number> 2 </number>
- <value> 0.142857 </value>
- <error> 0.093522 </error>
- </fraction>
- <fraction name = "accepted anti-Bs0s">
<number> 4 </number>
- <value> 0.153846 </value>
- <error> 0.0707589 </error>
+ <value> 0.363636 </value>
+ <error> 0.145041 </error>
</fraction>
- <fraction name = "accepted anti-b-Baryon">
+ <fraction name = "accepted anti-Bs0s">
<number> 2 </number>
- <value> 0.0769231 </value>
- <error> 0.0522589 </error>
+ <value> 0.181818 </value>
+ <error> 0.116291 </error>
</fraction>
<fraction name = "accepted D0">
- <number> 24 </number>
- <value> 0.631579 </value>
- <error> 0.0782518 </error>
+ <number> 9 </number>
+ <value> 0.473684 </value>
+ <error> 0.114549 </error>
</fraction>
<fraction name = "accepted D0bar">
- <number> 10 </number>
- <value> 0.416667 </value>
- <error> 0.100635 </error>
+ <number> 7 </number>
+ <value> 0.4375 </value>
+ <error> 0.12402 </error>
</fraction>
<fraction name = "accepted D+">
- <number> 10 </number>
- <value> 0.263158 </value>
- <error> 0.0714338 </error>
+ <number> 9 </number>
+ <value> 0.473684 </value>
+ <error> 0.114549 </error>
</fraction>
<fraction name = "acceptedD-">
<number> 8 </number>
- <value> 0.333333 </value>
- <error> 0.096225 </error>
+ <value> 0.5 </value>
+ <error> 0.125 </error>
</fraction>
<fraction name = "accepted Ds+">
- <number> 2 </number>
+ <number> 1 </number>
<value> 0.0526316 </value>
- <error> 0.0362235 </error>
+ <error> 0.0512278 </error>
</fraction>
<fraction name = "">
- <number> 6 </number>
- <value> 0.25 </value>
- <error> 0.0883883 </error>
- </fraction>
- <fraction name = "accepted c-Baryon">
- <number> 2 </number>
- <value> 0.0526316 </value>
- <error> 0.0362235 </error>
+ <number> 1 </number>
+ <value> 0.0625 </value>
+ <error> 0.0605154 </error>
</fraction>
<fraction name = "accepted B* (L=0, J=1)">
- <number> 32 </number>
- <value> 0.842105 </value>
- <error> 0.0591528 </error>
+ <number> 12 </number>
+ <value> 0.666667 </value>
+ <error> 0.111111 </error>
+ </fraction>
+ <fraction name = "accepted B** (L=1, J=0,1,2)">
+ <number> 1 </number>
+ <value> 0.0555556 </value>
+ <error> 0.0539903 </error>
+ </fraction>
+ <fraction name = "accepted D* (L=0, J=1)">
+ <number> 20 </number>
+ <value> 1 </value>
+ <error> 0 </error>
</fraction>
<fraction name = "generated signal events">
- <number> 26 </number>
- <value> 0.65 </value>
- <error> 0.0754155 </error>
+ <number> 11 </number>
+ <value> 0.55 </value>
+ <error> 0.111243 </error>
</fraction>
<fraction name = "generated anti-signal events">
- <number> 14 </number>
- <value> 0.35 </value>
- <error> 0.0754155 </error>
+ <number> 9 </number>
+ <value> 0.45 </value>
+ <error> 0.111243 </error>
</fraction>
<fraction name = "generator particle level cut">
- <number> 12 </number>
- <value> 0.146341 </value>
- <error> 0.0390318 </error>
+ <number> 3 </number>
+ <value> 0.0810811 </value>
+ <error> 0.0448743 </error>
</fraction>
<fraction name = "generator anti-particle level cut">
- <number> 8 </number>
- <value> 0.0909091 </value>
- <error> 0.0306454 </error>
+ <number> 6 </number>
+ <value> 0.193548 </value>
+ <error> 0.0709583 </error>
</fraction>
<crosssection name = "generated events">
- <generated> 53016 </generated>
- <value> 2.73081 </value>
- <error> 0.0229082 </error>
+ <generated> 17000 </generated>
+ <value> 7.70975 </value>
+ <error> 0.174509 </error>
</crosssection>
<crosssection name = "generated interactions">
- <generated> 53016 </generated>
- <value> 2.5107 </value>
- <error> 0.020431 </error>
+ <generated> 17000 </generated>
+ <value> 7.70626 </value>
+ <error> 0.174395 </error>
</crosssection>
<crosssection name = "interactions in accepted events">
- <generated> 120 </generated>
- <value> 3 </value>
- <error> 0.547723 </error>
+ <generated> 196 </generated>
+ <value> 9.8 </value>
+ <error> 2.30043 </error>
</crosssection>
<crosssection name = "generated interactions with >= 1b">
- <generated> 304 </generated>
- <value> 0.534211 </value>
- <error> 0.0305511 </error>
+ <generated> 167 </generated>
+ <value> 0.997204 </value>
+ <error> 0.076786 </error>
+ </crosssection>
+ <crosssection name = "generated interactions with >= 3b">
+ <generated> 1 </generated>
+ <value> 0.00597128 </value>
+ <error> 0.00597111 </error>
</crosssection>
<crosssection name = "generated interactions with 1 prompt B">
- <generated> 2 </generated>
- <value> 0.00351454 </value>
- <error> 0.00248511 </error>
+ <generated> 3 </generated>
+ <value> 0.0179138 </value>
+ <error> 0.0103417 </error>
</crosssection>
<crosssection name = "generated interactions with >= 1c">
- <generated> 3186 </generated>
- <value> 5.59867 </value>
- <error> 0.096162 </error>
+ <generated> 1625 </generated>
+ <value> 9.70333 </value>
+ <error> 0.228917 </error>
</crosssection>
<crosssection name = "generated interactions with >= 3c">
- <generated> 294 </generated>
- <value> 0.516638 </value>
- <error> 0.0300473 </error>
+ <generated> 229 </generated>
+ <value> 1.36742 </value>
+ <error> 0.0897512 </error>
</crosssection>
<crosssection name = "generated interactions with 1 prompt C">
- <generated> 246 </generated>
- <value> 0.432289 </value>
- <error> 0.0274977 </error>
+ <generated> 40 </generated>
+ <value> 0.238851 </value>
+ <error> 0.0377212 </error>
</crosssection>
<crosssection name = "generated interactions with b and c">
- <generated> 50 </generated>
- <value> 0.0878636 </value>
- <error> 0.0124199 </error>
+ <generated> 46 </generated>
+ <value> 0.274679 </value>
+ <error> 0.0404444 </error>
</crosssection>
<crosssection name = "accepted interactions with >= 1b">
- <generated> 42 </generated>
- <value> 32.6072 </value>
- <error> 4.05645 </error>
+ <generated> 21 </generated>
+ <value> 10.8763 </value>
+ <error> 2.24265 </error>
</crosssection>
<crosssection name = "accepted interactions with >= 1c">
- <generated> 12 </generated>
- <value> 9.31635 </value>
- <error> 2.55139 </error>
+ <generated> 24 </generated>
+ <value> 12.43 </value>
+ <error> 2.37685 </error>
+ </crosssection>
+ <crosssection name = "accepted interactions with >= 3c">
+ <generated> 4 </generated>
+ <value> 2.07167 </value>
+ <error> 1.02521 </error>
</crosssection>
<crosssection name = "accepted interactions with b and c">
- <generated> 8 </generated>
- <value> 6.2109 </value>
- <error> 2.12143 </error>
+ <generated> 7 </generated>
+ <value> 3.62542 </value>
+ <error> 1.34559 </error>
</crosssection>
<method> Generation.SignalRepeatedHadronization </method>
- <generator> Pythia </generator>
+ <generator> Pythia8 </generator>
<crosssection id = "0">
- <description> "All included subprocesses " </description>
- <generated> 53016 </generated>
- <value> 93.1635 </value>
- </crosssection>
- <crosssection id = "11">
- <description> "f + f' -> f + f' (QCD) m" </description>
- <generated> 6770 </generated>
- <value> 11.8297 </value>
- </crosssection>
- <crosssection id = "12">
- <description> "f + fbar -> f' + fbar' m" </description>
- <generated> 8 </generated>
- <value> 0.0150626 </value>
- </crosssection>
- <crosssection id = "13">
- <description> "f + fbar -> g + g m" </description>
- <generated> 8 </generated>
- <value> 0.0150626 </value>
- </crosssection>
- <crosssection id = "28">
- <description> "f + g -> f + g m" </description>
- <generated> 5996 </generated>
- <value> 10.4759 </value>
- </crosssection>
- <crosssection id = "53">
- <description> "g + g -> f + fbar m" </description>
- <generated> 376 </generated>
- <value> 0.671218 </value>
- </crosssection>
- <crosssection id = "68">
- <description> "g + g -> g + g m" </description>
- <generated> 15224 </generated>
- <value> 26.5979 </value>
- </crosssection>
- <crosssection id = "91">
- <description> "Elastic scattering m" </description>
- <generated> 11226 </generated>
- <value> 19.8945 </value>
- </crosssection>
- <crosssection id = "92">
- <description> "Single diffractive (XB) m" </description>
- <generated> 3972 </generated>
- <value> 6.90282 </value>
- </crosssection>
- <crosssection id = "93">
- <description> "Single diffractive (AX) m" </description>
- <generated> 3762 </generated>
- <value> 6.90282 </value>
- </crosssection>
- <crosssection id = "94">
- <description> "Double diffractive m" </description>
- <generated> 5392 </generated>
- <value> 9.39983 </value>
- </crosssection>
- <crosssection id = "95">
- <description> "Low-pT scattering m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "421">
- <description> "g + g -> cc~[3S1(1)] + g m" </description>
- <generated> 4 </generated>
- <value> 0.00225717 </value>
- </crosssection>
- <crosssection id = "422">
- <description> "g + g -> cc~[3S1(8)] + g m" </description>
- <generated> 10 </generated>
- <value> 0.00969949 </value>
- </crosssection>
- <crosssection id = "423">
- <description> "g + g -> cc~[1S0(8)] + g m" </description>
- <generated> 6 </generated>
- <value> 0.00979238 </value>
- </crosssection>
- <crosssection id = "424">
- <description> "g + g -> cc~[3PJ(8)] + g m" </description>
- <generated> 12 </generated>
- <value> 0.0206582 </value>
- </crosssection>
- <crosssection id = "425">
- <description> "g + q -> q + cc~[3S1(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "426">
- <description> "g + q -> q + cc~[1S0(8)] m" </description>
- <generated> 2 </generated>
- <value> 0.00133416 </value>
- </crosssection>
- <crosssection id = "427">
- <description> "g + q -> q + cc~[3PJ(8)] m" </description>
- <generated> 8 </generated>
- <value> 0.00451094 </value>
- </crosssection>
- <crosssection id = "428">
- <description> "q + q~ -> g + cc~[3S1(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "429">
- <description> "q + q~ -> g + cc~[1S0(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "430">
- <description> "q + q~ -> g + cc~[3PJ(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "431">
- <description> "g + g -> cc~[3P0(1)] + g m" </description>
- <generated> 70 </generated>
- <value> 0.108637 </value>
- </crosssection>
- <crosssection id = "432">
- <description> "g + g -> cc~[3P1(1)] + g m" </description>
- <generated> 38 </generated>
- <value> 0.0584779 </value>
- </crosssection>
- <crosssection id = "433">
- <description> "g + g -> cc~[3P2(1)] + g m" </description>
- <generated> 64 </generated>
- <value> 0.126601 </value>
- </crosssection>
- <crosssection id = "434">
- <description> "q + g -> q + cc~[3P0(1)] m" </description>
- <generated> 6 </generated>
- <value> 0.0171294 </value>
- </crosssection>
- <crosssection id = "435">
- <description> "q + g -> q + cc~[3P1(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "436">
- <description> "q + g -> q + cc~[3P2(1)] m" </description>
- <generated> 14 </generated>
- <value> 0.0233985 </value>
- </crosssection>
- <crosssection id = "437">
- <description> "q + q~ -> g + cc~[3P0(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "438">
- <description> "q + q~ -> g + cc~[3P1(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "439">
- <description> "q + q~ -> g + cc~[3P2(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "461">
- <description> "g + g -> bb~[3S1(1)] + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "462">
- <description> "g + g -> bb~[3S1(8)] + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "463">
- <description> "g + g -> bb~[1S0(8)] + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "464">
- <description> "g + g -> bb~[3PJ(8)] + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "465">
- <description> "g + q -> q + bb~[3S1(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "466">
- <description> "g + q -> q + bb~[1S0(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "467">
- <description> "g + q -> q + bb~[3PJ(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "468">
- <description> "q + q~ -> g + bb~[3S1(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "469">
- <description> "q + q~ -> g + bb~[1S0(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "470">
- <description> "q + q~ -> g + bb~[3PJ(8)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "471">
- <description> "g + g -> bb~[3P0(1)] + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "472">
- <description> "g + g -> bb~[3P1(1)] + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "473">
- <description> "g + g -> bb~[3P2(1)] + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "474">
- <description> "q + g -> q + bb~[3P0(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "475">
- <description> "q + g -> q + bb~[3P1(1)] m" </description>
- <generated> 2 </generated>
- <value> 0.000510403 </value>
- </crosssection>
- <crosssection id = "476">
- <description> "q + g -> q + bb~[3P2(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "477">
- <description> "q + q~ -> g + bb~[3P0(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "478">
- <description> "q + q~ -> g + bb~[3P1(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "479">
- <description> "q + q~ -> g + bb~[3P2(1)] m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "480">
- <description> "g + g -> Psi(2S) + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "481">
- <description> "g + g -> Upsilon(2S) + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "482">
- <description> "g + g -> Upsilon(3S) + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "483">
- <description> "g + g -> Upsilon(4S) + g m" </description>
- <generated> 0 </generated>
- <value> 0 </value>
- </crosssection>
- <crosssection id = "485">
- <description> "g + g -> psi(3770) + g m" </description>
- <generated> 46 </generated>
- <value> 0.0789658 </value>
+ <description> "Total cross-section" </description>
+ <generated> 17000 </generated>
+ <value> 101.512 </value>
+ </crosssection>
+ <crosssection id = "101">
+ <description> "non-diffractive" </description>
+ <generated> 9634 </generated>
+ <value> 57.1656 </value>
+ </crosssection>
+ <crosssection id = "102">
+ <description> "A B -> A B elastic" </description>
+ <generated> 3703 </generated>
+ <value> 22.5806 </value>
+ </crosssection>
+ <crosssection id = "103">
+ <description> "A B -> X B single diffractive" </description>
+ <generated> 1073 </generated>
+ <value> 6.44236 </value>
+ </crosssection>
+ <crosssection id = "104">
+ <description> "A B -> A X single diffractive" </description>
+ <generated> 1063 </generated>
+ <value> 6.44236 </value>
+ </crosssection>
+ <crosssection id = "105">
+ <description> "A B -> X X double diffractive" </description>
+ <generated> 1527 </generated>
+ <value> 8.88086 </value>
</crosssection>
</generatorCounters>
diff --git a/DaVinciTests/tests/refs/test-FSRs.ref b/DaVinciTests/tests/refs/test-FSRs.ref
deleted file mode 100644
index 28c0bf912365ce7d45477ee549843c996b7a58c3..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/refs/test-FSRs.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-DumpFSR INFO lu address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiFSRNoBeam
-DumpFSR INFO lu address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiFSRBeamCrossing
-DumpFSR INFO lu address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiFSRBeam1
-DumpFSR INFO lu address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiFSRBeam2
-DumpFSR INFO lu address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiFSRNoBeam
-DumpFSR INFO lu address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiFSRBeamCrossing
-DumpFSR INFO lu address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiFSRBeam1
-DumpFSR INFO lu address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiFSRBeam2
-DumpFSR INFO lo address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiLowFSRNoBeam
-DumpFSR INFO /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiLowFSRNoBeam: LumiLowFSR: { runs : 69857 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69857/069857_0000000006.raw info (key/incr/integral) : 0 8 0 / 1 8 259 / 2 8 76 / 6 8 0 / 7 8 0 / 8 8 0 / 10 8 10 / 20 8 8 / }
-DumpFSR INFO lo address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiLowFSRBeamCrossing
-DumpFSR INFO /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiLowFSRBeamCrossing: LumiLowFSR: { runs : 69857 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69857/069857_0000000006.raw info (key/incr/integral) : 0 8 0 / 1 8 259 / 2 8 76 / 6 8 0 / 7 8 0 / 8 8 0 / 10 8 10 / 20 8 8 / }
-DumpFSR INFO lo address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiLowFSRBeam1
-DumpFSR INFO /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiLowFSRBeam1: LumiLowFSR: { runs : 69857 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69857/069857_0000000006.raw info (key/incr/integral) : 0 8 0 / 1 8 259 / 2 8 76 / 6 8 0 / 7 8 0 / 8 8 0 / 10 8 10 / 20 8 8 / }
-DumpFSR INFO lo address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiLowFSRBeam2
-DumpFSR INFO /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/LumiLowFSRBeam2: LumiLowFSR: { runs : 69857 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69857/069857_0000000006.raw info (key/incr/integral) : 0 8 0 / 1 8 259 / 2 8 76 / 6 8 0 / 7 8 0 / 8 8 0 / 10 8 10 / 20 8 8 / }
-DumpFSR INFO lo address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRNoBeam
-DumpFSR INFO /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRNoBeam: LumiLowFSR: { runs : 69623 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69623/069623_0000000003.raw info (key/incr/integral) : 0 5 0 / 1 5 92 / 2 5 33 / 6 5 0 / 7 5 0 / 8 5 0 / 10 5 4 / 20 5 5 / }
-DumpFSR INFO lo address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeamCrossing
-DumpFSR INFO /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeamCrossing: LumiLowFSR: { runs : 69623 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69623/069623_0000000003.raw info (key/incr/integral) : 0 5 0 / 1 5 92 / 2 5 33 / 6 5 0 / 7 5 0 / 8 5 0 / 10 5 4 / 20 5 5 / }
-DumpFSR INFO lo address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam1
-DumpFSR INFO /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam1: LumiLowFSR: { runs : 69623 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69623/069623_0000000003.raw info (key/incr/integral) : 0 5 0 / 1 5 92 / 2 5 33 / 6 5 0 / 7 5 0 / 8 5 0 / 10 5 4 / 20 5 5 / }
-DumpFSR INFO lo address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam2
-DumpFSR INFO /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/LumiLowFSRBeam2: LumiLowFSR: { runs : 69623 files : root:/castor/cern.ch/grid/lhcb/data/2010/RAW/FULL/LHCb/COLLISION10/69623/069623_0000000003.raw info (key/incr/integral) : 0 5 0 / 1 5 92 / 2 5 33 / 6 5 0 / 7 5 0 / 8 5 0 / 10 5 4 / 20 5 5 / }
-DumpFSR INFO ev address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/EventCountFSR
-DumpFSR INFO /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/EventCountFSR: EventCountFSR: { input : 100 output : 18 statusFlag : VERIFIED }
-DumpFSR INFO ev address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/EventCountFSR
-DumpFSR INFO /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/EventCountFSR: EventCountFSR: { input : 100 output : 100 statusFlag : VERIFIED }
-DumpFSR INFO ts address: /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/TimeSpanFSR
-DumpFSR INFO /FileRecords/26DEC83E-8F74-DF11-AC26-001E4F3DD7AB/TimeSpanFSR: TimeSpanFSR: { earliest : 1270889604475328 - latest : 1270889604573184 }
-DumpFSR INFO ts address: /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/TimeSpanFSR
-DumpFSR INFO /FileRecords/0E12F271-8F74-DF11-9CD4-001E4F3DD7AB/TimeSpanFSR: TimeSpanFSR: { earliest : 1270425449804736 - latest : 1270425453690688 }
\ No newline at end of file
diff --git a/DaVinciTests/tests/refs/test_udstannpid_stripping20.ref b/DaVinciTests/tests/refs/test_udstannpid_stripping20.ref
deleted file mode 100644
index d23ea43eff84fc9005a9895f1626c117d9220586..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/refs/test_udstannpid_stripping20.ref
+++ /dev/null
@@ -1,21 +0,0 @@
-ANNPIDMoni SUCCESS Booked 18 Histogram(s) : 1D=18
-ANNPIDMoni SUCCESS List of booked 1D histograms in directory "PROTO/ANNPIDMoni" :-
- | ID | Title | # | Mean | RMS | Skewness | Kurtosis |
- | Downstream/ElectronANN | "Downstream Electron ANN PID" | 228 | 0.027729 | 0.087635 | 6.1249 | 47.387 |
- | Downstream/GhostANN | "Downstream Ghost ANN PID" | 228 | 0.39513 | 0.3644 | 0.49996 | -1.36 |
- | Downstream/KaonANN | "Downstream Kaon ANN PID" | 228 | 0.024623 | 0.045711 | 3.2591 | 12.734 |
- | Downstream/MuonANN | "Downstream Muon ANN PID" | 228 | 0.0014382 | 0.011834 | 9.6041 | 102.23 |
- | Downstream/PionANN | "Downstream Pion ANN PID" | 228 | 0.45204 | 0.37484 | 0.16571 | -1.583 |
- | Downstream/ProtonANN | "Downstream Proton ANN PID" | 228 | 0.075155 | 0.12662 | 2.3818 | 5.2262 |
- | Long/ElectronANN | "Long Electron ANN PID" | 4345 | 0.026552 | 0.12665 | 5.8435 | 34.663 |
- | Long/GhostANN | "Long Ghost ANN PID" | 4345 | 0.207 | 0.33549 | 1.5884 | 0.87622 |
- | Long/KaonANN | "Long Kaon ANN PID" | 4345 | 0.14326 | 0.26355 | 2.1262 | 3.3226 |
- | Long/MuonANN | "Long Muon ANN PID" | 4345 | 0.040605 | 0.17543 | 4.4265 | 18.29 |
- | Long/PionANN | "Long Pion ANN PID" | 4345 | 0.54096 | 0.38233 | -0.23917 | -1.5934 |
- | Long/ProtonANN | "Long Proton ANN PID" | 4345 | 0.056644 | 0.1363 | 4.0359 | 18.635 |
- | Upstream/ElectronANN | "Upstream Electron ANN PID" | 21 | 0.069211 | 0.18201 | 3.4984 | 11.325 |
- | Upstream/GhostANN | "Upstream Ghost ANN PID" | 21 | 0.24351 | 0.28565 | 1.1008 | -0.25839 |
- | Upstream/KaonANN | "Upstream Kaon ANN PID" | 21 | 0.089112 | 0.12289 | 3.1492 | 9.7647 |
- | Upstream/MuonANN | "Upstream Muon ANN PID" | 21 | 0.0037318 | 0.0047034 | 4.4216 | 16.915 |
- | Upstream/PionANN | "Upstream Pion ANN PID" | 21 | 0.55084 | 0.27775 | -0.45405 | -1.0632 |
- | Upstream/ProtonANN | "Upstream Proton ANN PID" | 21 | 0.049979 | 0.085864 | 2.0641 | 2.739 |
diff --git a/DaVinciTests/tests/refs/test_udstunpacking_stripping20.ref b/DaVinciTests/tests/refs/test_udstunpacking_stripping20.ref
deleted file mode 100644
index f89c87499b470ef90116df042705e481e3b8f389..0000000000000000000000000000000000000000
--- a/DaVinciTests/tests/refs/test_udstunpacking_stripping20.ref
+++ /dev/null
@@ -1,9 +0,0 @@
-Bhadron_pRec_Tr...SUCCESS Number of counters : 1
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Unpacked Tracks" | 994 | 4594 | 4.6217 | 2.5366 | 2.0000 | 22.000 |
-Bhadron_PsAndVs...SUCCESS Number of counters : 4
- | Counter | # | sum | mean/eff^* | rms/err^* | min | max |
- | "# Unpacked FlavourTags" | 954 | 0 | 0.0000 | 0.0000 | 0.0000 | 0.0000 |
- | "# Unpacked Particles" | 954 | 30626 | 32.103 | 110.85 | 0.0000 | 2913.0 |
- | "# Unpacked RecVertices" | 954 | 9234 | 9.6792 | 67.573 | 0.0000 | 2010.0 |
- | "# Unpacked Vertices" | 954 | 15277 | 16.014 | 83.815 | 0.0000 | 2396.0 |
diff --git a/Phys/Tesla/tests/options/DV_LineChecker.py b/Phys/Tesla/tests/options/DV_LineChecker.py
index b4297b44d4a7106730cefe8be154269b5f50f829..db252eeb48e8ce46704c4595775284908505919e 100644
--- a/Phys/Tesla/tests/options/DV_LineChecker.py
+++ b/Phys/Tesla/tests/options/DV_LineChecker.py
@@ -9,17 +9,20 @@
# or submit itself to any jurisdiction. #
###############################################################################
from Configurables import DaVinci
-
from Configurables import TeslaLineChecker
+from Configurables import CondDB
from PRConfig import TestFileDB
-TestFileDB.test_file_db['TeslaTest_2016raw_0x11361609_0x21361609'].run(configurable=DaVinci())
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run(configurable=DaVinci())
# Necessary DaVinci parameters #################
-DaVinci().Simulation = False
+DaVinci().Simulation = True
DaVinci().EvtMax = 50
DaVinci().TupleFile = 'DVTuples.root'
DaVinci().PrintFreq = 10
-DaVinci().DataType = '2016'
+DaVinci().DataType = 'Upgrade'
DaVinci().UserAlgorithms = [ TeslaLineChecker() ]
-DaVinci().InputType = 'MDST'
+DaVinci().InputType = 'LDST'
+CondDB().Upgrade = True
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
diff --git a/Phys/Tesla/tests/options/DV_2015_PVs.py b/Phys/Tesla/tests/options/DV_Upgrade_PVs.py
similarity index 87%
rename from Phys/Tesla/tests/options/DV_2015_PVs.py
rename to Phys/Tesla/tests/options/DV_Upgrade_PVs.py
index 4009c8ce78b3a7f8e2fdf78b5d0f695696b26fb8..aa887d28c1376bf11de41c9a4fdc8ead3459216f 100644
--- a/Phys/Tesla/tests/options/DV_2015_PVs.py
+++ b/Phys/Tesla/tests/options/DV_Upgrade_PVs.py
@@ -13,16 +13,20 @@ from LHCbKernel.Configuration import *
from Configurables import GaudiSequencer,RawEventJuggler
from Configurables import DaVinci
from Configurables import DecodeRawEvent
-
+from Configurables import CondDB
from Configurables import DstConf
DstConf().Turbo=True
DaVinci()
DaVinci().EvtMax=-1
-DaVinci().DataType="2015"
+DaVinci().DataType="Upgrade"
+DaVinci().InputType = 'LDST'
+CondDB().Upgrade = True
+DaVinci().CondDBtag = "sim-20171127-vc-md100"
+DaVinci().DDDBtag = "dddb-20171126"
-from GaudiConf import IOHelper
-IOHelper().inputFiles( ["tesla_2015_TCK.dst"] , clear=True )
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["Upgrade_Bd2KstarMuMu"].run(configurable=DaVinci())
import GaudiPython
from Gaudi.Configuration import ApplicationMgr
diff --git a/Phys/Tesla/tests/options/wrongList.py b/Phys/Tesla/tests/options/wrongList.py
deleted file mode 100644
index 58baf00828fb8ea8699726b6a1d4b0b52bf84aff..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/options/wrongList.py
+++ /dev/null
@@ -1,217 +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 TeslaLineChecker
-list = ["Hlt2BottomoniumDiKstarTurbo"
-,"Hlt2CharmHadD02KmPipTurbo"
-,"Hlt2CharmHadDp2KS0KS0KpTurbo"
-#,"Hlt2CharmHadDp2KS0KmKpPip_KS0DDTurbo"
-,"Hlt2CharmHadDp2KS0KS0PipTurbo"
-,"Hlt2CharmHadDp2KS0KmKpPip_KS0LLTurbo"
-,"Hlt2CharmHadDp2KS0KmPipPip_KS0DDTurbo"
-,"Hlt2CharmHadDp2KS0KmPipPip_KS0LLTurbo"
-,"Hlt2CharmHadDp2KS0KpKpPim_KS0DDTurbo"
-,"Hlt2CharmHadDp2KS0KpKpPim_KS0LLTurbo"
-,"Hlt2CharmHadDp2KS0KpPimPip_KS0DDTurbo"
-,"Hlt2CharmHadDp2KS0KpPimPip_KS0LLTurbo"
-,"Hlt2CharmHadDp2KS0Kp_KS0DDTurbo"
-,"Hlt2CharmHadDp2KS0Kp_KS0LLTurbo"
-,"Hlt2CharmHadDp2KS0PimPipPip_KS0DDTurbo"
-,"Hlt2CharmHadDp2KS0PimPipPip_KS0LLTurbo"
-,"Hlt2CharmHadDp2KS0Pip_KS0DDTurbo"
-,"Hlt2CharmHadDp2KS0Pip_KS0LLTurbo"
-,"Hlt2CharmHadDp2KmKmKpPipPipTurbo"
-,"Hlt2CharmHadDp2KmKpPimPipPipTurbo"
-,"Hlt2CharmHadDp2KmPimPipPipPipTurbo"
-,"Hlt2CharmHadDpToKmKpKpTurbo"
-,"Hlt2CharmHadDpToKmKpPipTurbo"
-,"Hlt2CharmHadDpToKmPipPipTurbo"
-,"Hlt2CharmHadDpToKmPipPip_ForKPiAsymTurbo"
-,"Hlt2CharmHadDpToKmPipPip_LTUNBTurbo"
-,"Hlt2CharmHadDpToKpKpPimTurbo"
-,"Hlt2CharmHadDpToKpPimPipTurbo"
-#,"Hlt2CharmHadDpToPimPipPipTurbo"
-,"Hlt2CharmHadDsp2KS0KS0KpTurbo"
-,"Hlt2CharmHadDsp2KS0KS0PipTurbo"
-,"Hlt2CharmHadDsp2KS0KmKpPip_KS0DDTurbo"
-,"Hlt2CharmHadDsp2KS0KmKpPip_KS0LLTurbo"
-,"Hlt2CharmHadDsp2KS0KmPipPip_KS0DDTurbo"
-,"Hlt2CharmHadDsp2KS0KmPipPip_KS0LLTurbo"
-,"Hlt2CharmHadDsp2KS0KpKpPim_KS0DDTurbo"
-,"Hlt2CharmHadDsp2KS0KpKpPim_KS0LLTurbo"
-,"Hlt2CharmHadDsp2KS0KpPimPip_KS0DDTurbo"
-,"Hlt2CharmHadDsp2KS0KpPimPip_KS0LLTurbo"
-,"Hlt2CharmHadDsp2KS0PimPipPip_KS0DDTurbo"
-,"Hlt2CharmHadDsp2KS0PimPipPip_KS0LLTurbo"
-,"Hlt2CharmHadDsp2KmKmKpPipPipTurbo"
-,"Hlt2CharmHadDsp2KmKpPimPipPipTurbo"
-,"Hlt2CharmHadDsp2KmPimPipPipPipTurbo"
-,"Hlt2CharmHadDspToKmKpKpTurbo"
-,"Hlt2CharmHadDspToKmKpPipTurbo"
-,"Hlt2CharmHadDspToKmKpPip_LTUNBTurbo"
-,"Hlt2CharmHadDspToKmPipPipTurbo"
-,"Hlt2CharmHadDspToKpKpPimTurbo"
-,"Hlt2CharmHadDspToKpPimPipTurbo"
-,"Hlt2CharmHadDspToPimPipPipTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KS0_KS0DDTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KS0_KS0LLTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KS0_KS0LL_KS0DDTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KmKp_KS0DDTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KmKp_KS0DD_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KmKp_KS0LLTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KmKp_KS0LL_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KmPip_KS0DDTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KmPip_KS0DD_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KmPip_KS0LLTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KmPip_KS0LL_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KpPim_KS0DDTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KpPim_KS0DD_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KpPim_KS0LLTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0KpPim_KS0LL_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0PimPip_KS0DDTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0PimPip_KS0DD_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0PimPip_KS0LLTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KS0PimPip_KS0LL_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KmKmKpPipTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KmKpKpPimTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KmKpPimPipTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KmKpTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KmKp_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KmPimPipPipTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KmPipTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KmPip_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KpPimPimPipTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KpPimTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02KpPim_LTUNBTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02PimPimPipPipTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02PimPipTurbo"
-,"Hlt2CharmHadDstp2D0Pip_D02PimPip_LTUNBTurbo"
-,"Hlt2CharmHadLcp2KS0KS0PpTurbo"
-,"Hlt2CharmHadLcp2LamKmKpPip_Lam2PpPimTurbo"
-,"Hlt2CharmHadLcp2LamKmPipPip_Lam2PpPimTurbo"
-,"Hlt2CharmHadLcp2LamKp_LamDDTurbo"
-,"Hlt2CharmHadLcp2LamKp_LamLLTurbo"
-,"Hlt2CharmHadLcp2LamPip_LamDDTurbo"
-,"Hlt2CharmHadLcp2LamPip_LamLLTurbo"
-,"Hlt2CharmHadLcpToPpKmKmPipPipTurbo"
-,"Hlt2CharmHadLcpToPpKmKpPimPipTurbo"
-,"Hlt2CharmHadLcpToPpKmKpTurbo"
-,"Hlt2CharmHadLcpToPpKmPimPipPipTurbo"
-,"Hlt2CharmHadLcpToPpKmPipTurbo"
-,"Hlt2CharmHadLcpToPpKmPip_LTUNBTurbo"
-,"Hlt2CharmHadLcpToPpKpKpPimPimTurbo"
-#,"Hlt2CharmHadLcpToPpKpPimPimPipTurbo"
-,"Hlt2CharmHadLcpToPpKpPimTurbo"
-,"Hlt2CharmHadLcpToPpPimPimPipPipTurbo"
-,"Hlt2CharmHadLcpToPpPimPipTurbo"
-,"Hlt2CharmHadOmm2LamKm_DDDTurbo"
-,"Hlt2CharmHadOmm2LamKm_DDLTurbo"
-,"Hlt2CharmHadOmm2LamKm_LLLTurbo"
-,"Hlt2CharmHadPentaToPhiPpPimTurbo"
-,"Hlt2CharmHadXic0ToPpKmKmPipTurbo"
-,"Hlt2CharmHadXic0ToPpKmKmPip_LTUNBTurbo"
-,"Hlt2CharmHadXiccp2D0PpKmPim_D02KmPipTurbo"
-,"Hlt2CharmHadXiccp2D0PpKmPip_D02KmPipTurbo"
-,"Hlt2CharmHadXiccp2D0PpKpPim_D02KmPipTurbo"
-,"Hlt2CharmHadXiccp2DpPpKm_Dp2KmPipPipTurbo"
-,"Hlt2CharmHadXiccp2DpPpKp_Dp2KmPipPipTurbo"
-,"Hlt2CharmHadXiccp2LcpKmPim_Lcp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccp2LcpKmPip_Lcp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccp2LcpKpPim_Lcp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccp2Xic0Pim_Xic0ToPpKmKmPipTurbo"
-,"Hlt2CharmHadXiccp2Xic0Pip_Xic0ToPpKmKmPipTurbo"
-,"Hlt2CharmHadXiccp2XicpPimPim_Xicp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccp2XicpPimPip_Xicp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccpp2D0PpKmPimPip_D02KmPipTurbo"
-,"Hlt2CharmHadXiccpp2D0PpKmPipPip_D02KmPipTurbo"
-,"Hlt2CharmHadXiccpp2D0PpKpPimPip_D02KmPipTurbo"
-,"Hlt2CharmHadXiccpp2DpPpKmPim_Dp2KmPipPipTurbo"
-,"Hlt2CharmHadXiccpp2DpPpKmPip_Dp2KmPipPipTurbo"
-,"Hlt2CharmHadXiccpp2DpPpKpPip_Dp2KmPipPipTurbo"
-,"Hlt2CharmHadXiccpp2LcpKmPimPip_Lcp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccpp2LcpKmPipPip_Lcp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccpp2LcpKpPimPip_Lcp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccpp2Xic0PimPip_Xic0ToPpKmKmPipTurbo"
-,"Hlt2CharmHadXiccpp2Xic0PipPip_Xic0ToPpKmKmPipTurbo"
-,"Hlt2CharmHadXiccpp2XicpPim_Xicp2PpKmPipTurbo"
-,"Hlt2CharmHadXiccpp2XicpPip_Xicp2PpKmPipTurbo"
-,"Hlt2CharmHadXicpToPpKmPipTurbo"
-,"Hlt2CharmHadXim2LamPim_DDDTurbo"
-,"Hlt2CharmHadXim2LamPim_DDLTurbo"
-,"Hlt2CharmHadXim2LamPim_LLLTurbo"
-,"Hlt2DiMuonBTurbo"
-,"Hlt2DiMuonJPsiTurbo"
-,"Hlt2DiMuonPsi2STurbo"
-,"Hlt2ExoticaDiMuonNoIPTurbo"
-,"Hlt2ExoticaPrmptDiMuonSSTurbo"
-,"Hlt2ExoticaPrmptDiMuonTurbo"
-,"Hlt2LFVJpsiMuETurbo"
-,"Hlt2LFVPhiMuETurbo"
-,"Hlt2LFVPromptPhiMuETurbo"
-,"Hlt2LFVUpsilonMuETurbo"
-,"Hlt2PIDB2KJPsiEENegTaggedTurboCalib"
-,"Hlt2PIDB2KJPsiEEPosTaggedTurboCalib"
-,"Hlt2PIDB2KJPsiMuMuNegTaggedTurboCalib"
-,"Hlt2PIDB2KJPsiMuMuPosTaggedTurboCalib"
-,"Hlt2PIDD02KPiTagTurboCalib"
-,"Hlt2PIDDetJPsiMuMuNegTaggedTurboCalib"
-,"Hlt2PIDDetJPsiMuMuPosTaggedTurboCalib"
-,"Hlt2PIDDs2KKPiSSTaggedTurboCalib"
-,"Hlt2PIDDs2MuMuPiNegTaggedTurboCalib"
-,"Hlt2PIDDs2MuMuPiPosTaggedTurboCalib"
-,"Hlt2PIDDs2PiPhiKKNegTaggedTurboCalib"
-,"Hlt2PIDDs2PiPhiKKPosTaggedTurboCalib"
-,"Hlt2PIDDs2PiPhiMuMuNegTaggedTurboCalib"
-,"Hlt2PIDDs2PiPhiMuMuPosTaggedTurboCalib"
-,"Hlt2PIDKs2PiPiLLTurboCalib"
-#,"Hlt2PIDLambda2PPiLLTurboCalib"
-,"Hlt2PIDLambda2PPiLLhighPTTurboCalib"
-,"Hlt2PIDLambda2PPiLLisMuonTurboCalib"
-,"Hlt2PIDLambda2PPiLLveryhighPTTurboCalib"
-,"Hlt2PIDLb2LcMuNuTurboCalib"
-,"Hlt2PIDLb2LcPiTurboCalib"
-,"Hlt2PIDLc2KPPiTurboCalib"
-,"Hlt2PhiPhi2EETurbo"
-,"Hlt2PhiPromptPhi2EETurbo"
-,"Hlt2SLB_B2D0Mu_D02KmKpTurbo"
-,"Hlt2SLB_B2D0Mu_D02KmPipTurbo"
-,"Hlt2SLB_B2D0Mu_D02PimPipTurbo"
-,"Hlt2SLB_B2DstMu_D02KmKpTurbo"
-,"Hlt2SLB_B2DstMu_D02KmPipTurbo"
-,"Hlt2SLB_B2DstMu_D02PimPipTurbo"
-,"Hlt2StrangeKPiPiPiTurbo"
-,"Hlt2TrackEffDiMuonDownstreamMinusHighStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonDownstreamMinusHighStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonDownstreamMinusLowStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonDownstreamMinusLowStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonDownstreamPlusHighStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonDownstreamPlusHighStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonDownstreamPlusLowStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonDownstreamPlusLowStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonMuonTTMinusHighStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonMuonTTMinusHighStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonMuonTTMinusLowStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonMuonTTMinusLowStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonMuonTTPlusHighStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonMuonTTPlusHighStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonMuonTTPlusLowStatMatchedTurboCalib"
-#,"Hlt2TrackEffDiMuonMuonTTPlusLowStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonVeloMuonMinusHighStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonVeloMuonMinusHighStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonVeloMuonMinusLowStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonVeloMuonMinusLowStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonVeloMuonPlusHighStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonVeloMuonPlusHighStatTaggedTurboCalib"
-,"Hlt2TrackEffDiMuonVeloMuonPlusLowStatMatchedTurboCalib"
-,"Hlt2TrackEffDiMuonVeloMuonPlusLowStatTaggedTurboCalib"
-,"Hlt2TrackEff_D0ToKpiKaonProbeTurbo"
-,"Hlt2TrackEff_D0ToKpiPionProbeTurbo"]
-TeslaLineChecker().RequestedLines = list
-
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_failure.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_failure.qmt
deleted file mode 100644
index 20942c8bc828f368b1dbdc95082a2421f7608c7e..0000000000000000000000000000000000000000
--- a/Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_failure.qmt
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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
-
- 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.
--->
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: sstahl
-# Purpose: Test fucntionality of TeslaLineChecker
-# Common failure modes, severities and cures:
-# . SEVERE: Segfault or raised exception, stderr, nonzero return code
-# . MAJOR: additional FATAL/ERROR messages always a major problem. no ERROR messages should ever be printed when running this test.
-# . MINOR: additional WARNING messages, it is unclear how severe these may be, you will need to hunt down the cause and either fix the problem or suppress the warning.
-# . EXPECTED: At the moment this test has a habit of timing out or being killed by some abort signal in finalize, but the output always looks fine.
-#######################################################
--->
-<extension class="GaudiTest.GaudiExeTest" kind="test">
- <argument name="program"><text>gaudirun.py</text></argument>
- <argument name="timeout"><integer>120</integer></argument>
- <argument name="args"><set>
- <text>../options/DV_LineChecker.py</text>
- <text>../options/wrongList.py</text>
- </set></argument>
- <argument name="validator"><text>
-block1="""
-TeslaLineChecker ERROR Someone made a boo-boo! Missing lines:
-TeslaLineChecker ERROR Hlt2CharmHadDp2KS0KmKpPip_KS0DDTurbo
-TeslaLineChecker ERROR Hlt2CharmHadDpToPimPipPipTurbo
-TeslaLineChecker ERROR Hlt2CharmHadLcpToPpKpPimPimPipTurbo
-TeslaLineChecker ERROR Hlt2PIDLambda2PPiLLTurboCalib
-TeslaLineChecker ERROR Hlt2TrackEffDiMuonMuonTTPlusLowStatTaggedTurboCalib
-TeslaLineChecker ERROR Affected run : 179348
-TeslaLineChecker ERROR Affected TCK : 0x21361609
-TeslaLineChecker ERROR FIX!
-TeslaLineChecker ERROR In case you are testing, set Tesla().EnableLineChecker = False to skip this check.
-TeslaLineChecker ERROR Maximum number of errors ( 'ErrorMax':1) reached.
-DaVinciUserSequ... ERROR Maximum number of errors ( 'ErrorMax':1) reached.
-DaVinciAnalysisSeq ERROR Maximum number of errors ( 'ErrorMax':1) reached.
-FilteredEventSeq ERROR Maximum number of errors ( 'ErrorMax':1) reached.
-DaVinciEventSeq ERROR Maximum number of errors ( 'ErrorMax':1) reached.
-EventLoopMgr WARNING Execution of algorithm DaVinciEventSeq failed
-EventLoopMgr ERROR Error processing event loop.
-EventLoopMgr ERROR Terminating event processing loop due to errors
-EventLoopMgr ERROR Terminating event processing loop due to errors
-"""
-findReferenceBlock(block1)
- </text></argument>
-<argument name="exit_code"><integer>3</integer></argument>
-</extension>
diff --git a/Phys/Tesla/tests/qmtest/tesla.qms/pvrestore.qmt b/Phys/Tesla/tests/qmtest/tesla.qms/pvrestore.qmt
index 7d0d122cb0314e6b04dc571b44a40aa1f61a5c07..0811bfef74f64a96f2078957a151db5a79496af0 100644
--- a/Phys/Tesla/tests/qmtest/tesla.qms/pvrestore.qmt
+++ b/Phys/Tesla/tests/qmtest/tesla.qms/pvrestore.qmt
@@ -27,7 +27,7 @@
<argument name="program"><text>python</text></argument>
<argument name="timeout"><integer>3600</integer></argument>
<argument name="args"><set>
- <text>../options/DV_2015_PVs.py</text>
+ <text>../options/DV_Upgrade_PVs.py</text>
</set></argument>
<argument name="validator"><text>
countErrorLines({"FATAL":0, "ERROR":0, "WARNING" :1})