Merge branch 'cherry-pick-ad2cf5a5' into 'run2-patches'

Update Tesla functor cache for 2018 and add tests

See merge request !232

Phys/Tesla/tests/options/DisableLoKiPythonFunctors.py

+
+from Configurables import ApplicationMgr
+ApplicationMgr().Environment['LOKI_DISABLE_PYTHON'] = '1'

Phys/Tesla/tests/qmtest/tesla.qms/2018turbo.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'>
+<!--
+Test that the functor cache works for 2018 TURBO productions
+-->
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+  <argument name="program"><text>gaudirun.py</text></argument>
+  <argument name="use_temp_dir"><enumeral>true</enumeral></argument>
+  <argument name="args"><set>
+    <text>${APPCONFIGROOT}/options/Turbo/Tesla_Data_2018.py</text>
+    <text>${APPCONFIGROOT}/options/Turbo/Streams_pp_2018_nocharmxsec.py</text>
+    <text>${APPCONFIGROOT}/options/Turbo/Tesla_KillInputHlt2Reps.py</text>
+    <text>../options/DisableLoKiPythonFunctors.py</text>
+  </set></argument>
+  <argument name="options"><text>
+from Configurables import Tesla, IODataManager
+from PRConfig import TestFileDB
+TestFileDB.test_file_db['TeslaTest_2018raw_0x11751801_0x21761801_TURBO'].run(configurable=Tesla())
+Tesla().EvtMax = 1000
+IODataManager().DisablePFNWarning = True
+  </text></argument>
+  <argument name="validator"><text>
+countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0})
+  </text></argument>
+</extension>

Phys/Tesla/tests/qmtest/tesla.qms/2018turcal.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'>
+<!--
+Test that the functor cache works for 2018 TURCAL productions
+-->
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+  <argument name="program"><text>gaudirun.py</text></argument>
+  <argument name="use_temp_dir"><enumeral>true</enumeral></argument>
+  <argument name="args"><set>
+    <text>${APPCONFIGROOT}/options/Turbo/Tesla_Data_2018_TurCal.py</text>
+    <text>${APPCONFIGROOT}/options/Turbo/Tesla_Calibration_Hlt2Lines_2018.py</text>
+    <text>../options/DisableLoKiPythonFunctors.py</text>
+  </set></argument>
+  <argument name="options"><text>
+from Configurables import Tesla, IODataManager
+from PRConfig import TestFileDB
+TestFileDB.test_file_db['TeslaTest_2018raw_0x11751801_0x21761801_TURCAL'].run(configurable=Tesla())
+Tesla().EvtMax = 1000
+IODataManager().DisablePFNWarning = True
+  </text></argument>
+  <argument name="validator"><text>
+countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0})
+  </text></argument>
+</extension>

Phys/TurboCache/CMakeLists.txt

@@ -15,15 +15,15 @@ find_package(Boost)
 find_package(ROOT)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
 
-set(options_Turbo04
-    ${AppConfig_DIR}/options/Turbo/Tesla_Data_2017.py
-    ${AppConfig_DIR}/options/Turbo/Streams_pp_2017.py
+set(options_Turbo05
+    ${AppConfig_DIR}/options/Turbo/Tesla_Data_2018.py
+    ${AppConfig_DIR}/options/Turbo/Streams_pp_2018_nocharmxsec.py
     ${AppConfig_DIR}/options/Turbo/Tesla_KillInputHlt2Reps.py
     )
 
-set(options_Turbo04_TurCal
-    ${AppConfig_DIR}/options/Turbo/Tesla_Data_2017_TurCal.py
-    ${AppConfig_DIR}/options/Turbo/Tesla_Calibration_Hlt2Lines_2017.py
+set(options_Turbo05_TurCal
+    ${AppConfig_DIR}/options/Turbo/Tesla_Data_2018_TurCal.py
+    ${AppConfig_DIR}/options/Turbo/Tesla_Calibration_Hlt2Lines_2018.py
     )
 
 
@@ -36,7 +36,7 @@ if (NOT "$ENV{CMTCONFIG}" MATCHES ".*-do0$")
   # Set dependency so caches build last, after Tesla itself.
   set(conf_deps ${deps} MergedConfDB)
 
-  foreach(production Turbo04 Turbo04_TurCal)
+  foreach(production Turbo05 Turbo05_TurCal)
     set(cache_name ${production}_FunctorCache)
     set(option_files ${options_${production}})
     MESSAGE(STATUS "Cache for ${production} from: ${option_files}")