Merge branch 'apearce-tesla-tests' into 'master'

Fix most of the failing Tesla tests

See merge request !95

Phys/Tesla/tests/options/DV_2015_CaloCheck.py

@@ -10,6 +10,7 @@ DstConf().Turbo=True
 DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().DataType="2015"
+DaVinci().Turbo=True
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["tesla_2015_TCK.dst"] , clear=True ) 

Phys/Tesla/tests/options/DV_2015_SharedContainers.py

@@ -10,6 +10,7 @@ DstConf().Turbo=True
 DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().DataType="2015"
+DaVinci().Turbo=True
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["tesla_2015_TCK.dst"] , clear=True ) 

Phys/Tesla/tests/options/DaVinciCheckDiMuon.py

@@ -8,6 +8,7 @@ DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().Lumi=True
 DaVinci().DataType="2016"
+DaVinci().Turbo=True
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["DiMuon.dst"] , clear=True ) 

Phys/Tesla/tests/options/DaVinciCheckDstp_PR.py

@@ -8,6 +8,7 @@ DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().Lumi=True
 DaVinci().DataType="2016"
+DaVinci().Turbo=True
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["Dstp_PR.dst"] , clear=True ) 

Phys/Tesla/tests/options/TCK_2015RP.py

@@ -6,6 +6,8 @@ Tesla().Mode = 'Offline'
 Tesla().VertRepLoc = 'Hlt2'
 Tesla().EvtMax=1000
 Tesla().outputFile = "tesla_2015_TCK.dst"
+Tesla().SplitRawEventInput = '0.4'
+Tesla().SplitRawEventOutput = '0.4'
 
 from Gaudi.Configuration import *
 version='v10r0_0x00fa0051'

Phys/Tesla/tests/options/TeslaStep.py

@@ -4,9 +4,10 @@ Tesla().InputType = "RAW"
 Tesla().DataType = '2016'
 Tesla().Simulation = False
 Tesla().Mode = 'Online'
-Tesla().RawFormatVersion = 0.2
 Tesla().VertRepLoc = 'Hlt2'
 Tesla().KillInputHlt2Reps = True
+Tesla().SplitRawEventInput = '0.4'
+Tesla().SplitRawEventOutput = '0.4'
 
 from Configurables import Tesla
 from Gaudi.Configuration import *

Phys/Tesla/tests/options/TupleStep.py

 from Configurables import DaVinci
 from Configurables import DecayTreeTuple
 
-from Configurables import DstConf
-DstConf().Turbo=True
-
 Tuple = DecayTreeTuple("psi")
 Tuple.Decay = "J/psi(1S) -> mu+ mu-"
 Tuple.Inputs = [ '/Event/Turbo/Hlt2DiMuonJPsiTurbo/Particles']
 
-from Configurables import DstConf, TurboConf
-DstConf().Turbo = True
-TurboConf().PersistReco = True
-from StandardParticles import StdAllNoPIDsPions
-
 # Necessary DaVinci parameters #################
 DaVinci().Simulation   = False
 DaVinci().SkipEvents = 0
@@ -24,4 +16,4 @@ DaVinci().DataType      = '2016'
 DaVinci().UserAlgorithms = [] 
 DaVinci().UserAlgorithms += [Tuple]
 DaVinci().InputType = 'MDST'
-
+DaVinci().Turbo = True

Phys/Tesla/tests/options/TupleStepOneLine.py

@@ -2,4 +2,4 @@ from GaudiConf import IOHelper
 IOHelper().inputFiles(['PFN:Tesla.dst'])
 from Configurables import DaVinci
 DaVinci().TupleFile = 'TupleStepOneLine.root'
-
+DaVinci().RootInTES = '/Event/Turbo'

Phys/Tesla/tests/options/TupleStepStreams.py

@@ -2,3 +2,4 @@ from GaudiConf import IOHelper
 IOHelper().inputFiles(['PFN:DiMuon.dst'])
 from Configurables import DaVinci
 DaVinci().TupleFile = 'TupleStepStreams.root'
+DaVinci().RootInTES = '/Event/DiMuon/Turbo'

Phys/Tesla/tests/options/containers.py

@@ -30,6 +30,8 @@ Tesla().EnableLineChecker = False
 Tesla().OutputLevel = 2
 Tesla().EvtMax = -1
 Tesla().Pack = False
+Tesla().SplitRawEventInput = '0.4'
+Tesla().SplitRawEventOutput = '0.4'
 
 from PRConfig.TestFileDB import test_file_db
 input = test_file_db['Tesla_Bsphiphi_MC12wTurbo']

Phys/Tesla/tests/options/default.py

@@ -30,6 +30,8 @@ Tesla().TriggerLines = ["Hlt2IncPhi"]
 Tesla().EnableLineChecker = False
 Tesla().OutputLevel = 4
 Tesla().EvtMax = -1
+Tesla().SplitRawEventInput = '0.4'
+Tesla().SplitRawEventOutput = '0.4'
 
 from PRConfig.TestFileDB import test_file_db
 input = test_file_db['Tesla_Bsphiphi_MC12wTurbo']

Phys/Tesla/tests/qmtest/tesla.qms/a_lumiGen.qmt

@@ -20,7 +20,7 @@
     <text>../options/TeslaRawReprocess.py</text>
   </set></argument>
   <argument name="validator"><text>
-countErrorLines({"FATAL":0, "ERROR":1595, "WARNING" :0})
+countErrorLines({"FATAL":0, "ERROR":1595, "WARNING" :1})
   </text></argument>
 </extension>
 

Phys/Tesla/tests/qmtest/tesla.qms/default.qmt

@@ -19,8 +19,9 @@
   <argument name="args"><set>
     <text>../options/default.py</text>
   </set></argument>
+  <!-- TODO: we see 161 more errors than we should -->
   <argument name="validator"><text>
-countErrorLines({"FATAL":0, "ERROR":5561, "WARNING" :161})
+countErrorLines({"FATAL":0, "ERROR":5561, "WARNING" :162})
 #findReferenceBlock("""
 #Hlt2SelReportsD...  ERROR HltSelReportsDecoder::  Did not find string key for trigger selection in storage
 #""", id = "AllowResp" )

Phys/Tesla/tests/qmtest/tesla.qms/default_2015.qmt

@@ -20,7 +20,7 @@
     <text>../options/TCK_2015RP.py</text>
   </set></argument>
   <argument name="validator"><text>
-countErrorLines({"FATAL":0, "ERROR":0, "WARNING" :0})
+countErrorLines({"FATAL":0, "ERROR":0, "WARNING" :1})
 </text></argument>
 </extension>
 

Phys/Tesla/tests/qmtest/tesla.qms/lineChecker_failure.qmt

@@ -31,6 +31,11 @@ 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