From 53d17b040b42de17ca321ae971355081003abedb Mon Sep 17 00:00:00 2001
From: Eduardo Rodrigues <eduardo.rodrigues@cern.ch>
Date: Fri, 1 Jun 2018 14:44:30 +0000
Subject: [PATCH] Merge branch 'erodrigu-UseTestFileDB' into '2018-patches'
Test DaVinciTests.stripping.test_express_appconfig updated to use TestFileDB
See merge request lhcb/DaVinci!219
(cherry picked from commit a11b5ba1cb0ea0036d75b366790d0ec4780147f1)
7bca921e Test DaVinciTests.stripping.test_express_appconfig updated to use TestFileDB
---
.../options/CommonParticles/DVTestStandardBasic.py | 14 +-------------
.../CommonParticles/DVTestStandardIntermediate.py | 13 +------------
.../CommonParticles/TestStandardBasicCuts.py | 2 --
.../TestStandardIntermediateCuts.py | 2 --
DaVinciTests/tests/options/dimuon_testfile.py | 7 ++-----
5 files changed, 4 insertions(+), 34 deletions(-)
diff --git a/DaVinciTests/tests/options/CommonParticles/DVTestStandardBasic.py b/DaVinciTests/tests/options/CommonParticles/DVTestStandardBasic.py
index fcb821820..88fd9e9b9 100644
--- a/DaVinciTests/tests/options/CommonParticles/DVTestStandardBasic.py
+++ b/DaVinciTests/tests/options/CommonParticles/DVTestStandardBasic.py
@@ -10,17 +10,11 @@ from DaVinci.Configuration import DaVinci
from Gaudi.Configuration import *
##############################################################################
#
-# CommonParticles
-# Thanks to Vanya for this trick
-#
from CommonParticles import StandardBasic
-#from CommonParticles import StandardIntermediate
-#from CommonParticles.Utils import particles # particles() method returns DoD dictionary
-List = []
+
Locations = []
for a,b in StandardBasic.locations.iteritems():
print "DVTestCommonParticles adding location", a
- List.append(b) # ist of algorithms
Locations.append(a)
from Configurables import CountParticles
@@ -35,16 +29,10 @@ DaVinci().HistogramFile = "DVStandardBasic.root"
# Most of this will be configured from Dirac
#
##############################################################################
-# DaVinci().UserAlgorithms = List # explicitly run them
DaVinci().UserAlgorithms = [ CP ] # count them all
DaVinci().EvtMax = 500
DaVinci().DataType = "2010"
DaVinci().Simulation = False
DaVinci().InputType = "DST"
-#importOptions("../dimuon_testfile.py")
-
-#EventSelector().Input = [
-# "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/data/2009/RDST/00004937/0000/00004937_00000001_1.rdst' TYP='POOL_ROOTTREE' OPT='READ'"]
-
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
index 44c89c85f..1cdb1e493 100644
--- a/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
+++ b/DaVinciTests/tests/options/CommonParticles/DVTestStandardIntermediate.py
@@ -10,17 +10,12 @@ from DaVinci.Configuration import DaVinci
from Gaudi.Configuration import *
##############################################################################
#
-# CommonParticles
-# Thanks to Vanya for this trick
-#
from CommonParticles import StandardBasic
from CommonParticles import StandardIntermediate
-#from CommonParticles.Utils import particles # particles() method returns DoD dictionary
-List = []
+
Locations = []
for a,b in StandardIntermediate.locations.iteritems():
print "DVTestCommonParticles adding location", a
- List.append(b) # ist of algorithms
Locations.append(a)
from Configurables import CountParticles
@@ -35,16 +30,10 @@ DaVinci().HistogramFile = "DVStandardIntermediate.root"
# Most of this will be configured from Dirac
#
##############################################################################
-# DaVinci().UserAlgorithms = List # explicitly run them
DaVinci().UserAlgorithms = [ CP ] # count them all
DaVinci().EvtMax = 500
DaVinci().DataType = "2012"
DaVinci().Simulation = False
DaVinci().InputType = "DST"
-#importOptions("../dimuon_testfile.py")
-
-#EventSelector().Input = [
-# "DATAFILE='PFN:castor:/castor/cern.ch/grid/lhcb/data/2009/RDST/00004937/0000/00004937_00000001_1.rdst' TYP='POOL_ROOTTREE' OPT='READ'"]
-
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/CommonParticles/TestStandardBasicCuts.py b/DaVinciTests/tests/options/CommonParticles/TestStandardBasicCuts.py
index faa4e7eba..5bfd90250 100644
--- a/DaVinciTests/tests/options/CommonParticles/TestStandardBasicCuts.py
+++ b/DaVinciTests/tests/options/CommonParticles/TestStandardBasicCuts.py
@@ -23,6 +23,4 @@ DaVinci( UserAlgorithms = List,
Simulation = False,
InputType = "DST" )
-#importOptions("../dimuon_testfile.py")
-
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py b/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
index fad9fff7b..1f07d8186 100644
--- a/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
+++ b/DaVinciTests/tests/options/CommonParticles/TestStandardIntermediateCuts.py
@@ -24,6 +24,4 @@ DaVinci( UserAlgorithms = List,
Simulation = False,
InputType = "DST" )
-#importOptions("../dimuon_testfile.py")
-
MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
diff --git a/DaVinciTests/tests/options/dimuon_testfile.py b/DaVinciTests/tests/options/dimuon_testfile.py
index be92bb543..2aceb00bf 100644
--- a/DaVinciTests/tests/options/dimuon_testfile.py
+++ b/DaVinciTests/tests/options/dimuon_testfile.py
@@ -1,5 +1,2 @@
-from GaudiConf import IOHelper
-
-IOHelper('ROOT').inputFiles([
- 'PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/freezer/lhcb/LHCb/Collision12/FULL.DST/00020330/0004/00020330_00047243_1.full.dst'
- ])
+from PRConfig import TestFileDB
+TestFileDB.test_file_db["2012_DaVinciTests.stripping.test_express_appconfig"].run(configurable=DaVinci())
--
GitLab