Minimal fix to enable functor cache for MC TCKs

Hlt/HltCache/CMakeLists.txt

@@ -43,7 +43,7 @@ set(LOKI_FUNCTORS_CACHE_POST_ACTION_OPTS
 include(tcks.cmake)
 
 if($ENV{CMTCONFIG} MATCHES $ENV{CMTOPT})
-if(tcks)  # HLT TCK part
+
 foreach(tck ${tcks})
 
     set(option_file ${CMAKE_CURRENT_BINARY_DIR}/options/TCK_${tck}.py)
@@ -93,7 +93,7 @@ foreach(tck ${tcks})
 	                    SPLIT 2)
 
 endforeach()
-else()  # Threshold settings part
+
 foreach(level Hlt1 Hlt2)
     set(cache_name Hlt_pp_Draft2016_${level}_FunctorCache)
     loki_functors_cache(${cache_name}
@@ -111,5 +111,5 @@ foreach(level Hlt1 Hlt2)
                         DEPENDS ${conf_deps}
                         SPLIT 10)
 endforeach()
-endif()
+
 endif()  # CMTCONFIG

Hlt/HltCache/gen_tck_cache_opts.cmake

@@ -6,8 +6,16 @@ endif()
 set(option_file options/TCK_${tck}.py)
 file(WRITE  ${option_file} "from Configurables import Moore\n")
 file(APPEND ${option_file} "Moore().InitialTCK = '${tck}'\n")
-if (tck MATCHES "^0x1")
+if (tck MATCHES "^0x[15]")
   file(APPEND ${option_file} "Moore().Split = 'Hlt1'\n")
-else()
+elseif (tck MATCHES "^0x[26]")
   file(APPEND ${option_file} "Moore().Split = 'Hlt2'\n")
+else()
+  message(FATAL_ERROR "TCK " ${tck} " not supported")
 endif()
+
+if (tck MATCHES "^0x[56]")
+  file(APPEND ${option_file} "Moore().Simulation = True\n")
+  file(APPEND ${option_file} "Moore().WriterRequires = []\n")
+  file(APPEND ${option_file} "Moore().outputFile = 'dummy.dst'\n")
+endif()
\ No newline at end of file

Hlt/HltCache/options/Monitoring.py

@@ -3,11 +3,11 @@ from Configurables import HltMonitoringConf
 from Configurables import GaudiSequencer
 from Configurables import LoKiSvc
 from Configurables import LHCbApp
+from Configurables import CondDB
 
 app = LHCbApp()
-app.CondDBtag = 'cond-20160517'
-app.DDDBtag = 'dddb-20150724'
-app.DataType = '2016'
+app.DataType = "2016"
+CondDB().LatestGlobalTagByDataType = app.DataType
 
 # Use the TCK to get the factories configured from there
 from Configurables import ConfigCDBAccessSvc

Hlt/HltCache/options/Moore_TCK.py

 from Moore.Configuration import Moore
+from Configurables import CondDB
 
 Moore().UseTCK = True
 Moore().EvtMax = 5000
 Moore().EnableTimer = False
 Moore().Simulation = False
 Moore().ForceSingleL0Configuration = True
-Moore().CondDBtag = 'cond-20160420'
-Moore().DDDBtag = 'dddb-20150724'
+Moore().DataType = "2016"
+CondDB().LatestGlobalTagByDataType = Moore().DataType
 
 from Moore import Funcs
 moniTrans = {"^GaudiSequencer/Hlt$" : {"Members" : {"HltMonitorSequence": "HltOnlineMonitorSequence"}}}

Hlt/HltCache/options/Physics_pp_Draft2016.py

@@ -12,7 +12,7 @@ Moore().CheckOdin = False
 Moore().Simulation = False
 Moore().ForceSingleL0Configuration = True
 Moore().SkipEvents = 0
-Moore().CondDBtag = 'cond-20160522'
+Moore().CondDBtag = 'cond-20161011'
 Moore().DDDBtag = 'dddb-20150724'
 
 from Configurables import EventSelector