diff --git a/Event/xAOD/xAODEventInfoCnv/CMakeLists.txt b/Event/xAOD/xAODEventInfoCnv/CMakeLists.txt index d697242a48fba313467c62312b608ecf8fdcf8b7..6040d5306f7e3b4ba7c024b62e3f68b0fe9b45a7 100644 --- a/Event/xAOD/xAODEventInfoCnv/CMakeLists.txt +++ b/Event/xAOD/xAODEventInfoCnv/CMakeLists.txt @@ -55,7 +55,7 @@ atlas_add_test( EvenInfoCnvConfigTestMT PRIVATE_WORKING_DIRECTORY POST_EXEC_SCRIPT nopost.sh ) -if( NOT SIMULATIONBASE AND NOT GENERATIONBASE AND NOT XAOD_ANALYSIS ) +if( NOT SIMULATIONBASE AND NOT GENERATIONBASE AND NOT ATLAS_DERIVATION_RELEASE AND NOT XAOD_ANALYSIS ) atlas_add_test( EventInfoOverlayConfigTest SCRIPT test/EventInfoOverlay_test.py PROPERTIES TIMEOUT 300 diff --git a/InnerDetector/InDetConfig/CMakeLists.txt b/InnerDetector/InDetConfig/CMakeLists.txt index 4bba1abf5f085de208e154b7671cc7c36ee29cad..6dacf925689eeab813a089f9d97c7bdbb871a3aa 100644 --- a/InnerDetector/InDetConfig/CMakeLists.txt +++ b/InnerDetector/InDetConfig/CMakeLists.txt @@ -10,7 +10,7 @@ atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) #atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) #atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) -if (NOT SIMULATIONBASE) +if (NOT SIMULATIONBASE AND NOT ATLAS_DERIVATION_RELEASE) atlas_add_test( TrackingPassFlags_test SCRIPT python -m InDetConfig.TrackingPassFlags POST_EXEC_SCRIPT nopost.sh) diff --git a/MuonSpectrometer/MuonConfig/CMakeLists.txt b/MuonSpectrometer/MuonConfig/CMakeLists.txt index 403b07ec29b28b3cc6f0beeb8aa51219b244261a..6015fc74f77dadc4b376c3e624ea6bd5d661dc4a 100644 --- a/MuonSpectrometer/MuonConfig/CMakeLists.txt +++ b/MuonSpectrometer/MuonConfig/CMakeLists.txt @@ -9,7 +9,7 @@ atlas_subdir( MuonConfig ) atlas_install_python_modules( python/*.py test/MdtRdoToPrepDataTool_test.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) atlas_install_data( share/*.ref ) -if( NOT SIMULATIONBASE ) +if( NOT SIMULATIONBASE AND NOT ATLAS_DERIVATION_RELEASE ) # Mdt tests atlas_add_test( MdtRdoToPrepDataTool_test SCRIPT python -m MuonConfig.MdtRdoToPrepDataTool_test diff --git a/Projects/AthDerivation/CMakeLists.txt b/Projects/AthDerivation/CMakeLists.txt index a115ac0d9732ae6fc8e1d7e1dead785440793c9c..ee84621bb6bca82cb67edd12b8c277414d1efb58 100644 --- a/Projects/AthDerivation/CMakeLists.txt +++ b/Projects/AthDerivation/CMakeLists.txt @@ -38,6 +38,13 @@ find_package( tdaq-common REQUIRED ) find_package( Frontier_Client ) find_package( VDT ) +# Set the project into "ATLAS_DERIVATION_RELEASE mode". +set( ATLAS_DERIVATION_RELEASE TRUE CACHE BOOL + "Flag specifying that this is a derivation release build" ) +if( ATLAS_DERIVATION_RELEASE ) + add_definitions( -DATLAS_DERIVATION_RELEASE ) +endif() + # Set up where to find the AthenaPoolUtilitiesTest CMake code. set( AthenaPoolUtilitiesTest_DIR "${CMAKE_SOURCE_DIR}/../../Database/AthenaPOOL/AthenaPoolUtilities/cmake" diff --git a/Projects/AthDerivation/cmake/PostConfig.cmake.in b/Projects/AthDerivation/cmake/PostConfig.cmake.in index 242a378215605b51f48a9a48bc13b47cc448645c..30ac9993720a58f165e65ccb0c65632ed6a5ce9c 100644 --- a/Projects/AthDerivation/cmake/PostConfig.cmake.in +++ b/Projects/AthDerivation/cmake/PostConfig.cmake.in @@ -15,3 +15,10 @@ set( CLHEP_ROOT "${CLHEP_LCGROOT}" CACHE PATH "Path to pick up CLHEP from" ) # Find Gaudi. find_package( Gaudi @Gaudi_VERSION@ EXACT REQUIRED ${_quietFlag} ) + +# Set the project into "ATLAS_DERIVATION_RELEASE mode". +set( ATLAS_DERIVATION_RELEASE TRUE CACHE BOOL + "Flag specifying that this is a derivation release build" ) +if( ATLAS_DERIVATION_RELEASE ) + add_definitions( -DATLAS_DERIVATION_RELEASE ) +endif() diff --git a/Projects/AthDerivation/package_filters.txt b/Projects/AthDerivation/package_filters.txt index a02e53a3e8b86ac312b94ef45d60a6a2be807b46..e6aa4f35a50495bba746aa3a423692ae22d900c8 100644 --- a/Projects/AthDerivation/package_filters.txt +++ b/Projects/AthDerivation/package_filters.txt @@ -133,14 +133,23 @@ + Generators/TruthUtils + Generators/McEventSelector +# HGTD ++ HighGranularityTimingDetector/HGTD_Conditions/HGTD_ConditionsAlgorithms ++ HighGranularityTimingDetector/HGTD_Config ++ HighGranularityTimingDetector/HGTD_DetDescr/.* ++ HighGranularityTimingDetector/HGTD_DetDescrCnv/.* ++ HighGranularityTimingDetector/HGTD_Reconstruction/HGTD_TrackingGeometry + # Inner detector package(s). + InnerDetector/InDetConditions/BeamSpot.* + InnerDetector/InDetConditions/InDetByteStreamErrors.* + InnerDetector/InDetConditions/InDetCond.* + InnerDetector/InDetConditions/SiPropertiesTool ++ InnerDetector/InDetConditions/.*ConditionsAlgorithms + InnerDetector/InDetConditions/.*ConditionsData + InnerDetector/InDetConditions/.*ConditionsServices + InnerDetector/InDetConditions/.*ConditionsTools ++ InnerDetector/InDetConditions/TRT_ConditionsAlgs + InnerDetector/InDetConditions/TRT_ConditionsNN + InnerDetector/InDetConfig - InnerDetector/InDetDetDescr/BCMPrimeReadoutGeometry @@ -151,7 +160,9 @@ + InnerDetector/InDetDetDescr/.*Cabling + InnerDetector/InDetDetDescr/.*GeoModel + InnerDetector/InDetDetDescr/.*ReadoutGeometry ++ InnerDetector/InDetDetDescr/PixelGeoModelXml + InnerDetector/InDetDetDescr/PixelReadoutDefinitions ++ InnerDetector/InDetDetDescr/StripGeoModelXml + InnerDetector/InDetDetDescrCnv/.* + InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD + InnerDetector/InDetExample/InDetRecExample @@ -394,6 +405,7 @@ # Tool package(s). + Tools/ART ++ Tools/Campaigns + Tools/DirectIOART + Tools/LWHists + Tools/PathResolver