Merge branch 'apearce-tesla-tests' into '2018-patches'

Fix some Tesla tests

See merge request !201

Phys/Tesla/tests/options/DV_2015_CaloCheck.py

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

Phys/Tesla/tests/options/DV_2015_SharedContainers.py

@@ -11,6 +11,7 @@ DaVinci()
 DaVinci().EvtMax=-1
 DaVinci().DataType="2015"
 DaVinci().Turbo=True
+DaVinci().RootInTES="/Event/Turbo"
 
 from GaudiConf import IOHelper
 IOHelper().inputFiles( ["tesla_2015_TCK.dst"] , clear=True ) 
@@ -64,9 +65,9 @@ while True:
     #
     n=0
     for line in lines:
-        rep = tes["Hlt2/SelReports"].selReport(line+"Decision")
+        rep = tes["Hlt2/DecReports"].decReport(line+"Decision")
         if rep:
-            n+=1
+            n+=rep.decision()
     if n==0:
         continue
 

Phys/Tesla/tests/options/TCK_2015RP.py

@@ -23,3 +23,4 @@ Tesla().EnableLineChecker = False
 from PRConfig.TestFileDB import test_file_db
 input = test_file_db['TeslaTest_TCK_0x022600a2']
 input.run(configurable=Tesla())
+Tesla().KillInputTurbo = True

Phys/Tesla/tests/options/default.py

-# Options file for the QMTest to check that Tesla produces no errors
-
-from Configurables import Tesla 
-from Gaudi.Configuration import *
-
-from Configurables import HltANNSvc
-Hlt2ID = HltANNSvc().Hlt2SelectionID
-if "Hlt2Global" not in Hlt2ID : Hlt2ID.update( {  "Hlt2Global" : 2 } )
-HltANNSvc().Hlt1SelectionID = { 'PV3D' : 10103
-        ,'ProtoPV3D' : 10117
-}
-Hlt2ID.update(  { 'Hlt2IncPhiDecision'           : 50000
-    ,'Hlt2IncPhiSidebandsDecision'  : 50003
-    ,'Hlt2IncPhiTrackFitDecision'   : 50002
-    } )
-HltANNSvc().InfoID = {
-        "FastTTValidationTool/ValidateWithTT"        : 6350,
-        "MatchVeloMuon"                              : 6400,
-        "IsMuonTool"                                 : 6401,
-        "PatForwardTool/LooseForward"                : 6299,
-        "PatForwardTool/TightForward"                : 6300,
-        'Hlt2Topo2BodyBBDTResponse'                  : 6502,
-        'Hlt2Topo3BodyBBDTResponse'                  : 6303,
-        'Hlt2Topo4BodyBBDTResponse'                  : 6304
-        }
-
-prefix = "Hlt2IncPhi"
-
-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']
-input.run(configurable=Tesla())

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

-<?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'>
-<!--
-#######################################################
-# SUMMARY OF THIS TEST
-# ...................
-# Author: rlambert
-# Purpose: Check if Moore can re-run on a stripping20 like DST.
-# Prerequisites: None
-# 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>3600</integer></argument>
-  <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" :162})
-#findReferenceBlock("""
-#Hlt2SelReportsD...  ERROR HltSelReportsDecoder::  Did not find string key for trigger selection in storage
-#""", id = "AllowResp" )
-</text></argument>
-</extension>
-