From a365c99ecc1910009e1415e94b5ac70e53bd29a3 Mon Sep 17 00:00:00 2001
From: Vakhtang Tsulaia <Vakhtang.Tsulaia@cern.ch>
Date: Mon, 19 Dec 2016 23:35:12 +0100
Subject: [PATCH] Removing the workaround introduced in previous tag.
release_metadata() function was fixed in AthenaCommon-03-03-18
(AtlasGeoModel-00-03-51)
* Removing the workaround introduced in previous tag. release_metadata() function was fixed in AthenaCommon-03-03-18
* Tagging AtlasGeoModel-00-03-51
2016-12-05 scott snyder <snyder@bnl.gov>
* Tagging AtlasGeoModel-00-03-50.
* python/SetGeometryVersion.py: Workaround for running in a local
tree based on a MIG.
2016-10-27 John Chapman <John.Chapman@cern.ch>
* python/InDetGM.py: Add InDetServMatBuilderToolSLHC for
SCT_SLHC_DetectorTool, but not SCT_GMX_DetectorTool. ATLASSIM-3135
* AtlasGeoModel-00-03-49
* AtlasGeoModel-00-03-48
* AtlasGeoModel-00-03-47
2016-03-18 John Chapman <John.Chapman@cern.ch>
---
DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py | 2 +-
.../GeoModel/AtlasGeoModel/python/SetGeometryVersion.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py
index 41a65303e69..dbbaa823415 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py
@@ -56,8 +56,8 @@ elif ( DetFlags.detdescr.ID_on() ):
else:
from SCT_SLHC_GeoModel.SCT_SLHC_GeoModelConf import SCT_SLHC_DetectorTool
sctSLHCTool = SCT_SLHC_DetectorTool()
+ sctSLHCTool.ServiceBuilderTool = InDetServMatBuilderToolSLHC
GeoModelSvc.DetectorTools += [ sctSLHCTool ]
- sctSLHCTool.ServiceBuilderTool = InDetServMatBuilderToolSLHC
if not hasattr(svcMgr,'SCTLorentzAngleSvc'):
from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleSvc
SCTLorentzAngleSvc = SiLorentzAngleSvc(name = "SCTLorentzAngleSvc",
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py
index 88c751e24b3..4197881b70b 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py
@@ -50,9 +50,10 @@ else:
# Set the SupportedGeometry flag
from AthenaCommon.AppMgr import release_metadata
-relversion = release_metadata()['release'].split('.')
+rel_metadata = release_metadata()
+relversion = rel_metadata['release'].split('.')
if len(relversion) < 3:
- relversion = release_metadata()['base release'].split('.')
+ relversion = rel_metadata['base release'].split('.')
print "SetGeometryVersion.py obtained major release version %s" % relversion[0]
GeoModelSvc.SupportedGeometry = int(relversion[0])
--
GitLab