From 73cc0ba8973dec1881a53eec8b0a813eac45f19f Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 12 May 2016 11:50:11 +0200
Subject: [PATCH] 'Fix tests for cmake build.' (LArSimEventTPCnv-00-00-05)
* Tagging LArSimEventTPCnv-00-00-05.
* CMakeLists.txt: Fix tests for cmake build.
* Tagging LArSimEventTPCnv-00-00-04.
* Update reference files for changes in CaloIdentifier.
Former-commit-id: 2ea123d692ee0d4c32b1276fd59ac3bc7c825109
---
.../LArCnv/LArSimEventTPCnv/CMakeLists.txt | 6 ++++--
.../LArCnv/LArSimEventTPCnv/cmt/requirements | 1 +
.../share/LArHitContainerCnv_p2_test.ref | 12 +++---------
.../share/LArHitFloatContainerCnv_p2_test.ref | 12 +++---------
4 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/LArCalorimeter/LArCnv/LArSimEventTPCnv/CMakeLists.txt b/LArCalorimeter/LArCnv/LArSimEventTPCnv/CMakeLists.txt
index 8dcb72c5d1d..c2b3e8ef212 100644
--- a/LArCalorimeter/LArCnv/LArSimEventTPCnv/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArSimEventTPCnv/CMakeLists.txt
@@ -56,7 +56,8 @@ atlas_add_test( LArHitContainerCnv_p2_test
SOURCES
test/LArHitContainerCnv_p2_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib LArSimEvent TestTools CaloIdentifier AthenaKernel StoreGateLib SGtests IdDictParser Identifier EventCommonTPCnv LArSimEventTPCnv )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib LArSimEvent TestTools CaloIdentifier AthenaKernel StoreGateLib SGtests IdDictParser Identifier EventCommonTPCnv LArSimEventTPCnv
+ ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
atlas_add_test( LArHitFloatCnv_p1_test
SOURCES
@@ -68,5 +69,6 @@ atlas_add_test( LArHitFloatContainerCnv_p2_test
SOURCES
test/LArHitFloatContainerCnv_p2_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib LArSimEvent TestTools CaloIdentifier AthenaKernel StoreGateLib SGtests IdDictParser Identifier EventCommonTPCnv LArSimEventTPCnv )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib LArSimEvent TestTools CaloIdentifier AthenaKernel StoreGateLib SGtests IdDictParser Identifier EventCommonTPCnv LArSimEventTPCnv
+ ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
diff --git a/LArCalorimeter/LArCnv/LArSimEventTPCnv/cmt/requirements b/LArCalorimeter/LArCnv/LArSimEventTPCnv/cmt/requirements
index c070b203169..e0f6e1ec479 100644
--- a/LArCalorimeter/LArCnv/LArSimEventTPCnv/cmt/requirements
+++ b/LArCalorimeter/LArCnv/LArSimEventTPCnv/cmt/requirements
@@ -31,3 +31,4 @@ apply_pattern UnitTest_run unit_test=LArHitContainerCnv_p1
apply_pattern UnitTest_run unit_test=LArHitContainerCnv_p2
apply_pattern UnitTest_run unit_test=LArHitFloatCnv_p1
apply_pattern UnitTest_run unit_test=LArHitFloatContainerCnv_p2
+
diff --git a/LArCalorimeter/LArCnv/LArSimEventTPCnv/share/LArHitContainerCnv_p2_test.ref b/LArCalorimeter/LArCnv/LArSimEventTPCnv/share/LArHitContainerCnv_p2_test.ref
index ce18e40efcb..b4242a3240c 100644
--- a/LArCalorimeter/LArCnv/LArSimEventTPCnv/share/LArHitContainerCnv_p2_test.ref
+++ b/LArCalorimeter/LArCnv/LArSimEventTPCnv/share/LArHitContainerCnv_p2_test.ref
@@ -6,13 +6,13 @@ JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/Detec
JobOptionsSvc INFO Job options successfully read in from ../share/DetStoreTest_jobOptions.txt
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
- running on karma on Mon Mar 7 12:41:43 2016
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Wed May 11 11:46:22 2016
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
DetectorStore INFO Initializing DetectorStore - package version StoreGate-00-00-00
ClassIDSvc INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 1121 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1238 CLIDRegistry entries for module ALL
ProxyProviderSvc INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
@@ -37,8 +37,6 @@ is-slar decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 ffff
LArEM_Base_ID::initialize_from_dict :
region range -> 4/1/-1,1/0/0 | 4/1/-1,1/1/0 | 4/1/-1,1/1/1 | 4/1/-1,1/2/0 | 4/1/-1,1/2/1 | 4/1/-1,1/3/0 | 4/1/-2,2/0/0 | 4/1/-2,2/1/0 | 4/1/-2,2/1/1 | 4/1/-2,2/1/2 | 4/1/-2,2/1/3 | 4/1/-2,2/1/4 | 4/1/-2,2/1/5 | 4/1/-2,2/2/0 | 4/1/-2,2/2/1 | 4/1/-2,2/3/0 | 4/1/-3,3/1/0 | 4/1/-3,3/2/0
channel range -> 4/1/-1,1/0/0/0:60/0:63/0 | 4/1/-1,1/1/0/1:447/0:63/0 | 4/1/-1,1/1/1/0:2/0:255/0 | 4/1/-1,1/2/0/0:55/0:255/0 | 4/1/-1,1/2/1/0/0:255/0 | 4/1/-1,1/3/0/0:26/0:255/0 | 4/1/-2,2/0/0/0:11/0:63/0 | 4/1/-2,2/1/0/0/0:63/0 | 4/1/-2,2/1/1/0:2/0:63/0 | 4/1/-2,2/1/2/0:95/0:63/0 | 4/1/-2,2/1/3/0:47/0:63/0 | 4/1/-2,2/1/4/0:63/0:63/0 | 4/1/-2,2/1/5/0:3/0:63/0 | 4/1/-2,2/2/0/0/0:255/0 | 4/1/-2,2/2/1/0:42/0:255/0 | 4/1/-2,2/3/0/0:19/0:255/0 | 4/1/-3,3/1/0/0:6/0:63/0 | 4/1/-3,3/2/0/0:6/0:63/0
- disconected region range -> 4/-1/-1,1/0/0 | 4/-1/-1,1/1/0 | 4/-1/-1,1/3/0 | 4/-1/-2,2/0/0 | 4/-1/-2,2/1/1 | 4/-1/-2,2/1/3 | 4/-1/-2,2/1/5 | 4/-1/-3,3/1/0 | 4/-1/-3,3/2/0
- disconnected channel range -> 4/-1/-1,1/0/0/61:63/0:63 | 4/-1/-1,1/1/0/0/0:63 | 4/-1/-1,1/3/0/27/0:255 | 4/-1/-2,2/0/0/12:19/0:63 | 4/-1/-2,2/1/1/3:6/0:63 | 4/-1/-2,2/1/3/48:63/0:63 | 4/-1/-2,2/1/5/4:7/0:63 | 4/-1/-3,3/1/0/7/0:63 | 4/-1/-3,3/2/0/7/0:63
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
@@ -57,8 +55,6 @@ is-slar decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 ffff
initialize_from_dict :
channel range -> 4/2/-2,2/0/0/0:9/0:63/0 | 4/2/-2,2/1/0/0:9/0:63/0 | 4/2/-2,2/2/0/1:9/0:63/0 | 4/2/-2,2/3/0/2:9/0:63/0 | 4/2/-2,2/0/1/0:3/0:31/0 | 4/2/-2,2/1/1/0:2/0:31/0 | 4/2/-2,2/2/1/0:2/0:31/0 | 4/2/-2,2/3/1/0:3/0:31/0
region range -> 4/2/-2,2/0/0 | 4/2/-2,2/1/0 | 4/2/-2,2/2/0 | 4/2/-2,2/3/0 | 4/2/-2,2/0/1 | 4/2/-2,2/1/1 | 4/2/-2,2/2/1 | 4/2/-2,2/3/1
- disconnected channel range -> 4/-2/-2,2/2/0/0/0:63 | 4/-2/-2,2/3/0/0:1/0:63 | 4/-2/-2,2/1/1/3/0:31 | 4/-2/-2,2/2/1/3/0:31
- disconnected region range -> 4/-2/-2,2/2/0 | 4/-2/-2,2/3/0 | 4/-2/-2,2/1/1 | 4/-2/-2,2/2/1
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
@@ -76,8 +72,6 @@ is-slar decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 ffff
initialize_from_dict :
channel range -> 4/3/-2,2/1/0:62/0:15/0 | 4/3/-2,2/2/0:29/0,7,8,15/0 | 4/3/-2,2/2/0:30/3,4,11,12/0 | 4/3/-2,2/2/0:31/1,2,5,6,9,10,13,14/0 | 4/3/-2,2/3/0:14/2,10/0 | 4/3/-2,2/3/0:14/0,1,3,4,5,6,7,8,9,11,12,13,14,15/0 | 4/3/-2,2/3/15/0,1,2,3,4,6,7,8,9,10,11,12,14,15/0
module range -> 4/3/-2,2/1 | 4/3/-2,2/2 | 4/3/-2,2/3
- disconnected channel range -> 4/-3/-2,2/1/63/0:15 | 4/-3/-2,2/2/30:31/0,7,8,15 | 4/-3/-2,2/2/31/3,4,11,12 | 4/-3/-2,2/3/15/5,13
- disconnected module range -> 4/-3/-2,2/1 | 4/-3/-2,2/2 | 4/-3/-2,2/3
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
diff --git a/LArCalorimeter/LArCnv/LArSimEventTPCnv/share/LArHitFloatContainerCnv_p2_test.ref b/LArCalorimeter/LArCnv/LArSimEventTPCnv/share/LArHitFloatContainerCnv_p2_test.ref
index 9c262f84fe5..282430eb5e5 100644
--- a/LArCalorimeter/LArCnv/LArSimEventTPCnv/share/LArHitFloatContainerCnv_p2_test.ref
+++ b/LArCalorimeter/LArCnv/LArSimEventTPCnv/share/LArHitFloatContainerCnv_p2_test.ref
@@ -6,13 +6,13 @@ JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/Detec
JobOptionsSvc INFO Job options successfully read in from ../share/DetStoreTest_jobOptions.txt
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v999r999)
- running on karma on Mon Mar 7 12:59:10 2016
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Wed May 11 11:45:18 2016
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
DetectorStore INFO Initializing DetectorStore - package version StoreGate-00-00-00
ClassIDSvc INFO Initializing ClassIDSvc - package version CLIDComps-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 1121 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1238 CLIDRegistry entries for module ALL
ProxyProviderSvc INFO Initializing ProxyProviderSvc - package version SGComps-00-00-00
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
@@ -37,8 +37,6 @@ is-slar decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 ffff
LArEM_Base_ID::initialize_from_dict :
region range -> 4/1/-1,1/0/0 | 4/1/-1,1/1/0 | 4/1/-1,1/1/1 | 4/1/-1,1/2/0 | 4/1/-1,1/2/1 | 4/1/-1,1/3/0 | 4/1/-2,2/0/0 | 4/1/-2,2/1/0 | 4/1/-2,2/1/1 | 4/1/-2,2/1/2 | 4/1/-2,2/1/3 | 4/1/-2,2/1/4 | 4/1/-2,2/1/5 | 4/1/-2,2/2/0 | 4/1/-2,2/2/1 | 4/1/-2,2/3/0 | 4/1/-3,3/1/0 | 4/1/-3,3/2/0
channel range -> 4/1/-1,1/0/0/0:60/0:63/0 | 4/1/-1,1/1/0/1:447/0:63/0 | 4/1/-1,1/1/1/0:2/0:255/0 | 4/1/-1,1/2/0/0:55/0:255/0 | 4/1/-1,1/2/1/0/0:255/0 | 4/1/-1,1/3/0/0:26/0:255/0 | 4/1/-2,2/0/0/0:11/0:63/0 | 4/1/-2,2/1/0/0/0:63/0 | 4/1/-2,2/1/1/0:2/0:63/0 | 4/1/-2,2/1/2/0:95/0:63/0 | 4/1/-2,2/1/3/0:47/0:63/0 | 4/1/-2,2/1/4/0:63/0:63/0 | 4/1/-2,2/1/5/0:3/0:63/0 | 4/1/-2,2/2/0/0/0:255/0 | 4/1/-2,2/2/1/0:42/0:255/0 | 4/1/-2,2/3/0/0:19/0:255/0 | 4/1/-3,3/1/0/0:6/0:63/0 | 4/1/-3,3/2/0/0:6/0:63/0
- disconected region range -> 4/-1/-1,1/0/0 | 4/-1/-1,1/1/0 | 4/-1/-1,1/3/0 | 4/-1/-2,2/0/0 | 4/-1/-2,2/1/1 | 4/-1/-2,2/1/3 | 4/-1/-2,2/1/5 | 4/-1/-3,3/1/0 | 4/-1/-3,3/2/0
- disconnected channel range -> 4/-1/-1,1/0/0/61:63/0:63 | 4/-1/-1,1/1/0/0/0:63 | 4/-1/-1,1/3/0/27/0:255 | 4/-1/-2,2/0/0/12:19/0:63 | 4/-1/-2,2/1/1/3:6/0:63 | 4/-1/-2,2/1/3/48:63/0:63 | 4/-1/-2,2/1/5/4:7/0:63 | 4/-1/-3,3/1/0/7/0:63 | 4/-1/-3,3/2/0/7/0:63
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
@@ -57,8 +55,6 @@ is-slar decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 ffff
initialize_from_dict :
channel range -> 4/2/-2,2/0/0/0:9/0:63/0 | 4/2/-2,2/1/0/0:9/0:63/0 | 4/2/-2,2/2/0/1:9/0:63/0 | 4/2/-2,2/3/0/2:9/0:63/0 | 4/2/-2,2/0/1/0:3/0:31/0 | 4/2/-2,2/1/1/0:2/0:31/0 | 4/2/-2,2/2/1/0:2/0:31/0 | 4/2/-2,2/3/1/0:3/0:31/0
region range -> 4/2/-2,2/0/0 | 4/2/-2,2/1/0 | 4/2/-2,2/2/0 | 4/2/-2,2/3/0 | 4/2/-2,2/0/1 | 4/2/-2,2/1/1 | 4/2/-2,2/2/1 | 4/2/-2,2/3/1
- disconnected channel range -> 4/-2/-2,2/2/0/0/0:63 | 4/-2/-2,2/3/0/0:1/0:63 | 4/-2/-2,2/1/1/3/0:31 | 4/-2/-2,2/2/1/3/0:31
- disconnected region range -> 4/-2/-2,2/2/0 | 4/-2/-2,2/3/0 | 4/-2/-2,2/1/1 | 4/-2/-2,2/2/1
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
@@ -76,8 +72,6 @@ is-slar decode 0 vals 0:1 mask/zero mask/shift/bits/offset 1 ffff
initialize_from_dict :
channel range -> 4/3/-2,2/1/0:62/0:15/0 | 4/3/-2,2/2/0:29/0,7,8,15/0 | 4/3/-2,2/2/0:30/3,4,11,12/0 | 4/3/-2,2/2/0:31/1,2,5,6,9,10,13,14/0 | 4/3/-2,2/3/0:14/2,10/0 | 4/3/-2,2/3/0:14/0,1,3,4,5,6,7,8,9,11,12,13,14,15/0 | 4/3/-2,2/3/15/0,1,2,3,4,6,7,8,9,10,11,12,14,15/0
module range -> 4/3/-2,2/1 | 4/3/-2,2/2 | 4/3/-2,2/3
- disconnected channel range -> 4/-3/-2,2/1/63/0:15 | 4/-3/-2,2/2/30:31/0,7,8,15 | 4/-3/-2,2/2/31/3,4,11,12 | 4/-3/-2,2/3/15/5,13
- disconnected module range -> 4/-3/-2,2/1 | 4/-3/-2,2/2 | 4/-3/-2,2/3
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
--
GitLab