From c7dc9ce89b1e6be9bb056aefc105a8b7747f6434 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Mon, 30 Mar 2020 20:54:06 +0200 Subject: [PATCH 01/13] Switch all projects to LCG_97 Switch projects to: - LCG_97 - tdaq-09-00-00 - tdaq-common-04-00-00 --- Projects/AthDataQuality/CMakeLists.txt | 4 ++-- Projects/AthGeneration/build_externals.sh | 2 +- Projects/AthSimulation/build_externals.sh | 2 +- Projects/Athena/CMakeLists.txt | 4 ++-- Projects/Athena/build_externals.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Projects/AthDataQuality/CMakeLists.txt b/Projects/AthDataQuality/CMakeLists.txt index fd720da5f73..46a0abb1c81 100644 --- a/Projects/AthDataQuality/CMakeLists.txt +++ b/Projects/AthDataQuality/CMakeLists.txt @@ -8,7 +8,7 @@ project( AthDataQuality VERSION ${_version} LANGUAGES CXX ) unset( _version ) # Set the version of tdaq-common to use for the build: -set( TDAQ-COMMON_VERSION "03-04-01" CACHE STRING +set( TDAQ-COMMON_VERSION "04-00-00" CACHE STRING "The version of tdaq-common to use for the build" ) set( TDAQ-COMMON_ATROOT "$ENV{TDAQ_RELEASE_BASE}/tdaq-common/tdaq-common-${TDAQ-COMMON_VERSION}" @@ -20,7 +20,7 @@ find_package( AtlasCMake REQUIRED ) # Build the project against LCG: set( LCG_VERSION_POSTFIX "" CACHE STRING "Version postfix for the LCG release to use" ) -set( LCG_VERSION_NUMBER 96 +set( LCG_VERSION_NUMBER 97 CACHE STRING "Version number for the LCG release to use" ) find_package( LCG ${LCG_VERSION_NUMBER} EXACT REQUIRED ) diff --git a/Projects/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh index 99cf4d58cf4..012de3d5cac 100755 --- a/Projects/AthGeneration/build_externals.sh +++ b/Projects/AthGeneration/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=96 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") while getopts ":t:b:x:fch" opt; do case $opt in t) diff --git a/Projects/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh index 0c4833b077a..5e3c9d5dd1c 100755 --- a/Projects/AthSimulation/build_externals.sh +++ b/Projects/AthSimulation/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=96 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") while getopts ":t:b:x:fch" opt; do case $opt in t) diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt index 08545f1d94d..df0ce8aef86 100644 --- a/Projects/Athena/CMakeLists.txt +++ b/Projects/Athena/CMakeLists.txt @@ -24,9 +24,9 @@ if( LCG_NIGHTLY ) set( TDAQ_VERSION "99-00-00" CACHE STRING "The version of tdaq to use for the build" ) else() - set( TDAQ-COMMON_VERSION "03-04-01" CACHE STRING + set( TDAQ-COMMON_VERSION "04-00-00" CACHE STRING "The version of tdaq-common to use for the build" ) - set( TDAQ_VERSION "08-03-01" CACHE STRING + set( TDAQ_VERSION "09-00-00" CACHE STRING "The version of tdaq to use for the build" ) endif() diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh index f13334ceddd..9d3c98d6701 100755 --- a/Projects/Athena/build_externals.sh +++ b/Projects/Athena/build_externals.sh @@ -24,7 +24,7 @@ BUILDDIR="" BUILDTYPE="RelWithDebInfo" FORCE="" CI="" -EXTRACMAKE=(-DLCG_VERSION_NUMBER=96 -DLCG_VERSION_POSTFIX="") +EXTRACMAKE=(-DLCG_VERSION_NUMBER=97 -DLCG_VERSION_POSTFIX="") while getopts ":t:b:x:fch" opt; do case $opt in t) -- GitLab From 4a469ade6fd205e7d7b5a72edac3c6f1126af508 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Fri, 3 Apr 2020 09:52:42 +0200 Subject: [PATCH 02/13] Temporarily disable Rivet_i Temporarily disable Rivet_i in AthGeneration and Athena until we have version 3.1.0 in LCG_97_ATLAS_2. --- Projects/AthGeneration/package_filters.txt | 4 ++++ Projects/Athena/package_filters.txt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Projects/AthGeneration/package_filters.txt b/Projects/AthGeneration/package_filters.txt index fbfb1cc5794..fb153d11ab3 100644 --- a/Projects/AthGeneration/package_filters.txt +++ b/Projects/AthGeneration/package_filters.txt @@ -1,6 +1,10 @@ # # Package filtering rules for the AthGeneration project build. # + +# Temporarily disable Rivet_i until we have LCG_97_ATLAS_2 +- Generators/Rivet_i + + AsgExternal/Asg_Test + AtlasTest/TestTools + Calorimeter/CaloConditions diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt index 2bc7cb2e226..9c3a325fe18 100644 --- a/Projects/Athena/package_filters.txt +++ b/Projects/Athena/package_filters.txt @@ -24,7 +24,8 @@ - graphics/VP1/VP1Systems/VP1TriggerDecisionSystems + graphics/VP1/.* - +# Temporarily disable Rivet_i until we have LCG_97_ATLAS_2 +- Generators/Rivet_i # Some analysis packages that are not part of Athena - Control/AthLinksSA -- GitLab From b5d8bc5bdc945c1f47b2f398b68089d1b34498d4 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Fri, 3 Apr 2020 11:22:31 +0200 Subject: [PATCH 03/13] Updated all projects to atlasexternals-2.0.62. In order to fix the behaviour of FindCLHEP.cmake for LCG_97+. --- Projects/AnalysisBase/externals.txt | 2 +- Projects/AthDataQuality/externals.txt | 2 +- Projects/AthGeneration/externals.txt | 2 +- Projects/AthSimulation/externals.txt | 2 +- Projects/Athena/externals.txt | 2 +- Projects/VP1Light/externals.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt index b8672edbc04..cae59990762 100644 --- a/Projects/AnalysisBase/externals.txt +++ b/Projects/AnalysisBase/externals.txt @@ -6,4 +6,4 @@ # forbidden. # The version of atlas/atlasexternals to use: -AnalysisBaseExternalsVersion = 2.0.61 +AnalysisBaseExternalsVersion = 2.0.62 diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt index bc2d8ef9465..c4e007da511 100644 --- a/Projects/AthDataQuality/externals.txt +++ b/Projects/AthDataQuality/externals.txt @@ -5,4 +5,4 @@ # an "origin/" prefix before it. For tags however this is explicitly # forbidden. -AtlasExternalsVersion = 2.0.61 +AtlasExternalsVersion = 2.0.62 diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt index 4c7ced857d3..03ff7219a7b 100644 --- a/Projects/AthGeneration/externals.txt +++ b/Projects/AthGeneration/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthGenerationExternalsVersion = 2.0.61 +AthGenerationExternalsVersion = 2.0.62 # The version of atlas/Gaudi to use: GaudiVersion = v33r1.001 diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt index 515e9ccd914..f41b0fe1546 100644 --- a/Projects/AthSimulation/externals.txt +++ b/Projects/AthSimulation/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthSimulationExternalsVersion = 2.0.61 +AthSimulationExternalsVersion = 2.0.62 # The version of atlas/Gaudi to use: GaudiVersion = v33r1.001 diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt index 7d30edb8ff1..510b31a17c1 100644 --- a/Projects/Athena/externals.txt +++ b/Projects/Athena/externals.txt @@ -6,7 +6,7 @@ # forbidden. # The version of atlas/atlasexternals to use: -AthenaExternalsVersion = 2.0.61 +AthenaExternalsVersion = 2.0.62 # The version of atlas/Gaudi to use: GaudiVersion = v33r1.001 diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt index 84e8393e4cb..882d4239ece 100644 --- a/Projects/VP1Light/externals.txt +++ b/Projects/VP1Light/externals.txt @@ -6,4 +6,4 @@ # forbidden. # The version of atlas/atlasexternals to use: -VP1LightExternalsVersion = 2.0.61 +VP1LightExternalsVersion = 2.0.62 -- GitLab From 50e35ae426195712e1438681ee5634998ec0ddf4 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Fri, 3 Apr 2020 11:23:37 +0200 Subject: [PATCH 04/13] Fixed the usage of std::string_view variables in the exceptions. With previous ROOT versions there must have been a + operator defined that made the code work. It's no longer there, and C++ itself doesn't provide such an operator... --- Control/xAODDataSource/Root/RDataSource.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Control/xAODDataSource/Root/RDataSource.cxx b/Control/xAODDataSource/Root/RDataSource.cxx index 2c7bd65f42e..c8bf2a9b99c 100644 --- a/Control/xAODDataSource/Root/RDataSource.cxx +++ b/Control/xAODDataSource/Root/RDataSource.cxx @@ -304,7 +304,7 @@ namespace xAOD { ::Error( "xAOD::RDataSource::GetTypeName", XAOD_MESSAGE( "Column/object \"%s\" not available" ), column.data() ); - throw std::runtime_error( "Column/object \"" + column + + throw std::runtime_error( "Column/object \"" + std::string( column ) + "\" not available" ); } @@ -373,7 +373,7 @@ namespace xAOD { ::Error( "xAOD::RDataSource::GetColumnReadersImpl", XAOD_MESSAGE( "Column/object \"%s\" not available" ), column.data() ); - throw std::runtime_error( "Column/object \"" + column + + throw std::runtime_error( "Column/object \"" + std::string( column ) + "\" not available" ); } PRINT_VERBOSE( "GetColumnReadersImpl: Creating column readers for \"" -- GitLab From 32568585930ee7b90a59f1569c41035d690ea830 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Fri, 3 Apr 2020 11:24:49 +0200 Subject: [PATCH 05/13] Setting up HepMC3 for Sherpa_i. As it turns out, the Sherpa version provided by LCG_97 depends on HepMC3 itself. To be able to link against it, we have to set up HepMC3 for the runtime environment. (But we don't need to link the Sherpa_i code against it!) --- Generators/Sherpa_i/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Generators/Sherpa_i/CMakeLists.txt b/Generators/Sherpa_i/CMakeLists.txt index cb25a0e43d5..dcaa6e70ba4 100644 --- a/Generators/Sherpa_i/CMakeLists.txt +++ b/Generators/Sherpa_i/CMakeLists.txt @@ -24,6 +24,9 @@ find_package( CLHEP ) find_package( HepMC ) find_package( Sherpa COMPONENTS SherpaTools ) +# Sherpa is linked against HepMC3, so set that up for the runtime environment. +find_package( hepmc3 ) + # Remove the --as-needed linker flags: atlas_disable_as_needed() -- GitLab From db73e5de88baddefeb91b7d862ef6f378aa008b2 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Fri, 3 Apr 2020 11:27:45 +0200 Subject: [PATCH 06/13] Removed the explicit setting of external (generator) versions. With LCG_97+ it is no longer necessary, as a given LCG release will only have a single version of everything. At the same time cleaned up the configuration of AthGeneration a little bit. --- Projects/AthGeneration/CMakeLists.txt | 13 --------- .../AthGeneration/cmake/PostConfig.cmake.in | 27 ++++++------------- Projects/AthGeneration/externals/Crmc.cmake | 7 ----- Projects/AthGeneration/externals/EvtGen.cmake | 7 ----- .../AthGeneration/externals/FJContrib.cmake | 7 ----- .../AthGeneration/externals/HEPUtils.cmake | 7 ----- Projects/AthGeneration/externals/Herwig.cmake | 7 ----- .../AthGeneration/externals/Herwig3.cmake | 9 ------- Projects/AthGeneration/externals/Hydjet.cmake | 7 ----- Projects/AthGeneration/externals/Lhapdf.cmake | 7 ----- .../AthGeneration/externals/MCUtils.cmake | 7 ----- .../externals/MadGraph5Amc.cmake | 7 ----- .../AthGeneration/externals/OpenLoops.cmake | 7 ----- .../AthGeneration/externals/Photospp.cmake | 7 ----- .../AthGeneration/externals/Pythia6.cmake | 7 ----- .../AthGeneration/externals/Pythia8.cmake | 7 ----- Projects/AthGeneration/externals/README.md | 20 -------------- Projects/AthGeneration/externals/Rivet.cmake | 6 ----- Projects/AthGeneration/externals/Sherpa.cmake | 6 ----- .../AthGeneration/externals/Starlight.cmake | 7 ----- .../AthGeneration/externals/Superchic.cmake | 7 ----- .../AthGeneration/externals/Tauolapp.cmake | 7 ----- Projects/AthGeneration/externals/ThePEG.cmake | 7 ----- Projects/AthGeneration/externals/VBFNLO.cmake | 7 ----- Projects/AthGeneration/externals/YODA.cmake | 6 ----- Projects/AthSimulation/CMakeLists.txt | 13 --------- .../AthSimulation/cmake/PostConfig.cmake.in | 18 +------------ .../AthSimulation/externals/HEPUtils.cmake | 7 ----- .../AthSimulation/externals/MCUtils.cmake | 7 ----- Projects/AthSimulation/externals/README.md | 20 -------------- Projects/AthSimulation/externals/YODA.cmake | 7 ----- Projects/Athena/CMakeLists.txt | 13 --------- Projects/Athena/cmake/PostConfig.cmake.in | 18 +------------ Projects/Athena/externals/Crmc.cmake | 7 ----- Projects/Athena/externals/EvtGen.cmake | 7 ----- Projects/Athena/externals/FJContrib.cmake | 8 ------ Projects/Athena/externals/HEPUtils.cmake | 7 ----- Projects/Athena/externals/Herwig.cmake | 7 ----- Projects/Athena/externals/Herwig3.cmake | 9 ------- Projects/Athena/externals/Hydjet.cmake | 7 ----- Projects/Athena/externals/Lhapdf.cmake | 7 ----- Projects/Athena/externals/MCUtils.cmake | 7 ----- Projects/Athena/externals/MadGraph5Amc.cmake | 7 ----- Projects/Athena/externals/Photospp.cmake | 7 ----- Projects/Athena/externals/Pythia6.cmake | 7 ----- Projects/Athena/externals/Pythia8.cmake | 7 ----- Projects/Athena/externals/README.md | 20 -------------- Projects/Athena/externals/Rivet.cmake | 7 ----- Projects/Athena/externals/Sherpa.cmake | 7 ----- Projects/Athena/externals/Starlight.cmake | 7 ----- Projects/Athena/externals/Tauolapp.cmake | 7 ----- Projects/Athena/externals/ThePEG.cmake | 7 ----- Projects/Athena/externals/YODA.cmake | 7 ----- 53 files changed, 10 insertions(+), 462 deletions(-) delete mode 100644 Projects/AthGeneration/externals/Crmc.cmake delete mode 100644 Projects/AthGeneration/externals/EvtGen.cmake delete mode 100644 Projects/AthGeneration/externals/FJContrib.cmake delete mode 100644 Projects/AthGeneration/externals/HEPUtils.cmake delete mode 100644 Projects/AthGeneration/externals/Herwig.cmake delete mode 100644 Projects/AthGeneration/externals/Herwig3.cmake delete mode 100644 Projects/AthGeneration/externals/Hydjet.cmake delete mode 100644 Projects/AthGeneration/externals/Lhapdf.cmake delete mode 100644 Projects/AthGeneration/externals/MCUtils.cmake delete mode 100644 Projects/AthGeneration/externals/MadGraph5Amc.cmake delete mode 100644 Projects/AthGeneration/externals/OpenLoops.cmake delete mode 100644 Projects/AthGeneration/externals/Photospp.cmake delete mode 100644 Projects/AthGeneration/externals/Pythia6.cmake delete mode 100644 Projects/AthGeneration/externals/Pythia8.cmake delete mode 100644 Projects/AthGeneration/externals/README.md delete mode 100644 Projects/AthGeneration/externals/Rivet.cmake delete mode 100644 Projects/AthGeneration/externals/Sherpa.cmake delete mode 100644 Projects/AthGeneration/externals/Starlight.cmake delete mode 100644 Projects/AthGeneration/externals/Superchic.cmake delete mode 100644 Projects/AthGeneration/externals/Tauolapp.cmake delete mode 100644 Projects/AthGeneration/externals/ThePEG.cmake delete mode 100644 Projects/AthGeneration/externals/VBFNLO.cmake delete mode 100644 Projects/AthGeneration/externals/YODA.cmake delete mode 100644 Projects/AthSimulation/externals/HEPUtils.cmake delete mode 100644 Projects/AthSimulation/externals/MCUtils.cmake delete mode 100644 Projects/AthSimulation/externals/README.md delete mode 100644 Projects/AthSimulation/externals/YODA.cmake delete mode 100644 Projects/Athena/externals/Crmc.cmake delete mode 100644 Projects/Athena/externals/EvtGen.cmake delete mode 100644 Projects/Athena/externals/FJContrib.cmake delete mode 100644 Projects/Athena/externals/HEPUtils.cmake delete mode 100644 Projects/Athena/externals/Herwig.cmake delete mode 100644 Projects/Athena/externals/Herwig3.cmake delete mode 100644 Projects/Athena/externals/Hydjet.cmake delete mode 100644 Projects/Athena/externals/Lhapdf.cmake delete mode 100644 Projects/Athena/externals/MCUtils.cmake delete mode 100644 Projects/Athena/externals/MadGraph5Amc.cmake delete mode 100644 Projects/Athena/externals/Photospp.cmake delete mode 100644 Projects/Athena/externals/Pythia6.cmake delete mode 100644 Projects/Athena/externals/Pythia8.cmake delete mode 100644 Projects/Athena/externals/README.md delete mode 100644 Projects/Athena/externals/Rivet.cmake delete mode 100644 Projects/Athena/externals/Sherpa.cmake delete mode 100644 Projects/Athena/externals/Starlight.cmake delete mode 100644 Projects/Athena/externals/Tauolapp.cmake delete mode 100644 Projects/Athena/externals/ThePEG.cmake delete mode 100644 Projects/Athena/externals/YODA.cmake diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt index 44cb97ccf62..512e4d84c8e 100644 --- a/Projects/AthGeneration/CMakeLists.txt +++ b/Projects/AthGeneration/CMakeLists.txt @@ -42,19 +42,6 @@ set( AthenaPoolUtilitiesTest_DIR "${CMAKE_SOURCE_DIR}/../../Database/AthenaPOOL/AthenaPoolUtilities/cmake" CACHE PATH "Directory holding the AthenaPoolUtilititesTest module" ) -# Load all the files from the externals/ subdirectory: -file( GLOB _externals "${CMAKE_CURRENT_SOURCE_DIR}/externals/*.cmake" ) -foreach( _external ${_externals} ) - include( ${_external} ) - get_filename_component( _extName ${_external} NAME_WE ) - string( TOUPPER ${_extName} _extNameUpper ) - message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" ) - unset( _extName ) - unset( _extNameUpper ) -endforeach() -unset( _external ) -unset( _externals ) - # Disable the usage of the --no-undefined linker flag: atlas_disable_no_undefined() diff --git a/Projects/AthGeneration/cmake/PostConfig.cmake.in b/Projects/AthGeneration/cmake/PostConfig.cmake.in index 55630f7dd96..7ff8c678392 100644 --- a/Projects/AthGeneration/cmake/PostConfig.cmake.in +++ b/Projects/AthGeneration/cmake/PostConfig.cmake.in @@ -5,26 +5,15 @@ # # Find Gaudi: -find_package( Gaudi REQUIRED ) +if( AthGeneration_FIND_QUIETLY ) + find_package( Gaudi REQUIRED QUIET ) +else() + find_package( Gaudi REQUIRED ) +endif() # Set up the compilation option(s) for AthGeneration. -add_definitions( -DGENERATIONBASE ) set( GENERATIONBASE TRUE CACHE BOOL "Flag specifying that this is a generation release build" ) - -# Load all the files from the externals/ subdirectory: -get_filename_component( _thisdir ${CMAKE_CURRENT_LIST_FILE} PATH ) -file( GLOB _externals "${_thisdir}/externals/*.cmake" ) -unset( _thisdir ) -foreach( _external ${_externals} ) - include( ${_external} ) - get_filename_component( _extName ${_external} NAME_WE ) - string( TOUPPER ${_extName} _extNameUpper ) - if( NOT AthGeneration_FIND_QUIETLY ) - message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" ) - endif() - unset( _extName ) - unset( _extNameUpper ) -endforeach() -unset( _external ) -unset( _externals ) +if( GENERATIONBASE ) + add_definitions( -DGENERATIONBASE ) +endif() diff --git a/Projects/AthGeneration/externals/Crmc.cmake b/Projects/AthGeneration/externals/Crmc.cmake deleted file mode 100644 index b1a4276e809..00000000000 --- a/Projects/AthGeneration/externals/Crmc.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Crmc to use. -# - -set( CRMC_VERSION 1.5.6 ) -set( CRMC_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/EvtGen.cmake b/Projects/AthGeneration/externals/EvtGen.cmake deleted file mode 100644 index 5d729fa4457..00000000000 --- a/Projects/AthGeneration/externals/EvtGen.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of EvtGen to use. -# - -set( EVTGEN_LCGVERSION 1.7.0 ) -set( EVTGEN_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/FJContrib.cmake b/Projects/AthGeneration/externals/FJContrib.cmake deleted file mode 100644 index fe7873d126d..00000000000 --- a/Projects/AthGeneration/externals/FJContrib.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of FJContrib to use. -# - -set( FJCONTRIB_LCGVERSION 1.041 ) -set( FJCONTRIB_LCGROOT - ${LCG_RELEASE_DIR}/fjcontrib/${FJCONTRIB_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/HEPUtils.cmake b/Projects/AthGeneration/externals/HEPUtils.cmake deleted file mode 100644 index 8344158ac50..00000000000 --- a/Projects/AthGeneration/externals/HEPUtils.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of HEPUtils to use. -# - -set( HEPUTILS_LCGVERSION 1.3.2 ) -set( HEPUTILS_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Herwig.cmake b/Projects/AthGeneration/externals/Herwig.cmake deleted file mode 100644 index b0df2d6dd7d..00000000000 --- a/Projects/AthGeneration/externals/Herwig.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Herwig to use. -# - -set( HERWIG_LCGVERSION 6.521.2 ) -set( HERWIG_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Herwig3.cmake b/Projects/AthGeneration/externals/Herwig3.cmake deleted file mode 100644 index 70a428981e7..00000000000 --- a/Projects/AthGeneration/externals/Herwig3.cmake +++ /dev/null @@ -1,9 +0,0 @@ -# -# File specifying the location of Herwig3 to use. -# - -set( HERWIG3_LCGVERSION 7.2.0 ) -# Comment the following line for H7 versions <7.2 -set( HW3_VER_IS_72 1 ) -set( HERWIG3_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Hydjet.cmake b/Projects/AthGeneration/externals/Hydjet.cmake deleted file mode 100644 index 1eede1364e8..00000000000 --- a/Projects/AthGeneration/externals/Hydjet.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Hydjet to use. -# - -set( HYDJET_LCGVERSION 1.8 ) -set( HYDJET_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Lhapdf.cmake b/Projects/AthGeneration/externals/Lhapdf.cmake deleted file mode 100644 index 03c1e85b5a8..00000000000 --- a/Projects/AthGeneration/externals/Lhapdf.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Lhapdf to use. -# - -set( LHAPDF_LCGVERSION 6.2.3 ) -set( LHAPDF_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/MCUtils.cmake b/Projects/AthGeneration/externals/MCUtils.cmake deleted file mode 100644 index f7ebb4984d7..00000000000 --- a/Projects/AthGeneration/externals/MCUtils.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of MCUtils to use. -# - -set( MCUTILS_LCGVERSION 1.3.3 ) -set( MCUTILS_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/MadGraph5Amc.cmake b/Projects/AthGeneration/externals/MadGraph5Amc.cmake deleted file mode 100644 index 741f63cf942..00000000000 --- a/Projects/AthGeneration/externals/MadGraph5Amc.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of MadGraph to use. -# - -set( MADGRAPH5AMC_LCGVERSION 2.6.7.atlas3 ) -set( MADGRAPH5AMC_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/OpenLoops.cmake b/Projects/AthGeneration/externals/OpenLoops.cmake deleted file mode 100644 index 087811c9d70..00000000000 --- a/Projects/AthGeneration/externals/OpenLoops.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of OpenLoops to use. -# - -set( OPENLOOPS_LCGVERSION "2.0.0" ) -set( OPENLOOPS_LCGROOT - "${LCG_RELEASE_DIR}/MCGenerators/openloops/${OPENLOOPS_LCGVERSION}/${LCG_PLATFORM}" ) \ No newline at end of file diff --git a/Projects/AthGeneration/externals/Photospp.cmake b/Projects/AthGeneration/externals/Photospp.cmake deleted file mode 100644 index 8e0b8c2deae..00000000000 --- a/Projects/AthGeneration/externals/Photospp.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Photos++ to use. -# - -set( PHOTOSPP_LCGVERSION 3.61 ) -set( PHOTOSPP_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Pythia6.cmake b/Projects/AthGeneration/externals/Pythia6.cmake deleted file mode 100644 index b8810cd5b85..00000000000 --- a/Projects/AthGeneration/externals/Pythia6.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Pythia 6 to use. -# - -set( PYTHIA6_LCGVERSION 429.2 ) -set( PYTHIA6_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Pythia8.cmake b/Projects/AthGeneration/externals/Pythia8.cmake deleted file mode 100644 index 378c1efff99..00000000000 --- a/Projects/AthGeneration/externals/Pythia8.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Pythia 8 to use. -# - -set( PYTHIA8_LCGVERSION 244 ) -set( PYTHIA8_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/README.md b/Projects/AthGeneration/externals/README.md deleted file mode 100644 index a0b5ddb141d..00000000000 --- a/Projects/AthGeneration/externals/README.md +++ /dev/null @@ -1,20 +0,0 @@ -Directory collecting external package declarations -================================================== - -This directory is used to collect simple CMake files that get included by -the CMake configuration to set up the locations of all the externals used -for the offline release build. - -Each external should be defined by its own CMake file. The files should -have a name corresponding to the Find module name used to find -the external in question. - -The files should define all the variables expected by the Find modules, -which normally boil down to variables: - -`EXTNAME_LCGROOT` -`EXTNAME_LCGVERSION` - -But some modules may require other variables. In which case the `_LCGROOT` -variable should still be set, to get a nice printout from the AtlasExternals -code during the build about the location of the used external. diff --git a/Projects/AthGeneration/externals/Rivet.cmake b/Projects/AthGeneration/externals/Rivet.cmake deleted file mode 100644 index a2852f07772..00000000000 --- a/Projects/AthGeneration/externals/Rivet.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# -# File specifying the location of Rivet to use. -# -set( RIVET_LCGVERSION 3.1.0 ) -set( RIVET_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Sherpa.cmake b/Projects/AthGeneration/externals/Sherpa.cmake deleted file mode 100644 index ba9b3421a93..00000000000 --- a/Projects/AthGeneration/externals/Sherpa.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# -# File specifying the location of Sherpa to use. -# -set( SHERPA_LCGVERSION 2.2.8 ) -set( SHERPA_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Starlight.cmake b/Projects/AthGeneration/externals/Starlight.cmake deleted file mode 100644 index 4e0548db7bf..00000000000 --- a/Projects/AthGeneration/externals/Starlight.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Starlight to use. -# - -set( STARLIGHT_LCGVERSION r313 ) -set( STARLIGHT_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/starlight/${STARLIGHT_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Superchic.cmake b/Projects/AthGeneration/externals/Superchic.cmake deleted file mode 100644 index eae6f9b47ad..00000000000 --- a/Projects/AthGeneration/externals/Superchic.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Superchic 3.0 to use. -# - -set( SUPERCHIC_LCGVERSION 3.06 ) -set( SUPERCHIC_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/superchic/${SUPERCHIC_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/Tauolapp.cmake b/Projects/AthGeneration/externals/Tauolapp.cmake deleted file mode 100644 index 375c6944f2a..00000000000 --- a/Projects/AthGeneration/externals/Tauolapp.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Tauola++ to use. -# - -set( TAUOLAPP_LCGVERSION 1.1.6 ) -set( TAUOLAPP_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/ThePEG.cmake b/Projects/AthGeneration/externals/ThePEG.cmake deleted file mode 100644 index cf5c807c458..00000000000 --- a/Projects/AthGeneration/externals/ThePEG.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of ThePEG to use. -# - -set( THEPEG_LCGVERSION 2.2.0 ) -set( THEPEG_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthGeneration/externals/VBFNLO.cmake b/Projects/AthGeneration/externals/VBFNLO.cmake deleted file mode 100644 index 1f5da3bec83..00000000000 --- a/Projects/AthGeneration/externals/VBFNLO.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of VBFNLO to use. -# - -set( VBFNLO_LCGVERSION "3.0.0beta5" ) -set( VBFNLO_LCGROOT - "${LCG_RELEASE_DIR}/MCGenerators/vbfnlo/${VBFNLO_LCGVERSION}/${LCG_PLATFORM}" ) diff --git a/Projects/AthGeneration/externals/YODA.cmake b/Projects/AthGeneration/externals/YODA.cmake deleted file mode 100644 index 388f4c1e158..00000000000 --- a/Projects/AthGeneration/externals/YODA.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# -# File specifying the location of YODA to use. -# -set( YODA_LCGVERSION 1.8.0 ) -set( YODA_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthSimulation/CMakeLists.txt b/Projects/AthSimulation/CMakeLists.txt index c141911eeb9..5d621dbf2eb 100644 --- a/Projects/AthSimulation/CMakeLists.txt +++ b/Projects/AthSimulation/CMakeLists.txt @@ -32,19 +32,6 @@ set( AthenaPoolUtilitiesTest_DIR "${CMAKE_SOURCE_DIR}/../../Database/AthenaPOOL/AthenaPoolUtilities/cmake" CACHE PATH "Directory holding the AthenaPoolUtilititesTest module" ) -# Load all the files from the externals/ subdirectory: -file( GLOB _externals "${CMAKE_CURRENT_SOURCE_DIR}/externals/*.cmake" ) -foreach( _external ${_externals} ) - include( ${_external} ) - get_filename_component( _extName ${_external} NAME_WE ) - string( TOUPPER ${_extName} _extNameUpper ) - message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" ) - unset( _extName ) - unset( _extNameUpper ) -endforeach() -unset( _external ) -unset( _externals ) - # Make the local CMake files visible to AtlasCMake. list( INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake ) diff --git a/Projects/AthSimulation/cmake/PostConfig.cmake.in b/Projects/AthSimulation/cmake/PostConfig.cmake.in index 44a30ccfeaf..6db41bd1345 100644 --- a/Projects/AthSimulation/cmake/PostConfig.cmake.in +++ b/Projects/AthSimulation/cmake/PostConfig.cmake.in @@ -1,3 +1,4 @@ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # # File taking care of pointing the downstream projects at the right # version of the externals. @@ -16,20 +17,3 @@ set( SIMULATIONBASE TRUE CACHE BOOL if( SIMULATIONBASE ) add_definitions( -DSIMULATIONBASE ) endif() - -# Load all the files from the externals/ subdirectory: -get_filename_component( _thisdir ${CMAKE_CURRENT_LIST_FILE} PATH ) -file( GLOB _externals "${_thisdir}/externals/*.cmake" ) -unset( _thisdir ) -foreach( _external ${_externals} ) - include( ${_external} ) - get_filename_component( _extName ${_external} NAME_WE ) - string( TOUPPER ${_extName} _extNameUpper ) - if( NOT AthSimulation_FIND_QUIETLY ) - message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" ) - endif() - unset( _extName ) - unset( _extNameUpper ) -endforeach() -unset( _external ) -unset( _externals ) diff --git a/Projects/AthSimulation/externals/HEPUtils.cmake b/Projects/AthSimulation/externals/HEPUtils.cmake deleted file mode 100644 index 8344158ac50..00000000000 --- a/Projects/AthSimulation/externals/HEPUtils.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of HEPUtils to use. -# - -set( HEPUTILS_LCGVERSION 1.3.2 ) -set( HEPUTILS_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthSimulation/externals/MCUtils.cmake b/Projects/AthSimulation/externals/MCUtils.cmake deleted file mode 100644 index f9b41cbffd2..00000000000 --- a/Projects/AthSimulation/externals/MCUtils.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of MCUtils to use. -# - -set( MCUTILS_LCGVERSION 1.3.2 ) -set( MCUTILS_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/AthSimulation/externals/README.md b/Projects/AthSimulation/externals/README.md deleted file mode 100644 index 410c717ff11..00000000000 --- a/Projects/AthSimulation/externals/README.md +++ /dev/null @@ -1,20 +0,0 @@ -Directory collecting external package declarations -================================================== - -This directory is used to collect simple CMake files that get included by -the CMake configuration to set up the locations of all the externals used -for the offline release build. - -Each external should be defined by its own CMake file. The files should -have a name corresponding to the Find module name used to find -the external in question. - -The files should define all the variables expected by the Find modules, -which normally boil down to variables: - - - `EXTNAME_LCGROOT` - - `EXTNAME_LCGVERSION` - -But some modules may require other variables. In which case the `_LCGROOT` -variable should still be set, to get a nice printout from the Athena -project during the build about the location of the used external. diff --git a/Projects/AthSimulation/externals/YODA.cmake b/Projects/AthSimulation/externals/YODA.cmake deleted file mode 100644 index 3e7af0914e9..00000000000 --- a/Projects/AthSimulation/externals/YODA.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of YODA to use. -# - -set( YODA_LCGVERSION 1.7.5 ) -set( YODA_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt index df0ce8aef86..0bf2bb6254a 100644 --- a/Projects/Athena/CMakeLists.txt +++ b/Projects/Athena/CMakeLists.txt @@ -71,19 +71,6 @@ set( AthenaPoolUtilitiesTest_DIR "${CMAKE_SOURCE_DIR}/../../Database/AthenaPOOL/AthenaPoolUtilities/cmake" CACHE PATH "Directory holding the AthenaPoolUtilititesTest module" ) -# Load all the files from the externals/ subdirectory: -file( GLOB _externals "${CMAKE_CURRENT_SOURCE_DIR}/externals/*.cmake" ) -foreach( _external ${_externals} ) - include( ${_external} ) - get_filename_component( _extName ${_external} NAME_WE ) - string( TOUPPER ${_extName} _extNameUpper ) - message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" ) - unset( _extName ) - unset( _extNameUpper ) -endforeach() -unset( _external ) -unset( _externals ) - # Make the local CMake files visible to AtlasCMake. list( INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake ) diff --git a/Projects/Athena/cmake/PostConfig.cmake.in b/Projects/Athena/cmake/PostConfig.cmake.in index 11c8073139c..8f6e9750f0f 100644 --- a/Projects/Athena/cmake/PostConfig.cmake.in +++ b/Projects/Athena/cmake/PostConfig.cmake.in @@ -1,3 +1,4 @@ +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # # File taking care of pointing the downstream projects at the right # version of the externals. @@ -22,20 +23,3 @@ if( Athena_FIND_QUIETLY ) else() find_package( Gaudi REQUIRED ) endif() - -# Load all the files from the externals/ subdirectory: -get_filename_component( _thisdir ${CMAKE_CURRENT_LIST_FILE} PATH ) -file( GLOB _externals "${_thisdir}/externals/*.cmake" ) -unset( _thisdir ) -foreach( _external ${_externals} ) - include( ${_external} ) - get_filename_component( _extName ${_external} NAME_WE ) - string( TOUPPER ${_extName} _extNameUpper ) - if( NOT Athena_FIND_QUIETLY ) - message( STATUS "Taking ${_extName} from: ${${_extNameUpper}_LCGROOT}" ) - endif() - unset( _extName ) - unset( _extNameUpper ) -endforeach() -unset( _external ) -unset( _externals ) diff --git a/Projects/Athena/externals/Crmc.cmake b/Projects/Athena/externals/Crmc.cmake deleted file mode 100644 index 9e2df0cfec9..00000000000 --- a/Projects/Athena/externals/Crmc.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Crmc to use. -# - -set( CRMC_LCGVERSION 1.6.0 ) -set( CRMC_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/EvtGen.cmake b/Projects/Athena/externals/EvtGen.cmake deleted file mode 100644 index 5d729fa4457..00000000000 --- a/Projects/Athena/externals/EvtGen.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of EvtGen to use. -# - -set( EVTGEN_LCGVERSION 1.7.0 ) -set( EVTGEN_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/evtgen/${EVTGEN_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/FJContrib.cmake b/Projects/Athena/externals/FJContrib.cmake deleted file mode 100644 index 3a0bf681fda..00000000000 --- a/Projects/Athena/externals/FJContrib.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# -# File specifying the location of FJContrib to use. -# - -set( FJCONTRIB_LCGVERSION 1.041 ) -set( FJCONTRIB_LCGROOT - ${LCG_RELEASE_DIR}/fjcontrib/${FJCONTRIB_LCGVERSION}/${LCG_PLATFORM} ) - diff --git a/Projects/Athena/externals/HEPUtils.cmake b/Projects/Athena/externals/HEPUtils.cmake deleted file mode 100644 index 8344158ac50..00000000000 --- a/Projects/Athena/externals/HEPUtils.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of HEPUtils to use. -# - -set( HEPUTILS_LCGVERSION 1.3.2 ) -set( HEPUTILS_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/heputils/${HEPUTILS_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Herwig.cmake b/Projects/Athena/externals/Herwig.cmake deleted file mode 100644 index b0df2d6dd7d..00000000000 --- a/Projects/Athena/externals/Herwig.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Herwig to use. -# - -set( HERWIG_LCGVERSION 6.521.2 ) -set( HERWIG_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/herwig/${HERWIG_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Herwig3.cmake b/Projects/Athena/externals/Herwig3.cmake deleted file mode 100644 index 70a428981e7..00000000000 --- a/Projects/Athena/externals/Herwig3.cmake +++ /dev/null @@ -1,9 +0,0 @@ -# -# File specifying the location of Herwig3 to use. -# - -set( HERWIG3_LCGVERSION 7.2.0 ) -# Comment the following line for H7 versions <7.2 -set( HW3_VER_IS_72 1 ) -set( HERWIG3_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/herwig++/${HERWIG3_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Hydjet.cmake b/Projects/Athena/externals/Hydjet.cmake deleted file mode 100644 index 1eede1364e8..00000000000 --- a/Projects/Athena/externals/Hydjet.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Hydjet to use. -# - -set( HYDJET_LCGVERSION 1.8 ) -set( HYDJET_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/hydjet/${HYDJET_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Lhapdf.cmake b/Projects/Athena/externals/Lhapdf.cmake deleted file mode 100644 index 03c1e85b5a8..00000000000 --- a/Projects/Athena/externals/Lhapdf.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Lhapdf to use. -# - -set( LHAPDF_LCGVERSION 6.2.3 ) -set( LHAPDF_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/lhapdf/${LHAPDF_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/MCUtils.cmake b/Projects/Athena/externals/MCUtils.cmake deleted file mode 100644 index 1fd58b0093b..00000000000 --- a/Projects/Athena/externals/MCUtils.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of MCUtils to use. -# - -set( MCUTILS_LCGVERSION 1.3.4 ) -set( MCUTILS_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/mcutils/${MCUTILS_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/MadGraph5Amc.cmake b/Projects/Athena/externals/MadGraph5Amc.cmake deleted file mode 100644 index 6575c4845bd..00000000000 --- a/Projects/Athena/externals/MadGraph5Amc.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of MadGraph to use. -# - -set( MADGRAPH5AMC_LCGVERSION 2.6.7 ) -set( MADGRAPH5AMC_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/madgraph5amc/${MADGRAPH5AMC_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Photospp.cmake b/Projects/Athena/externals/Photospp.cmake deleted file mode 100644 index 8e0b8c2deae..00000000000 --- a/Projects/Athena/externals/Photospp.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Photos++ to use. -# - -set( PHOTOSPP_LCGVERSION 3.61 ) -set( PHOTOSPP_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/photos++/${PHOTOSPP_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Pythia6.cmake b/Projects/Athena/externals/Pythia6.cmake deleted file mode 100644 index b8810cd5b85..00000000000 --- a/Projects/Athena/externals/Pythia6.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Pythia 6 to use. -# - -set( PYTHIA6_LCGVERSION 429.2 ) -set( PYTHIA6_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/pythia6/${PYTHIA6_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Pythia8.cmake b/Projects/Athena/externals/Pythia8.cmake deleted file mode 100644 index 378c1efff99..00000000000 --- a/Projects/Athena/externals/Pythia8.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Pythia 8 to use. -# - -set( PYTHIA8_LCGVERSION 244 ) -set( PYTHIA8_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/pythia8/${PYTHIA8_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/README.md b/Projects/Athena/externals/README.md deleted file mode 100644 index 410c717ff11..00000000000 --- a/Projects/Athena/externals/README.md +++ /dev/null @@ -1,20 +0,0 @@ -Directory collecting external package declarations -================================================== - -This directory is used to collect simple CMake files that get included by -the CMake configuration to set up the locations of all the externals used -for the offline release build. - -Each external should be defined by its own CMake file. The files should -have a name corresponding to the Find module name used to find -the external in question. - -The files should define all the variables expected by the Find modules, -which normally boil down to variables: - - - `EXTNAME_LCGROOT` - - `EXTNAME_LCGVERSION` - -But some modules may require other variables. In which case the `_LCGROOT` -variable should still be set, to get a nice printout from the Athena -project during the build about the location of the used external. diff --git a/Projects/Athena/externals/Rivet.cmake b/Projects/Athena/externals/Rivet.cmake deleted file mode 100644 index 4e6d2c8d80b..00000000000 --- a/Projects/Athena/externals/Rivet.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Rivet to use. -# - -set( RIVET_LCGVERSION 3.1.0 ) -set( RIVET_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/rivet/${RIVET_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Sherpa.cmake b/Projects/Athena/externals/Sherpa.cmake deleted file mode 100644 index e23b878d29f..00000000000 --- a/Projects/Athena/externals/Sherpa.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Sherpa to use. -# - -set( SHERPA_LCGVERSION 2.2.8 ) -set( SHERPA_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/sherpa/${SHERPA_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Starlight.cmake b/Projects/Athena/externals/Starlight.cmake deleted file mode 100644 index 4e0548db7bf..00000000000 --- a/Projects/Athena/externals/Starlight.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Starlight to use. -# - -set( STARLIGHT_LCGVERSION r313 ) -set( STARLIGHT_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/starlight/${STARLIGHT_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/Tauolapp.cmake b/Projects/Athena/externals/Tauolapp.cmake deleted file mode 100644 index 375c6944f2a..00000000000 --- a/Projects/Athena/externals/Tauolapp.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of Tauola++ to use. -# - -set( TAUOLAPP_LCGVERSION 1.1.6 ) -set( TAUOLAPP_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/tauola++/${TAUOLAPP_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/ThePEG.cmake b/Projects/Athena/externals/ThePEG.cmake deleted file mode 100644 index cf5c807c458..00000000000 --- a/Projects/Athena/externals/ThePEG.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of ThePEG to use. -# - -set( THEPEG_LCGVERSION 2.2.0 ) -set( THEPEG_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/thepeg/${THEPEG_LCGVERSION}/${LCG_PLATFORM} ) diff --git a/Projects/Athena/externals/YODA.cmake b/Projects/Athena/externals/YODA.cmake deleted file mode 100644 index 83538dbcbe7..00000000000 --- a/Projects/Athena/externals/YODA.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# -# File specifying the location of YODA to use. -# - -set( YODA_LCGVERSION 1.8.0 ) -set( YODA_LCGROOT - ${LCG_RELEASE_DIR}/MCGenerators/yoda/${YODA_LCGVERSION}/${LCG_PLATFORM} ) -- GitLab From 93e21563f41d716b5a26259a7916730d6fba22f1 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Fri, 3 Apr 2020 11:51:41 +0200 Subject: [PATCH 07/13] Removed the installation of the no longer existing files. This was not showing up as an error in my tests, but it's still a good idea to do this cleanup. --- Projects/AthGeneration/CMakeLists.txt | 4 ---- Projects/AthSimulation/CMakeLists.txt | 4 ---- Projects/Athena/CMakeLists.txt | 4 ---- 3 files changed, 12 deletions(-) diff --git a/Projects/AthGeneration/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt index 512e4d84c8e..ac18de096d9 100644 --- a/Projects/AthGeneration/CMakeLists.txt +++ b/Projects/AthGeneration/CMakeLists.txt @@ -52,10 +52,6 @@ atlas_ctest_setup() atlas_project( USE AthGenerationExternals ${AthGenerationExternals_VERSION} PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../ ) -# Install the external configurations: -install( DIRECTORY ${CMAKE_SOURCE_DIR}/externals - DESTINATION ${CMAKE_INSTALL_CMAKEDIR} USE_SOURCE_PERMISSIONS ) - # Generate the environment setup for the externals, to be used during the build: lcg_generate_env( SH_FILE ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/env_setup.sh ) diff --git a/Projects/AthSimulation/CMakeLists.txt b/Projects/AthSimulation/CMakeLists.txt index 5d621dbf2eb..138d3117683 100644 --- a/Projects/AthSimulation/CMakeLists.txt +++ b/Projects/AthSimulation/CMakeLists.txt @@ -42,10 +42,6 @@ atlas_ctest_setup() atlas_project( USE AthSimulationExternals ${AthSimulationExternals_VERSION} PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../ ) -# Install the external configurations: -install( DIRECTORY ${CMAKE_SOURCE_DIR}/externals - DESTINATION ${CMAKE_INSTALL_CMAKEDIR} USE_SOURCE_PERMISSIONS ) - # Generate the environment setup for the externals, to be used during the build: lcg_generate_env( SH_FILE ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/env_setup.sh ) diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt index 0bf2bb6254a..01908b169c7 100644 --- a/Projects/Athena/CMakeLists.txt +++ b/Projects/Athena/CMakeLists.txt @@ -81,10 +81,6 @@ atlas_ctest_setup() atlas_project( USE AthenaExternals ${AthenaExternals_VERSION} PROJECT_ROOT ${CMAKE_SOURCE_DIR}/../../ ) -# Install the external configurations: -install( DIRECTORY ${CMAKE_SOURCE_DIR}/externals - DESTINATION ${CMAKE_INSTALL_CMAKEDIR} USE_SOURCE_PERMISSIONS ) - # Generate the environment setup for the externals, to be used during the build: lcg_generate_env( SH_FILE ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/env_setup.sh ) -- GitLab From b5d79cc75999a4369aaed0eb36d5ea31d085f4a4 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Fri, 3 Apr 2020 19:43:12 +0200 Subject: [PATCH 08/13] Hardcoding that we are using Herwig3 version 7.2.0 for now. Previously this setting was made in the appropriate Herwig3.cmake files, but now those are gone. But we still use 7.2.0 with LCG_97 everywhere. --- Generators/Herwig7_i/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Generators/Herwig7_i/CMakeLists.txt b/Generators/Herwig7_i/CMakeLists.txt index 9a200b44ec8..fc85fe57521 100644 --- a/Generators/Herwig7_i/CMakeLists.txt +++ b/Generators/Herwig7_i/CMakeLists.txt @@ -25,18 +25,13 @@ find_package( VBFNLO ) # Remove the --as-needed linker flags: atlas_disable_as_needed() -# Add extra flag for H7 versions >=7.2 -set( _extraDefs ) -if(DEFINED HW3_VER_IS_72) - set( _extraDefs -DHWVER_IS_72=\"${HW3_VER_IS_72}\" ) -endif() - # Component(s) in the package: atlas_add_component( Herwig7_i Herwig7_i/*.h src/*.cxx src/components/*.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HERWIG3_INCLUDE_DIRS} ${THEPEG_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${VBFNLO_INCLUDE_DIRS} - DEFINITIONS -DHWVERSION=\"${HERWIG3_LCGVERSION}\" ${_extraDefs} + DEFINITIONS -DHWVERSION=\"${HERWIG3_LCGVERSION}\" + -DHWVER_IS_72=\"${HW3_VER_IS_72}\" LINK_LIBRARIES ${HERWIG3_LIBRARIES} ${Boost_LIBRARIES} ${THEPEG_LIBRARIES} ${GSL_LIBRARIES} ${VBFNLO_LIBRARIES} GeneratorModulesLib EventInfo GaudiKernel PathResolver ) -- GitLab From 1d156724b6925db6de96b7e51892c7c7d7893174 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Sat, 4 Apr 2020 18:12:28 +0200 Subject: [PATCH 09/13] AthGeneration: Remove duplicate entry for POOLRootAccess --- Projects/AthGeneration/package_filters.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Projects/AthGeneration/package_filters.txt b/Projects/AthGeneration/package_filters.txt index fb153d11ab3..e3943ba233b 100644 --- a/Projects/AthGeneration/package_filters.txt +++ b/Projects/AthGeneration/package_filters.txt @@ -163,7 +163,6 @@ + PhysicsAnalysis/POOLRootAccess + PhysicsAnalysis/TruthParticleID/McParticleEvent + PhysicsAnalysis/TruthParticleID/McParticleKernel -+ PhysicsAnalysis/POOLRootAccess #+ Projects/AthGeneration #+ Projects/AthGeneration/.* #+ Reconstruction/eflowRec -- GitLab From 5427b57839781f5dc57842d0518ba987a3ae8bfe Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Sun, 5 Apr 2020 13:40:20 +0200 Subject: [PATCH 10/13] Fixed JetRecConfig's usage of the xAODType enum from python. --- Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py index d5c65e16faa..6df7a8a949b 100644 --- a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py +++ b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration ######################################################################## # # @@ -10,13 +10,7 @@ from AthenaCommon import Logging jetlog = Logging.logging.getLogger('JetRecConfig') -import cppyy -try: - cppyy.loadDictionary('xAODBaseObjectTypeDict') -except Exception: - pass -from ROOT import xAODType -xAODType.ObjectType +from xAODBase.xAODType import xAODType from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator -- GitLab From 6d465957cf8fb45fb7084ce620d54d077fec0032 Mon Sep 17 00:00:00 2001 From: Frank Winklmeier Date: Sun, 5 Apr 2020 22:09:44 +0200 Subject: [PATCH 11/13] Remove calls to TInterpreter::EnableAutoLoading Calling `TInterpreter::EnableAutoLoading` is deprecated and no longer necessary. In fact, it causes a crash due to an assertion in the debug build. --- Database/APR/RootCollection/test/read_test.cxx | 1 - Database/APR/RootCollection/test/update_test.cxx | 1 - .../AthenaPoolServices/src/AthenaRootStreamerSvc.cxx | 7 ------- Event/xAOD/xAODCore/xAODCore/AddDVProxy.h | 3 --- .../AthenaROOTAccess/test/DVCollectionProxy_test.cxx | 2 -- .../AthenaROOTAccess/test/DataBucketVoid_test.cxx | 1 - .../TileCalib/TileCalibBlobPython/python/TileCalibTools.py | 1 - 7 files changed, 16 deletions(-) diff --git a/Database/APR/RootCollection/test/read_test.cxx b/Database/APR/RootCollection/test/read_test.cxx index cb51bb40119..42ae6093e9a 100755 --- a/Database/APR/RootCollection/test/read_test.cxx +++ b/Database/APR/RootCollection/test/read_test.cxx @@ -420,7 +420,6 @@ TestDriver::read() int main() { - gInterpreter->EnableAutoLoading(); TClass::GetClass("map"); (void)remove("test_collection.root"); diff --git a/Database/APR/RootCollection/test/update_test.cxx b/Database/APR/RootCollection/test/update_test.cxx index 8c4c69c34c6..0475dc87281 100755 --- a/Database/APR/RootCollection/test/update_test.cxx +++ b/Database/APR/RootCollection/test/update_test.cxx @@ -254,7 +254,6 @@ TestDriver::query() { int main( int argc, char ** ) { - gInterpreter->EnableAutoLoading(); TClass::GetClass("map"); try { diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx index 467d3782f03..3da0df2860f 100755 --- a/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx +++ b/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx @@ -111,13 +111,6 @@ StatusCode AthenaRootStreamerSvc::AddStreamer(const std::string& converter_class { RootType streamer_class( converter_classname ); if( !streamer_class ) { - // Class not yet known to Reflex - // try autoloading - static bool first = true; - if (first) { - gInterpreter->EnableAutoLoading(); - first = false; - } // int ntypesBefore = Reflex::Type::TypeSize(); gInterpreter->AutoLoad( converter_classname.c_str() ); diff --git a/Event/xAOD/xAODCore/xAODCore/AddDVProxy.h b/Event/xAOD/xAODCore/xAODCore/AddDVProxy.h index b6e55470bc7..389f8f7d807 100644 --- a/Event/xAOD/xAODCore/xAODCore/AddDVProxy.h +++ b/Event/xAOD/xAODCore/xAODCore/AddDVProxy.h @@ -208,9 +208,6 @@ namespace xAOD { template < typename T > static void add( ROOT::TGenericClassInfo* clInfo ) { - // Enable library auto-loading: - gInterpreter->EnableAutoLoading(); - // Load the minimal amount of required dictionaries: loadDictionaries(); diff --git a/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx b/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx index b2cc123f83b..80eb7b5955c 100644 --- a/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx +++ b/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx @@ -63,8 +63,6 @@ void test1() int main() { - gInterpreter->EnableAutoLoading(); - TClass::GetClass("DataVector"); test1(); diff --git a/PhysicsAnalysis/AthenaROOTAccess/test/DataBucketVoid_test.cxx b/PhysicsAnalysis/AthenaROOTAccess/test/DataBucketVoid_test.cxx index c8abc3e8498..740a0eb9ddb 100644 --- a/PhysicsAnalysis/AthenaROOTAccess/test/DataBucketVoid_test.cxx +++ b/PhysicsAnalysis/AthenaROOTAccess/test/DataBucketVoid_test.cxx @@ -74,7 +74,6 @@ void test1() int main() { - gInterpreter->EnableAutoLoading(); test1(); return 0; } diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py index 529e9930117..845106723ec 100644 --- a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py +++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py @@ -14,7 +14,6 @@ Python helper module for managing COOL DB connections and TileCalibBlobs. from __future__ import print_function import ROOT -ROOT.gInterpreter.EnableAutoLoading() import cx_Oracle # noqa: F401 from PyCool import cool -- GitLab From 7bd038a36d8329c351db82748ee83d196295e2de Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay Date: Mon, 6 Apr 2020 17:16:02 +0200 Subject: [PATCH 12/13] Re-inserted a (thread-safe) version of the library auto-loading code. Instead of relying on gInterpreter->EnableAutoLoading() however, which is not functional in the debug build of ROOT 6.20/02, the code now rather calls on the functions that TCling::EnableAutoLoading() would call itself as well. --- .../src/AthenaRootStreamerSvc.cxx | 15 +++++++- Event/xAOD/xAODCore/Root/AddDVProxy.cxx | 37 ++++++++++++------- Event/xAOD/xAODCore/xAODCore/AddDVProxy.h | 37 ++----------------- 3 files changed, 41 insertions(+), 48 deletions(-) diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx index 3da0df2860f..4c132aaa656 100755 --- a/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx +++ b/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ /** @file AthenaRootStreamerSvc.cxx @@ -21,6 +21,7 @@ #include "DataModelRoot/RootType.h" #include "TInterpreter.h" +#include #include @@ -111,6 +112,18 @@ StatusCode AthenaRootStreamerSvc::AddStreamer(const std::string& converter_class { RootType streamer_class( converter_classname ); if( !streamer_class ) { + + // Enable library auto-loading. Only once per job. + static std::once_flag libLoadFlag; + std::call_once( libLoadFlag, []( TInterpreter& interpreter ) { + + // Enable library auto-loading. + TClass::ReadRules(); + interpreter.LoadLibraryMap(); + interpreter.SetClassAutoloading( true ); + + }, *gInterpreter ); + // int ntypesBefore = Reflex::Type::TypeSize(); gInterpreter->AutoLoad( converter_classname.c_str() ); diff --git a/Event/xAOD/xAODCore/Root/AddDVProxy.cxx b/Event/xAOD/xAODCore/Root/AddDVProxy.cxx index 444242369f4..46df3091c73 100644 --- a/Event/xAOD/xAODCore/Root/AddDVProxy.cxx +++ b/Event/xAOD/xAODCore/Root/AddDVProxy.cxx @@ -1,15 +1,17 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ -// $Id: AddDVProxy.cxx 591472 2014-04-05 11:23:29Z krasznaa $ +// Local include(s): +#include "xAODCore/AddDVProxy.h" // ROOT include(s): #include #include +#include -// Local include(s): -#include "xAODCore/AddDVProxy.h" +// System include(s): +#include namespace xAOD { @@ -19,16 +21,25 @@ namespace xAOD { /// void AddDVProxy::loadDictionaries() { - // Make sure that the minimal set of dictionaries are loaded: - TClass* dummyCl = - TClass::GetClass( "DataVector" ); - if( ! dummyCl ) { - ::Error( "xAOD::AddDVProxy::loadDictionaries", - "Couldn't load the dictionary for " - "DataVector" ); - } + // Enable library auto-loading. Only once per job. + static std::once_flag libLoadFlag; + std::call_once( libLoadFlag, []( TInterpreter& interpreter ) { + + // Enable library auto-loading. + TClass::ReadRules(); + interpreter.LoadLibraryMap(); + interpreter.SetClassAutoloading( true ); + + // Make sure that the minimal set of dictionaries are loaded: + if( ! TClass::GetClass( "DataVector" ) ) { + ::Error( "xAOD::AddDVProxy::loadDictionaries", + "Couldn't load the dictionary for " + "DataVector" ); + } + + }, *gInterpreter ); return; } -} // namespace edm +} // namespace xAOD diff --git a/Event/xAOD/xAODCore/xAODCore/AddDVProxy.h b/Event/xAOD/xAODCore/xAODCore/AddDVProxy.h index 389f8f7d807..f3263de027a 100644 --- a/Event/xAOD/xAODCore/xAODCore/AddDVProxy.h +++ b/Event/xAOD/xAODCore/xAODCore/AddDVProxy.h @@ -1,10 +1,7 @@ // Dear emacs, this is -*- c++ -*- - /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration */ - -// $Id: AddDVProxy.h 599963 2014-06-02 16:44:36Z ssnyder $ #ifndef XAODCORE_ADDDVPROXY_H #define XAODCORE_ADDDVPROXY_H @@ -154,9 +151,6 @@ namespace xAOD { /// /// @author Attila Krasznahorkay /// - /// $Revision: 599963 $ - /// $Date: 2014-06-02 18:44:36 +0200 (Mon, 02 Jun 2014) $ - /// template< class T > struct Helper { @@ -216,33 +210,8 @@ namespace xAOD { new TDVCollectionProxy( ClassName< T >::name().c_str() ); proxy->SetResize( Helper< T >::resize ); - if( clInfo ) { - - // This is where we go with ROOT 6... - - // Add it to the class info: - clInfo->AdoptCollectionProxy( proxy ); - - } else { - - // This is where we go with ROOT 5... - - // Try to access the class's dictionary: - TClass* cl = TClass::GetClass( typeid( T ) ); - if( ! cl ) { - ::Error( "xAOD::AddDVProxy::add", - "Couldn't find dictionary for type \"%s\"", - ClassName< T >::name().c_str() ); - delete proxy; - return; - } - - // Attach the proxy to the dictionary: - cl->CopyCollectionProxy( *proxy ); - // We don't need this instance anymore: - delete proxy; - - } + // Add it to the class info: + clInfo->AdoptCollectionProxy( proxy ); return; } -- GitLab From 155764788b394bf5c65baf57e62de745676a797f Mon Sep 17 00:00:00 2001 From: Walter Lampl Date: Sun, 12 Apr 2020 05:39:56 +0000 Subject: [PATCH 13/13] Explicity call GetClass("DataLink_p2") to work around root issue (hack suggested by Scott) --- Database/APR/RootStorageSvc/src/RootTreeContainer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp index 2f372ce05ef..d973efb7841 100755 --- a/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp +++ b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp @@ -512,6 +512,7 @@ DbStatus RootTreeContainer::open( const DbDatabase& dbH, const DbTypeInfo* info, DbAccessMode mode) { + TClass::GetClass("DataLink_p2"); DbPrint log(nam); m_branches.clear(); m_name = nam; -- GitLab