Merge branch '2017-patches-fix-stripping-tests' into 'master'

Fix stripping tests

See merge request !93

DaVinciTests/tests/options/Stripping/test_express_appconfig.py

-from Gaudi.Configuration import *
+from Gaudi.Configuration import importOptions
 importOptions("$APPCONFIGOPTS/DaVinci/DVMonitor-RealData.py")
 importOptions("$APPCONFIGOPTS/DaVinci/DataType-2010.py")
 from Configurables import DaVinci
 DaVinci().EvtMax=1000
-EventSelector().Input = ["DATAFILE='PFN:root://castorlhcb.cern.ch//castor/cern.ch/grid/lhcb/data/2010/DST/00006390/0000/00006390_00000005_2.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
+

DaVinciTests/tests/options/dimuon_testfile.py

-from Gaudi.Configuration import EventSelector
+from GaudiConf import IOHelper
 
-EventSelector().Input   = [
-    "DATAFILE='PFN:root://eoslhcb.cern.ch//eos/lhcb/grid/prod/lhcb/freezer/lhcb/LHCb/Collision12/FULL.DST/00020330/0004/00020330_00047243_1.full.dst' TYP='POOL_ROOTTREE' OPT='READ'"
-    ]
+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'
+        ])

DaVinciTests/tests/options/fsrs/DVStripping-RealData-MagDown.py

@@ -7,7 +7,7 @@ from Configurables import DaVinci
 from StrippingConf.Configuration import StrippingConf
 from StrippingArchive.Utils import buildStreams
 
-allStreams = buildStreams('Stripping24')
+allStreams = buildStreams('Stripping29')
 
 MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
 

DaVinciTests/tests/options/fsrs/DVStripping-RealData-MagUp.py

@@ -7,7 +7,7 @@ from Configurables import DaVinci
 from StrippingConf.Configuration import StrippingConf
 from StrippingArchive.Utils import buildStreams
 
-allStreams = buildStreams('Stripping24')
+allStreams = buildStreams('Stripping29')
 
 MessageSvc().Format = "% F%60W%S%7W%R%T %0W%M"
 

DaVinciTests/tests/options/fsrs/davinci-merge-radiative.py → DaVinciTests/tests/options/fsrs/davinci-merge-bhadron.py

 from Gaudi.Configuration import *
-importOptions('$APPCONFIGOPTS/Merging/DV-Stripping12-Merging.py')
+importOptions('$APPCONFIGOPTS/Merging/DV-Stripping-Merging.py')
 importOptions('$APPCONFIGOPTS/Merging/WriteFSR.py')
 importOptions('$DAVINCITESTSROOT/tests/options/fsrs/davinci-merge.py')
-EventSelector().Input = ["DATAFILE='PFN:MagUp.Radiative.dst' TYP='POOL_ROOTTREE' OPT='READ'", "DATAFILE='PFN:MagDown.Radiative.dst' TYP='POOL_ROOTTREE' OPT='READ'"]
+EventSelector().Input = ["DATAFILE='PFN:MagUp.Bhadron.dst' TYP='POOL_ROOTTREE' OPT='READ'", "DATAFILE='PFN:MagDown.Bhadron.dst' TYP='POOL_ROOTTREE' OPT='READ'"]

DaVinciTests/tests/options/fsrs/davinci-merge-ew.py

 from Gaudi.Configuration import *
-importOptions('$APPCONFIGOPTS/Merging/DV-Stripping12-Merging.py')
+importOptions('$APPCONFIGOPTS/Merging/DV-Stripping-Merging.py')
 importOptions('$APPCONFIGOPTS/Merging/WriteFSR.py')
 importOptions('$DAVINCITESTSROOT/tests/options/fsrs/davinci-merge.py')
 EventSelector().Input = ["DATAFILE='PFN:MagUp.EW.dst' TYP='POOL_ROOTTREE' OPT='READ'", "DATAFILE='PFN:MagDown.EW.dst' TYP='POOL_ROOTTREE' OPT='READ'"]

DaVinciTests/tests/qmtest/fsrs.qms/davinci-dumpfsrs-radiative.qmt → DaVinciTests/tests/qmtest/fsrs.qms/davinci-dumpfsrs-bhadron.qmt

@@ -22,7 +22,7 @@
   </set></argument>
   <argument name="timeout"><integer>3000</integer></argument>
   <argument name="prerequisites"><set>
-    <tuple><text>fsrs.davinci-merge-radiative</text><enumeral>PASS</enumeral></tuple>
+    <tuple><text>fsrs.davinci-merge-bhadron</text><enumeral>PASS</enumeral></tuple>
     <tuple><text>fsrs.davinci-dumpfsrs-tofile</text><enumeral>PASS</enumeral></tuple>
   </set></argument>
   <argument name="use_temp_dir"><enumeral>true</enumeral></argument>

DaVinciTests/tests/qmtest/fsrs.qms/davinci-merge-radiative.qmt → DaVinciTests/tests/qmtest/fsrs.qms/davinci-merge-bhadron.qmt

@@ -15,7 +15,7 @@
   <argument name="program"><text>gaudirun.py</text></argument>
   <argument name="args">
     <set>
-      <text>../options/fsrs/davinci-merge-radiative.py</text>
+      <text>../options/fsrs/davinci-merge-bhadron.py</text>
     </set>
   </argument>
   <argument name="timeout"><integer>3000</integer></argument>

DaVinciTests/tests/qmtest/stripping.qms/test_stripping22_collision15em_reco15em.qmt → DaVinciTests/tests/qmtest/stripping.qms/test_stripping29_collision16_reco16.qmt

@@ -5,15 +5,17 @@
 <argument name="timeout"><integer>3600</integer></argument>
 <argument name="args"><set>
   <text>-T</text>
-  <text>$APPCONFIGOPTS/DaVinci/DV-Stripping22-Stripping.py</text>
-  <text>$APPCONFIGOPTS/DaVinci/DataType-2015.py</text> 
-  <text>$PRCONFIGOPTS/DaVinci/Stripping/Collision15EM-6.5TeV-Reco15EM-FULLDST.py</text> 
+  <text>$APPCONFIGOPTS/DaVinci/DV-Stripping29-Stripping.py</text>
+  <text>$APPCONFIGOPTS/DaVinci/DataType-2016.py</text> 
+  <text>$STRIPPINGSELECTIONSROOT/tests/data/Reco16_Run182594.py</text> 
   <text>$APPCONFIGOPTS/Persistency/Compression-ZLIB-1.py</text>
+  <text>$APPCONFIGOPTS/DaVinci/InputType-RDST.py</text>
+  <text>$APPCONFIGOPTS/DaVinci/DV-RawEventJuggler-0_3-to-4_2.py</text>
   <text>$DAVINCITESTSROOT/tests/options/DaVinci-1000events.py</text>
   <text>$DAVINCITESTSROOT/tests/options/DisableLoKiPythonFunctors.py</text>
   <text>$DAVINCITESTSROOT/tests/options/EnableFPEAuditor.py</text>
 </set></argument>
-<argument name="reference"><text>../refs/test_stripping22_collision15EM_reco15EM.ref</text></argument>
+<argument name="reference"><text>../refs/test_stripping29_collision16_reco16.ref</text></argument>
 <argument name="validator"><text>
 from DaVinciTests.QMTest.DaVinciExclusions import preprocessor
 validateWithReference(preproc = preprocessor)