Merge branch 'cherry-pick-9a54f9bc' into 'master'

Cherry-pick MR !159 to master branch

See merge request !161

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

@@ -5,17 +5,18 @@
 <argument name="timeout"><integer>3600</integer></argument>
 <argument name="args"><set>
   <text>-T</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/DaVinci/DV-Stripping29r2-Stripping.py</text>
+  <text>$APPCONFIGOPTS/DaVinci/DataType-2017.py</text> 
+  <text>$STRIPPINGSELECTIONSROOT/tests/data/Reco17_Run198660.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>
+<!-- Disable FPEAuditor for now til we debug the exceptions -->
+<!--  <text>$DAVINCITESTSROOT/tests/options/EnableFPEAuditor.py</text> -->
 </set></argument>
-<argument name="reference"><text>../refs/test_stripping29_collision16_reco16.ref</text></argument>
+<argument name="reference"><text>../refs/test_stripping29r2_collision17_reco17.ref</text></argument>
 <argument name="validator"><text>
 from DaVinciTests.QMTest.DaVinciExclusions import preprocessor
 validateWithReference(preproc = preprocessor)

Phys/StrippingCache/CMakeLists.txt

@@ -17,6 +17,11 @@ gaudi_depends_on_subdirs(Phys/DaVinci
                          Phys/IsolationTools
                          Phys/RelatedInfoTools)
 
+set(extraopts_29r2
+    ${AppConfig_DIR}/options/DaVinci/DataType-2017.py
+    )
+
+
 # Do not build for the -O0 platform, as this seems to have problems.
 # To be investigated...
 if ( NOT "$ENV{CMTCONFIG}" STREQUAL "x86_64-slc6-gcc48-do0" )
@@ -39,19 +44,19 @@ if ( NOT "$ENV{CMTCONFIG}" STREQUAL "x86_64-slc6-gcc48-do0" )
  include(LoKiFunctorsCache)
 
  # Set dependency so caches build last, after DaVinci itself.
- set ( conf_deps ${deps} DaVinciConfUserDB )
+ set ( conf_deps ${deps} MergedConfDB )
 
  # Build the cache only for the most recent stripping.
- foreach(strip 29r1)
+ foreach(strip 29r2)
  
   # Stripping cache name
   set ( sname S${strip}FunctorCache )
 
   # Stripping options file to use. If exists use AppConfig file, otherwise try local
-  #set ( optsfile $ENV{APPCONFIGROOT}/options/DaVinci/DV-Stripping${strip}-Stripping.py )
-  #if ( NOT EXISTS ${optsfile} )
-  set ( optsfile ${CMAKE_CURRENT_SOURCE_DIR}/options/DV-Stripping${strip}-Stripping.py )
-  #endif()
+  set ( optsfile ${AppConfig_DIR}//options/DaVinci/DV-Stripping${strip}-Stripping.py )
+  if ( NOT EXISTS ${optsfile} )
+     set ( optsfile ${CMAKE_CURRENT_SOURCE_DIR}/options/DV-Stripping${strip}-Stripping.py )
+  endif()
 
   # cache build if options exist
   if ( EXISTS ${optsfile} )
@@ -63,6 +68,7 @@ if ( NOT "$ENV{CMTCONFIG}" STREQUAL "x86_64-slc6-gcc48-do0" )
     loki_functors_cache(${sname}
                         options/SuppressLogMessages.py
                         ${optsfile}
+			${extraopts_${strip}}
                         options/SilenceErrors.py 
                         options/DisableLoKiCacheFunctors.py
                         LINK_LIBRARIES LoKiArrayFunctorsLib LoKiHltLib