From e436edf2959e3af9cc65661fcd3da7f7af7f4040 Mon Sep 17 00:00:00 2001 From: Carlos Vazquez Sierra Date: Fri, 1 Feb 2019 16:53:51 +0000 Subject: [PATCH 1/3] Add LokiAddParticleHeader as a post-config option to include additional needed headers for some CorePhysics functors cache (cherry picked from commit dfc49ff77d061ed14506d0401e9d885e1693bd3c) --- Phys/StrippingCache/CMakeLists.txt | 1 + .../options/LoKiAddParticleHeader.py | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 Phys/StrippingCache/options/LoKiAddParticleHeader.py diff --git a/Phys/StrippingCache/CMakeLists.txt b/Phys/StrippingCache/CMakeLists.txt index 9e95df69..cdf39710 100644 --- a/Phys/StrippingCache/CMakeLists.txt +++ b/Phys/StrippingCache/CMakeLists.txt @@ -97,6 +97,7 @@ if ( NOT "$ENV{CMTCONFIG}" STREQUAL "x86_64-slc6-gcc48-do0" ) ${extraopts_${strip}} options/SilenceErrors.py options/DisableLoKiCacheFunctors.py + options/LoKiAddParticleHeader.py LINK_LIBRARIES LoKiArrayFunctorsLib LoKiHltLib DEPENDS ${conf_deps} SPLIT 50) diff --git a/Phys/StrippingCache/options/LoKiAddParticleHeader.py b/Phys/StrippingCache/options/LoKiAddParticleHeader.py new file mode 100644 index 00000000..8b85de07 --- /dev/null +++ b/Phys/StrippingCache/options/LoKiAddParticleHeader.py @@ -0,0 +1,19 @@ +#!/usr/bin/env gaudirun.py +### Need to add a header for some of the functors to prevent a crash. +def post_action_for_fix( ): + """ + Post-config action to add a header for Event/Particle. + """ + import Configurables + for obj, name in [('Tool', 'HybridFactory'), ('CoreFactory', 'CoreFactory'), ('HltFactory', 'HltFactory')]: + obj = 'LoKi__Hybrid__%s' % obj + try: + factory = getattr(Configurables, obj) + name = 'ToolSvc.%s' %name + factory(name).CppLines += ['#include "Event/Particle.h"', + '#include "LoKi/ParticleCuts.h"'] + except AttributeError: pass + +from Gaudi.Configuration import appendPostConfigAction +appendPostConfigAction( post_action_for_fix ) + -- GitLab From 3fe6c4b959ef031fc81fdfb3ac3013c62c677210 Mon Sep 17 00:00:00 2001 From: Carlos Vazquez Sierra Date: Fri, 18 Oct 2019 16:15:53 +0000 Subject: [PATCH 2/3] Update LoKiAddParticleHeader.py --- Phys/StrippingCache/options/LoKiAddParticleHeader.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Phys/StrippingCache/options/LoKiAddParticleHeader.py b/Phys/StrippingCache/options/LoKiAddParticleHeader.py index 8b85de07..f89afa64 100644 --- a/Phys/StrippingCache/options/LoKiAddParticleHeader.py +++ b/Phys/StrippingCache/options/LoKiAddParticleHeader.py @@ -1,3 +1,14 @@ +############################################################################### +# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration # +# # +# This software is distributed under the terms of the GNU General Public # +# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # +# # +# In applying this licence, CERN does not waive the privileges and immunities # +# granted to it by virtue of its status as an Intergovernmental Organization # +# or submit itself to any jurisdiction. # +############################################################################### + #!/usr/bin/env gaudirun.py ### Need to add a header for some of the functors to prevent a crash. def post_action_for_fix( ): -- GitLab From 90d09366061f0b8745f99481ae057edaac67347a Mon Sep 17 00:00:00 2001 From: Carlos Vazquez Sierra Date: Fri, 18 Oct 2019 17:50:52 +0000 Subject: [PATCH 3/3] Update v42r9.md --- ReleaseNotes/v42r9.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ReleaseNotes/v42r9.md b/ReleaseNotes/v42r9.md index e4d612a8..6c69274a 100644 --- a/ReleaseNotes/v42r9.md +++ b/ReleaseNotes/v42r9.md @@ -8,6 +8,10 @@ It is based on Gaudi v28r2p1, LHCb v42r11, Lbcom v20r8, Rec v21r8, Phys v23r10, It uses LCG_88 with ROOT 6.08.06. +- Add LokiAddParticleHeader as a post-config option to include additional needed headers for some CorePhysics functors cache, !346 (@cvazquez) + +- Add functor cache for S29r2p1, !344 (@nskidmor) + - Add CI copyright check, !342 (@cattanem) -- GitLab