From bded2daca5a2d6d6826be0eabfd72871dd6a9757 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Mon, 4 Feb 2019 14:33:33 +0100
Subject: [PATCH] Add MuonConfig package to AthSimulation project
---
MuonSpectrometer/MuonConfig/CMakeLists.txt | 50 +++++++++++-----------
Projects/AthSimulation/package_filters.txt | 1 +
2 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/MuonSpectrometer/MuonConfig/CMakeLists.txt b/MuonSpectrometer/MuonConfig/CMakeLists.txt
index b5ec0f265af..75e9962eb28 100644
--- a/MuonSpectrometer/MuonConfig/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConfig/CMakeLists.txt
@@ -10,31 +10,33 @@ atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
atlas_install_data( share/*.ref )
-# Configure unit tests
-# Cache alignment will change depending on whether FRONTIER_SERVER is defined.
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest )
-atlas_add_test( MuonDataDecodeTest
- PROPERTIES TIMEOUT 1000
- PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest
- EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from|DEBUG Reconciled configuration"
- SCRIPT test/testMuonDataDecode.sh )
+if( NOT SIMULATIONBASE )
+ # Configure unit tests
+ # Cache alignment will change depending on whether FRONTIER_SERVER is defined.
+ file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest )
+ atlas_add_test( MuonDataDecodeTest
+ PROPERTIES TIMEOUT 1000
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest
+ EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from|DEBUG Reconciled configuration"
+ SCRIPT test/testMuonDataDecode.sh )
-# Adding an identical test for the ByteStream identifiable caches (and future RDO caches)
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache )
-atlas_add_test( MuonDataDecodeTest_Cache
- PROPERTIES TIMEOUT 1000
- PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache
- EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from"
- SCRIPT test/testMuonDataDecode_Cache.sh )
+ # Adding an identical test for the ByteStream identifiable caches (and future RDO caches)
+ file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache )
+ atlas_add_test( MuonDataDecodeTest_Cache
+ PROPERTIES TIMEOUT 1000
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache
+ EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from"
+ SCRIPT test/testMuonDataDecode_Cache.sh )
-atlas_add_test( MuonCablingConfigTest
- SCRIPT python -m MuonConfig.MuonCablingConfig
- POST_EXEC_SCRIPT nopost.sh )
+ atlas_add_test( MuonCablingConfigTest
+ SCRIPT python -m MuonConfig.MuonCablingConfig
+ POST_EXEC_SCRIPT nopost.sh )
-atlas_add_test( MuonReconstructionConfigTest
- SCRIPT python -m MuonConfig.MuonReconstructionConfig
- POST_EXEC_SCRIPT nopost.sh )
+ atlas_add_test( MuonReconstructionConfigTest
+ SCRIPT python -m MuonConfig.MuonReconstructionConfig
+ POST_EXEC_SCRIPT nopost.sh )
-atlas_add_test( MuonSegmentFindingConfigTest
- SCRIPT python -m MuonConfig.MuonSegmentFindingConfig
- POST_EXEC_SCRIPT nopost.sh )
+ atlas_add_test( MuonSegmentFindingConfigTest
+ SCRIPT python -m MuonConfig.MuonSegmentFindingConfig
+ POST_EXEC_SCRIPT nopost.sh )
+endif()
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 6f692506e4b..01d13cfba1f 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -237,6 +237,7 @@
+ MuonSpectrometer/MuonCnv/MuonIdCnv
+ MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool
+ MuonSpectrometer/MuonCnv/MuonSimEventTPCnv
++ MuonSpectrometer/MuonConfig
+ MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
+ MuonSpectrometer/MuonDetDescr/MuonAGDD
+ MuonSpectrometer/MuonDetDescr/MuonAGDDBase
--
GitLab