Merge branch 'prepare-v42r7p2' into S29r2_update_strip_ref_after_val

CMakeLists.txt

@@ -6,9 +6,9 @@ find_package(GaudiProject)
 #---------------------------------------------------------------
 
 # Declare project name and version
-gaudi_project(DaVinci v42r7p1
+gaudi_project(DaVinci v42r7p2
               USE Analysis v18r6
-                  Stripping v11r5p1
+                  Stripping v11r5p2
               DATA AppConfig VERSION v3r*
                    FieldMap VERSION v5r*
                    ParamFiles VERSION v8r*

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,7 +44,7 @@ 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 29r2)
@@ -48,10 +53,10 @@ if ( NOT "$ENV{CMTCONFIG}" STREQUAL "x86_64-slc6-gcc48-do0" )
   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

Phys/StrippingCache/doc/release.notes

@@ -5,6 +5,13 @@
 ! Created     : 2015-02-04
 ! -----------------------------------------------------------------------------
 
+!======================== StrippingCache v1r10p2 2018-01-27 =====================
+
+! 2017-01-27 - Michael Alexander
+ - Add cache for S29r2.
+ - Change dependence in CMakeLists.txt from DaVinciConfUserDB to MergedConfDB
+   so the AppConfig opts can be used (if they exist).
+
 !======================== StrippingCache v1r10p1 2017-09-13 =====================
 
 ! 2017-09-13 - Michael Alexander

Phys/Tesla/python/Tesla/Configuration.py

@@ -5,9 +5,11 @@ import re
 from Configurables import (
     AddressKillerAlg,
     AuditorSvc,
+    CaloClusterCloner,
     CaloClusterMCTruth,
     CaloDigit2MCLinks2Table,
     CaloDigitCloner,
+    CaloHypoCloner,
     ChargedPP2MC,
     CopyLinePersistenceLocations,
     CopyParticle2PVRelationsFromLinePersistenceLocations,
@@ -866,6 +868,7 @@ class Tesla(LHCbConfigurableUser):
         namer = lambda x: '{0}ForStream{1}'.format(x, output_prefix)
         pack = self.getProp('Pack')
         write_fsr = self.getProp('WriteFSR')
+        simulation = self.getProp('Simulation')
 
         stream_seq = GaudiSequencer(namer('TeslaStreamSequence'))
 
@@ -922,6 +925,22 @@ class Tesla(LHCbConfigurableUser):
             ppc.ICloneTrack = "TrackClonerWithClusters"
             tcwc.CloneAncestors = False
 
+            # We do two things here:
+            #   1. Configure the CaloCluster and CaloHypo cloners to have
+            #   consistent behaviour;
+            #   2. Force digits to always be cloned when running over simulated
+            #   data.
+            ccc = container_cloner.addTool(CaloClusterCloner, name='CaloClusterCloner')
+            chc = container_cloner.addTool(CaloHypoCloner, name='CaloHypoCloner')
+            ccc.CloneEntriesNeuP = True
+            ccc.CloneEntriesChP = False
+            ccc.CloneEntriesAlways = simulation
+            chc.CloneClustersNeuP = True
+            chc.CloneClustersChP = False
+            chc.CloneDigitsNeuP = True
+            chc.CloneDigitsChP = False
+            chc.CloneClustersAlways = simulation
+
             # Look for input objects under /Event/Turbo
             def prepend_base(configurable, property):
                 """Prepend Tesla.base to the configurable's property value."""

ReleaseNotes/v42r7p2.md

+2018-01-27 DaVinci v42r7p2
+==========================
+
+Release for 2017 re-stripping campaign S29r2, after validations.
+--------------------------------------------
+
+This version is released on the 2017-patches branch.
+It is based on Gaudi v28r2, LHCb v42r6p1, Rec v21r6p1, Phys v23r7, Analysis v18r6 and Stripping v11r5p2.
+Uses LCG_88 with ROOT 6.08.06.
+
+- Updated ref for S29r2 test & changed dependence of StrippingCache from DaVinciConfUserDB to MergedConfDB to allow AppConfig opts to be used to generate the cache.
+  - See merge request !140.
\ No newline at end of file