diff --git a/Control/xAODDataSource/Root/RDataSource.cxx b/Control/xAODDataSource/Root/RDataSource.cxx index 2c7bd65f42e44f99dece8493f34548685fdf160c..c8bf2a9b99c3a8cc1f2101c8342643797647ff5b 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 \"" diff --git a/Database/APR/RootCollection/test/read_test.cxx b/Database/APR/RootCollection/test/read_test.cxx index cb51bb401198b19cbcffb64898207df41cc88d14..42ae6093e9abea890ce9cddf59d79c0d9993b80b 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 8c4c69c34c61e8095fdc00823d23cbfe36eb6dfe..0475dc872817af584832ed2cb34a2faab286ba18 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/APR/RootStorageSvc/src/RootTreeContainer.cpp b/Database/APR/RootStorageSvc/src/RootTreeContainer.cpp index 2f372ce05efca25f7157f389d1bc7d9addd4fb90..d973efb7841476bfe1d87f100846907bc773641d 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; diff --git a/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx b/Database/AthenaPOOL/AthenaPoolServices/src/AthenaRootStreamerSvc.cxx index 467d3782f0333409eb7402a5df6366895f63a86f..4c132aaa656be4e46099b66ee80d1361238bbb71 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,13 +112,18 @@ 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; - } + + // 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 444242369f4ee3f662a5b99be7c133b7a462d981..46df3091c7313c6869c432744e5f2195aee7a092 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 b6e55470bc70167454783705c3530048432bbc65..f3263de027a8e7951dfeee453ef81f53c310d50d 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 { @@ -208,9 +202,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(); @@ -219,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; } diff --git a/Generators/Herwig7_i/CMakeLists.txt b/Generators/Herwig7_i/CMakeLists.txt index 2a8af7a478a60a0e26bd655e4823d59cce87240e..cbd368f2a24d763e115a62cca72336b0f58698e3 100644 --- a/Generators/Herwig7_i/CMakeLists.txt +++ b/Generators/Herwig7_i/CMakeLists.txt @@ -26,18 +26,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 ) diff --git a/Generators/Sherpa_i/CMakeLists.txt b/Generators/Sherpa_i/CMakeLists.txt index a86056227fb14c5d5a5b74cfccecd9533c03e51e..ad8a9aa8c3340d8430cd439b1999963d28bbd109 100644 --- a/Generators/Sherpa_i/CMakeLists.txt +++ b/Generators/Sherpa_i/CMakeLists.txt @@ -24,6 +24,9 @@ atlas_depends_on_subdirs( PUBLIC find_package( CLHEP ) 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() diff --git a/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx b/PhysicsAnalysis/AthenaROOTAccess/test/DVCollectionProxy_test.cxx index b2cc123f83b0411bcf75648f1395fc04d464253d..80eb7b5955ccf051af13f12001fa7b84a7e669e4 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 c8abc3e8498b8af729008870a46aafbc351df4fe..740a0eb9ddb2f94ea66eb0e3e7ffe14d8f4fa93e 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/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt index b8672edbc04fdfcd478993a438a2230bf770206c..cae59990762484ef236b4feb877baf2a831443d4 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/CMakeLists.txt b/Projects/AthDataQuality/CMakeLists.txt index fd720da5f73d97f7a0688cdfdc7fa1d47024d50f..46a0abb1c81491f948f61c4e1479b24f470b7ba9 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/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt index bc2d8ef946532345c7eddcf5c20a4dcecc3ae981..c4e007da5118b856961b46f9735f64f597b0ccc6 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/CMakeLists.txt b/Projects/AthGeneration/CMakeLists.txt index 44cb97ccf62577fd0ee4fb899ee604bec5864e0e..ac18de096d92b299691ce022c3f800fed908035b 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() @@ -65,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/AthGeneration/build_externals.sh b/Projects/AthGeneration/build_externals.sh index 99cf4d58cf4f15fd2faa785bb4275514c850e745..012de3d5cac38e8b4f962a645e224413ffe4d122 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/AthGeneration/cmake/PostConfig.cmake.in b/Projects/AthGeneration/cmake/PostConfig.cmake.in index 55630f7dd966f4767dac78d3a21337c3d96722d5..7ff8c678392713a1c21c5ca64298d04c378e0f56 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.txt b/Projects/AthGeneration/externals.txt index 4c7ced857d39d6517626367c8c91a3a43ea0cdae..03ff7219a7b6a6b1b52fdb3c86a7920a9ce32c87 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/AthGeneration/externals/Crmc.cmake b/Projects/AthGeneration/externals/Crmc.cmake deleted file mode 100644 index b1a4276e809b45a7bf67c442c6ef82822e361ef3..0000000000000000000000000000000000000000 --- 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 5d729fa4457dd559530cf6c20db62a6974763059..0000000000000000000000000000000000000000 --- 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 fe7873d126d03a3022a7319467800c24042224e7..0000000000000000000000000000000000000000 --- 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 8344158ac506661512518cc490a53e012719bfd0..0000000000000000000000000000000000000000 --- 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 b0df2d6dd7de4363b5fc6a5538ac9becea9f78ef..0000000000000000000000000000000000000000 --- 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 70a428981e758362c6aad7a1f495bfb4050e899b..0000000000000000000000000000000000000000 --- 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 1eede1364e82dd905ae8546a36ffba6acfe11849..0000000000000000000000000000000000000000 --- 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 03c1e85b5a88e746d9a03c918df24ae9b84b6faa..0000000000000000000000000000000000000000 --- 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 1fd58b0093bd453391f386246db1d0268da8e78f..0000000000000000000000000000000000000000 --- 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.4 ) -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 741f63cf942e814843d29e662f38f8a96ab607ba..0000000000000000000000000000000000000000 --- 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 087811c9d70c055a7419707b2358156a3e43c4e4..0000000000000000000000000000000000000000 --- 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 8e0b8c2deae56c516c33438e44d0ce2257191861..0000000000000000000000000000000000000000 --- 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 b8810cd5b852142988e8bb706b07cfcafa1a29ca..0000000000000000000000000000000000000000 --- 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 378c1efff99649120c024d7951be38ff50c97979..0000000000000000000000000000000000000000 --- 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 a0b5ddb141d9662009c64e2664c9d3d704c9ab2c..0000000000000000000000000000000000000000 --- 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 a2852f07772f2f45aa720a81c0049208bfbd0bab..0000000000000000000000000000000000000000 --- 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 ba9b3421a933a8273427d55da9c62bfd131d3aab..0000000000000000000000000000000000000000 --- 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 4e0548db7bff885d4230a5cc5749fa806ded1b08..0000000000000000000000000000000000000000 --- 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 eae6f9b47adef44b2cc964e4e127ef803de49bab..0000000000000000000000000000000000000000 --- 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 375c6944f2a508160192f49f9f816570e11746cf..0000000000000000000000000000000000000000 --- 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 cf5c807c4582efe4b7084e3add47f9910fed7e3e..0000000000000000000000000000000000000000 --- 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 1f5da3bec8334e52af35afa4f90c8d1f4bcf2d6f..0000000000000000000000000000000000000000 --- 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 388f4c1e158db5510a576ca7146da09bd374e22c..0000000000000000000000000000000000000000 --- 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/AthGeneration/package_filters.txt b/Projects/AthGeneration/package_filters.txt index fbfb1cc57940c3a77947512cd74d39d61706138c..e3943ba233b3d84e9534a2c006f1c76b73c56170 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 @@ -159,7 +163,6 @@ + PhysicsAnalysis/POOLRootAccess + PhysicsAnalysis/TruthParticleID/McParticleEvent + PhysicsAnalysis/TruthParticleID/McParticleKernel -+ PhysicsAnalysis/POOLRootAccess #+ Projects/AthGeneration #+ Projects/AthGeneration/.* #+ Reconstruction/eflowRec diff --git a/Projects/AthSimulation/CMakeLists.txt b/Projects/AthSimulation/CMakeLists.txt index c141911eeb9a008c8e7f19ef655d65f52f8bbc33..138d3117683f579dd53250bd2681662e04026fd9 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 ) @@ -55,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/AthSimulation/build_externals.sh b/Projects/AthSimulation/build_externals.sh index 0c4833b077ae3ae19fef7dfbbb7899367f5cbbe4..5e3c9d5dd1c418cdf63271b11f6eb30876fcdf89 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/AthSimulation/cmake/PostConfig.cmake.in b/Projects/AthSimulation/cmake/PostConfig.cmake.in index 44a30ccfeafd3031c26c5d46003fe10464518715..6db41bd1345f6a913184833f2af91db000bf1396 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.txt b/Projects/AthSimulation/externals.txt index 515e9ccd9140d1d521d72c0c1eadd7c5a38ea7ff..f41b0fe15467bbbf5a148f400b79cb697e7f9898 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/AthSimulation/externals/HEPUtils.cmake b/Projects/AthSimulation/externals/HEPUtils.cmake deleted file mode 100644 index 8344158ac506661512518cc490a53e012719bfd0..0000000000000000000000000000000000000000 --- 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 f9b41cbffd2eff6f01b2cba597def942b275d18e..0000000000000000000000000000000000000000 --- 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 410c717ff11283b6947403d0736b116ed4e89c50..0000000000000000000000000000000000000000 --- 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 3e7af0914e9738cdf775f8f0610d1061e3a6630d..0000000000000000000000000000000000000000 --- 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 08545f1d94da9704ebe5f498198c540b45ac4ba2..01908b169c77f9c62f69938d1dd8fb0fabac9e27 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() @@ -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 ) @@ -94,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 ) diff --git a/Projects/Athena/build_externals.sh b/Projects/Athena/build_externals.sh index f13334ceddd78de5c535f1d037aea52742e976af..9d3c98d670108457b02dd1a2c0ebe73a18845e72 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) diff --git a/Projects/Athena/cmake/PostConfig.cmake.in b/Projects/Athena/cmake/PostConfig.cmake.in index 11c8073139c6fd0f5a70512150efc3520132e2fa..8f6e9750f0f1498e78283371ccfd6a5229cdfc71 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.txt b/Projects/Athena/externals.txt index 7d30edb8ff150b2afb238bf01378d74e0cfa2f63..510b31a17c10a9120a940d96a7ce15c6b4087ba2 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/Athena/externals/Crmc.cmake b/Projects/Athena/externals/Crmc.cmake deleted file mode 100644 index 9e2df0cfec926cfe5c726ab106c8bd5acafaef85..0000000000000000000000000000000000000000 --- 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 5d729fa4457dd559530cf6c20db62a6974763059..0000000000000000000000000000000000000000 --- 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 3a0bf681fda45d975a80e5476656eb50bfefb61d..0000000000000000000000000000000000000000 --- 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 8344158ac506661512518cc490a53e012719bfd0..0000000000000000000000000000000000000000 --- 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 b0df2d6dd7de4363b5fc6a5538ac9becea9f78ef..0000000000000000000000000000000000000000 --- 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 70a428981e758362c6aad7a1f495bfb4050e899b..0000000000000000000000000000000000000000 --- 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 1eede1364e82dd905ae8546a36ffba6acfe11849..0000000000000000000000000000000000000000 --- 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 03c1e85b5a88e746d9a03c918df24ae9b84b6faa..0000000000000000000000000000000000000000 --- 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 1fd58b0093bd453391f386246db1d0268da8e78f..0000000000000000000000000000000000000000 --- 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 6575c4845bdf0085aa9120626e5ef7f8ab66e195..0000000000000000000000000000000000000000 --- 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 8e0b8c2deae56c516c33438e44d0ce2257191861..0000000000000000000000000000000000000000 --- 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 b8810cd5b852142988e8bb706b07cfcafa1a29ca..0000000000000000000000000000000000000000 --- 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 378c1efff99649120c024d7951be38ff50c97979..0000000000000000000000000000000000000000 --- 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 410c717ff11283b6947403d0736b116ed4e89c50..0000000000000000000000000000000000000000 --- 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 4e6d2c8d80b6491b757db347777d72c50b5ace62..0000000000000000000000000000000000000000 --- 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 e23b878d29fd2b6a7cea5657b056f895af637956..0000000000000000000000000000000000000000 --- 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 4e0548db7bff885d4230a5cc5749fa806ded1b08..0000000000000000000000000000000000000000 --- 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 375c6944f2a508160192f49f9f816570e11746cf..0000000000000000000000000000000000000000 --- 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 cf5c807c4582efe4b7084e3add47f9910fed7e3e..0000000000000000000000000000000000000000 --- 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 83538dbcbe7eed91514a98640b7ded96a39cd66a..0000000000000000000000000000000000000000 --- 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} ) diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt index 2bc7cb2e226fbd909075b13159b0ad39e7712c36..9c3a325fe18e9a88a5f001240815dc656b4d5b4e 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 diff --git a/Projects/VP1Light/externals.txt b/Projects/VP1Light/externals.txt index 84e8393e4cbf82b9e4a424a83828058b27dccad7..882d4239ecec0936bf09a31bb7842195bdd2c1a3 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 diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py index 3a449295476007646510d0b223d62ee930493f6b..6df7a8a949b3651fe462f38f8e498c37d15344d4 100644 --- a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py +++ b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py @@ -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 diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py index 529e9930117bac629d2079d9441ddcea33e4ff1f..845106723ecb87f93271ae2c7e29f6ac72b2085c 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