Cherry-pick MR !219 to run2-patches branch

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"

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"

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"

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"

DaVinciTests/tests/options/dimuon_testfile.py

-from GaudiConf import IOHelper
+from Configurables import DaVinci
+from PRConfig import TestFileDB
 
-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'
-        ])
+TestFileDB.test_file_db["2012_DaVinciTests.stripping.test_express_appconfig"].run(configurable=DaVinci())