diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/README b/DetectorDescription/GeoModel/AtlasGeoModel/README
new file mode 100755
index 0000000000000000000000000000000000000000..b4b8430814e352a006cfe170ae69569fbb72eede
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/README
@@ -0,0 +1,63 @@
+General Usage notes.
+===================
+
+To initialize the geometry simply put in your joboptions:
+
+ DetDescrVersion = "DC2" # or "Rome-Initial" or "CTB"
+ include( "AtlasGeoModel/SetGeometryVersion.py" )
+ include( "AtlasGeoModel/GeoModelInit.py" )
+
+There are other possibilities for the values of DetDescrVersion.
+See SetGeometryVersion.py to see full list of values that the
+DetDescrVersion variable can have.
+
+You can turn off detectors using DetFlags. The scripts also look at GlobalFlags
+to determine if it is CTB or DC1 geometries which require special
+treatment (they still have NOVA dependencies and CTB uses different libraries)
+As long as these flags are set correctly the correct geometry should be
+loaded.
+
+
+Job option fragments for GeoModel detector description.
+======================================================
+
+GeoModelInit.py Initializes GeoModel. Loads GeoModelSvc.
+ Also Nova for DC1 and CTB geometries.
+
+SetGeometryVersion.py Sets the appropriate Geometry tags based
+ on the variable DetDescrVersion. In the
+ future this will not be needed for
+ reconstruction as the geometry version will
+ be determined from the POOL file or CondDB.
+ The script also sets a few other items not
+ yet controlled by the database, but these
+ are in the process of being put in the database.
+
+
+The following job options are used by the above. Users do not need to call
+them directly. Users can turn off detectors using DetFlags.
+
+GeoModelInitStandard.py Standard initialization.
+GeoModelInitDC1.py Initialization for DC1.
+GeoModelInitCTB.py Initialization fro CTB.
+
+InDetGeoModel.py Inner Detector Det Descr.
+MuonGeoModel.py Muon Det Descr
+LArGeoModel.py LAr Det Descr
+TileGeoModel.py Tile Det Descr
+MiscGeoModel.py Other Det Descr. Contains beam pipe.
+
+InDetGeoModelCTB.py Inner Detector CTB Descr.
+MuonGeoModelCTB.py Muon CTB Descr
+TileGeoModelCTB.py Tile CTB Descr
+
+
+Graphics
+========
+GeoModelGraphics.py Graphics display of all ATLAS (or CTB)
+GeoModelGraphicsCTB.py Graphics display of CTB
+
+
+
+
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/cmt/requirements b/DetectorDescription/GeoModel/AtlasGeoModel/cmt/requirements
new file mode 100755
index 0000000000000000000000000000000000000000..f7a251336a2494692312a44e7cf0be6558694287
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/cmt/requirements
@@ -0,0 +1,11 @@
+package AtlasGeoModel
+
+
+author Joe Boudreau
+
+use AtlasPolicy AtlasPolicy-*
+
+
+apply_pattern declare_joboptions files="*.py"
+apply_pattern declare_python_modules files="*.py"
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/doc/mainpage.h b/DetectorDescription/GeoModel/AtlasGeoModel/doc/mainpage.h
new file mode 100755
index 0000000000000000000000000000000000000000..865ee9991e1d76203335abef48b47fed5c7bdb20
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/doc/mainpage.h
@@ -0,0 +1,94 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+
+@mainpage AtlasGeoModel Package
+
+@authors Grant Gorfine, Vakho Tsulaia, Joe Boudreau
+
+@section AtlasGeoModelIntro Introduction
+
+
+This package contains scripts to initialize the GeoModel Detector Description.
+For the migration to Configurables a new python module has been created. All clients
+of AtlasGeoModel package are requested to switch to the scripts in this python module.
+Old python scripts in the share directory have been declared obsolete.
+
+@section AtlasGeoModelUsage General Usage Notes.
+
+To initialize the geometry simply put in your joboptions:
+
+@verbatim
+ from AthenaCommon.GlobalFlags import globalflags
+ globalflags.DetDescrVersion = "ATLAS-CSC-02-00-00"
+ from AtlasGeoModel import SetGeometryVersion
+ from AtlasGeoModel import GeoModelInit
+@endverbatim
+
+There are other possibilities for the values of DetDescrVersion.
+See SetGeometryVersion.py in the python module of this package in order to see full list of values that the
+DetDescrVersion flag can have.
+
+You can turn off detectors using DetFlags. For example
+
+@verbatim
+from AthenaCommon.DetFlags import DetFlags
+# NB. Flags are off by default.
+#DetFlags.detdescr.all_setOn()
+DetFlags.detdescr.ID_setOn()
+DetFlags.detdescr.Muon_setOff()
+DetFlags.detdescr.LAr_setOff()
+DetFlags.detdescr.Tile_setOff()
+@endverbatim
+
+
+The scripts also look at GlobalFlags
+to determine if it is CTB or DC1 geometries which require special treatment.
+Normally these are already set if you are using ReExCommon or RecExTB.
+As long as these flags are set correctly the correct geometry should be
+loaded. If they are not already set you need to do:
+
+For CTB
+@verbatim
+from AthenaCommon.GlobalFlags import GlobalFlags
+GlobalFlags.DetGeo.set_ctbh8()
+@endverbatim
+
+For DC1
+@verbatim
+from AthenaCommon.GlobalFlags import GlobalFlags
+GlobalFlags.DetGeo.set_atlas()
+GlobalFlags.DataSource.set_geant3()
+@endverbatim
+
+@section AtlasGeoModelJobOptions Job Options
+
+ - GeoModelInit.py: Initializes GeoModel. Loads GeoModelSvc.
+
+ - SetGeometryVersion.py: Sets the appropriate Geometry tags based
+ on the DetDescrVersion flag. In the
+ future this will not be needed for
+ reconstruction as the geometry version will
+ be determined from the POOL file or CondDB.
+
+The following job options are used by the above. Users do not need to call
+them directly. Users can turn off detectors using DetFlags.
+
+ - GeoModelInitStandard.py: Standard initialization.
+ - GeoModelInitDC1.py: Initialization for DC1.
+ - GeoModelInitCTB.py: Initialization fro CTB.
+ - GeoModelInitH6.py: Initialization of H6 TestBeam configurations
+
+ - InDetGM.py: Inner Detector Det Descr.
+ - MuonGM.py: Muon Det Descr
+ - LArGM.py: LAr Det Descr
+ - TileGM.py: Tile Det Descr
+ - MiscGM.py: Other Det Descr. Contains beam pipe.
+
+ - InDetGMCTB.py: Inner Detector CTB Descr.
+ - TileGMCTB.py: Tile CTB Descr
+
+
+*/
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/Agdd2Geo.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/Agdd2Geo.py
new file mode 100644
index 0000000000000000000000000000000000000000..09af2ba42038f80dfa7c442376612906a52cf78e
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/Agdd2Geo.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.DetFlags import DetFlags
+
+if ( DetFlags.detdescr.Muon_on() ):
+ from AthenaCommon.AppMgr import ServiceMgr
+ from AthenaCommon.AppMgr import theApp
+ from AGDD2Geo.AGDD2GeoConf import AGDD2GeoSvc
+ agdd2GeoSvc = AGDD2GeoSvc()
+ agdd2GeoSvc.Locked = True
+ theApp.CreateSvc += ["AGDD2GeoSvc"]
+ ServiceMgr += agdd2GeoSvc
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/ForDetGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/ForDetGM.py
new file mode 100755
index 0000000000000000000000000000000000000000..06e7eadb9d85556b5ab8d5469535936f257d7082
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/ForDetGM.py
@@ -0,0 +1,34 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# This contains Forward Detectors
+#
+from AthenaCommon.DetFlags import DetFlags
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+GeoModelSvc = GeoModelSvc()
+
+# LUCID
+if ( DetFlags.detdescr.Lucid_on() ):
+ from LUCID_GeoModel.LUCID_GeoModelConf import LUCID_DetectorTool
+ GeoModelSvc.DetectorTools += [ LUCID_DetectorTool() ]
+
+# ALFA
+if ( DetFlags.detdescr.ALFA_on() ):
+ from ALFA_GeoModel.ALFA_GeoModel_joboption import getALFA_DetectorTool
+ #from ALFA_GeoModel.ALFA_GeoModelConf import ALFA_DetectorTool
+ GeoModelSvc.DetectorTools += [ getALFA_DetectorTool() ]
+
+# ForwardRegion
+if ( DetFlags.detdescr.FwdRegion_on() ):
+ from ForwardRegionGeoModel.ForwardRegionGeoModelConf import ForwardRegionGeoModelTool
+ GeoModelSvc.DetectorTools += [ ForwardRegionGeoModelTool() ]
+
+# ZDC
+if ( DetFlags.detdescr.ZDC_on() ):
+ from ZDC_GeoM.ZDC_GeoMConf import ZDC_DetTool
+ GeoModelSvc.DetectorTools += [ ZDC_DetTool() ]
+
+# AFP
+if ( DetFlags.detdescr.AFP_on() ):
+ from AFP_GeoModel.AFP_GeoModelConf import AFP_GeoModelTool
+ GeoModelSvc.DetectorTools += [ AFP_GeoModelTool() ]
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py
new file mode 100755
index 0000000000000000000000000000000000000000..5dc34576c0c99de5569ce31d0434ddf1574b25d7
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInit.py
@@ -0,0 +1,35 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+## @file: AtlasGeoModel/python/GeoModelInit.py
+## @purpose: encapsulate GeoModel configuration
+
+def _setupGeoModel():
+ from AthenaCommon.JobProperties import jobproperties
+ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+
+ import DetDescrCnvSvc.DetStoreConfig
+ svcMgr.DetDescrCnvSvc.IdDictFromRDB = True
+
+ # Conditions DB setup and TagInfo
+ from IOVDbSvc.CondDB import conddb
+ import EventInfoMgt.EventInfoMgtInit
+
+ if ( jobproperties.Global.DataSource() == "geant3" ):
+ from AtlasGeoModel import GeoModelInitDC1
+
+ elif ( jobproperties.Global.DetGeo() == "ctbh8" ):
+ from AtlasGeoModel import GeoModelInitCTB
+
+ elif ( jobproperties.Global.DetGeo() == "ctbh6" ):
+ from AtlasGeoModel import GeoModelInitH6
+
+ else:
+ from AtlasGeoModel import GeoModelInitStandard
+
+ pass
+
+## setup GeoModel at module import
+_setupGeoModel()
+
+## clean-up: avoid running multiple times this method
+del _setupGeoModel
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitCTB.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitCTB.py
new file mode 100755
index 0000000000000000000000000000000000000000..ea3c08786ab2e786f1d85fe69193fa5639ae139b
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitCTB.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.AppMgr import ServiceMgr
+from AthenaCommon.AppMgr import theApp
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ServiceMgr += GeoModelSvc()
+theApp.CreateSvc += [ "GeoModelSvc"]
+
+from AtlasGeoModel import InDetGMCTB
+from AtlasGeoModel import TileGMCTB
+from AtlasGeoModel import LArGM
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitDC1.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitDC1.py
new file mode 100755
index 0000000000000000000000000000000000000000..e8cc398862643c1469d75ee8c75c11809ae435ba
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitDC1.py
@@ -0,0 +1,11 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.AppMgr import ServiceMgr
+from AthenaCommon.AppMgr import theApp
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ServiceMgr += GeoModelSvc()
+theApp.CreateSvc += [ "GeoModelSvc"]
+
+from AtlasGeoModel import InDetGM
+from AtlasGeoModel import MuonGM
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitH6.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitH6.py
new file mode 100644
index 0000000000000000000000000000000000000000..48d019513292d16cc1785cfcb1f03faa647c3e36
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitH6.py
@@ -0,0 +1,38 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.AppMgr import ServiceMgr
+from AthenaCommon.AppMgr import theApp
+from G4AtlasApps.SimFlags import SimFlags
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ServiceMgr += GeoModelSvc()
+theApp.CreateSvc += [ "GeoModelSvc"]
+GeoModelSvc=GeoModelSvc()
+
+if (SimFlags.SimLayout.get_Value()=="tb_LArH6_2002"):
+ from LArGeoH62002Algs.LArGeoH62002AlgsConf import LArDetectorToolH62002
+ GeoModelSvc.DetectorTools += [ LArDetectorToolH62002() ]
+
+elif (SimFlags.SimLayout.get_Value()=="tb_LArH6EC_2002"):
+ from LArGeoTBEC.LArGeoTBECConf import LArDetectorToolTBEC
+ GeoModelSvc.DetectorTools += [ LArDetectorToolTBEC() ]
+
+elif (SimFlags.SimLayout.get_Value()=="tb_LArH6_2003"):
+ from LArGeoH62003Algs.LArGeoH62003AlgsConf import LArDetectorToolH62003
+ GeoModelSvc.DetectorTools += [ LArDetectorToolH62003() ]
+
+elif (SimFlags.SimLayout.get_Value()=="tb_LArH6_2004"):
+ from LArGeoH62004Algs.LArGeoH62004AlgsConf import LArDetectorToolH62004
+ LArDetTool = LArDetectorToolH62004()
+ LArDetTool.XCryoPos = SimFlags.LArTB_H1CryoXPos.get_Value()
+ LArDetTool.YTablePos = SimFlags.LArTB_H1TableYPos.get_Value()
+ LArDetTool.isRun1 = SimFlags.LArTB_H6Run1.get_Value()
+ LArDetTool.isEmec = SimFlags.LArTB_H6Emec.get_Value()
+ LArDetTool.isHec = SimFlags.LArTB_H6Hec.get_Value()
+ LArDetTool.isFcal = SimFlags.LArTB_H6Fcal.get_Value()
+ LArDetTool.isColdnose = SimFlags.LArTB_H6Coldnose.get_Value()
+ GeoModelSvc.DetectorTools += [ LArDetTool ]
+
+
+# as long as not created anywhere else in GeoModel :
+from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitStandard.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitStandard.py
new file mode 100755
index 0000000000000000000000000000000000000000..9bd604af9af019aa7499f197c34ab93c0ff29e1a
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelInitStandard.py
@@ -0,0 +1,17 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.AppMgr import ServiceMgr
+from AthenaCommon.AppMgr import theApp
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ServiceMgr += GeoModelSvc()
+theApp.CreateSvc += [ "GeoModelSvc"]
+
+# Load the detectors. These job option fragments look at DetFlags
+from AtlasGeoModel import InDetGM
+from AtlasGeoModel import LArGM
+from AtlasGeoModel import TileGM
+from AtlasGeoModel import MuonGM
+from AtlasGeoModel import ForDetGM
+from AtlasGeoModel import MiscGM
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py
new file mode 100755
index 0000000000000000000000000000000000000000..87e9f05c010e8784f8c9c836dfe364af254bace5
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py
@@ -0,0 +1,96 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# InDet GeoModel initialization
+#
+from AthenaCommon.GlobalFlags import globalflags
+from AthenaCommon.JobProperties import jobproperties
+from AthenaCommon.DetFlags import DetFlags
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+
+if "ATLAS-SLHC" in globalflags.DetDescrVersion():
+ #SLHC specific code
+ from AthenaCommon.AppMgr import ToolSvc
+
+# Treat CTB separately
+if ( jobproperties.Global.DetGeo() == "ctbh8" or jobproperties.Global.DetGeo() == "ctbh6" ):
+ from AtlasGeoModel import InDetGMCTB
+
+elif ( DetFlags.detdescr.ID_on() ):
+ from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ GeoModelSvc = GeoModelSvc()
+
+ if not hasattr(svcMgr,'InDetGeometryDBSvc'):
+ from GeometryDBSvc.GeometryDBSvcConf import GeometryDBSvc
+ svcMgr+=GeometryDBSvc("InDetGeometryDBSvc")
+ if "ATLAS-SLHC" in globalflags.DetDescrVersion():
+ #SLHC specific code
+ # General service builder tool for SLHC
+ from InDetServMatGeoModel.InDetServMatGeoModelConf import InDetServMatBuilderToolSLHC
+ InDetServMatBuilderToolSLHC = InDetServMatBuilderToolSLHC()
+ ToolSvc+=InDetServMatBuilderToolSLHC
+
+ if ( DetFlags.detdescr.pixel_on() ):
+ from PixelGeoModel.PixelGeoModelConf import PixelDetectorTool
+ pixelTool = PixelDetectorTool()
+ GeoModelSvc.DetectorTools += [ pixelTool ]
+ if "ATLAS-SLHC" in globalflags.DetDescrVersion():
+ #SLHC specific code
+ pixelTool.ServiceBuilderTool = InDetServMatBuilderToolSLHC
+
+ if not hasattr(svcMgr,'PixelLorentzAngleSvc'):
+ from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleSvc
+ PixelLorentzAngleSvc = SiLorentzAngleSvc(name = "PixelLorentzAngleSvc",
+ SiConditionsServices = None,
+ UseMagFieldSvc = False,
+ DetectorName = "Pixel")
+ svcMgr+=PixelLorentzAngleSvc
+
+ if (DetFlags.detdescr.BCM_on() ) :
+ from AthenaCommon.AppMgr import ToolSvc
+ from BCM_GeoModel.BCM_GeoModelConf import InDetDD__BCM_Builder
+ bcmTool = InDetDD__BCM_Builder()
+ ToolSvc += bcmTool
+ pixelTool.BCM_Tool = bcmTool
+
+ from BLM_GeoModel.BLM_GeoModelConf import InDetDD__BLM_Builder
+ blmTool = InDetDD__BLM_Builder()
+ ToolSvc += blmTool
+ pixelTool.BLM_Tool = blmTool
+
+ if ( DetFlags.detdescr.SCT_on() ):
+ if "ATLAS-SLHC" in globalflags.DetDescrVersion():
+ #SLHC specific code
+ from SCT_SLHC_GeoModel.SCT_SLHC_GeoModelConf import SCT_SLHC_DetectorTool
+ sctSLHCTool = SCT_SLHC_DetectorTool()
+ GeoModelSvc.DetectorTools += [ sctSLHCTool ]
+ sctSLHCTool.ServiceBuilderTool = InDetServMatBuilderToolSLHC
+ else:
+ # Current atlas specific code
+ from SCT_GeoModel.SCT_GeoModelConf import SCT_DetectorTool
+ GeoModelSvc.DetectorTools += [ SCT_DetectorTool() ]
+
+ if not hasattr(svcMgr,'SCTLorentzAngleSvc'):
+ from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleSvc
+ SCTLorentzAngleSvc = SiLorentzAngleSvc(name = "SCTLorentzAngleSvc",
+ SiConditionsServices = None,
+ UseMagFieldSvc = False,
+ DetectorName = "SCT")
+ svcMgr+=SCTLorentzAngleSvc
+
+ if ( DetFlags.detdescr.TRT_on() ):
+ from TRT_GeoModel.TRT_GeoModelConf import TRT_DetectorTool
+ GeoModelSvc.DetectorTools += [ TRT_DetectorTool() ]
+
+ from InDetServMatGeoModel.InDetServMatGeoModelConf import InDetServMatTool
+ if "ATLAS-SLHC" in globalflags.DetDescrVersion():
+ #SLHC specific code
+ servMatTool = InDetServMatTool()
+ GeoModelSvc.DetectorTools += [ servMatTool ]
+ servMatTool.ServiceBuilderTool = InDetServMatBuilderToolSLHC
+ else:
+ GeoModelSvc.DetectorTools += [ InDetServMatTool() ]
+
+ # Make alignable
+ from InDetCondFolders import InDetAlignFolders
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMCTB.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMCTB.py
new file mode 100755
index 0000000000000000000000000000000000000000..15007f606ce3f5db8c95817f07fea4665ef5e098
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMCTB.py
@@ -0,0 +1,24 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# InDet GeoModel initialization for CTB
+#
+
+from AthenaCommon.DetFlags import DetFlags
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+GeoModelSvc = GeoModelSvc()
+
+if ( DetFlags.detdescr.pixel_on()):
+ from PixelTestBeamDetDescr.PixelTestBeamDetDescrConf import PixelTBDetectorTool
+ GeoModelSvc.DetectorTools += [ PixelTBDetectorTool() ]
+
+if ( DetFlags.detdescr.SCT_on()):
+ from SCT_TestBeamDetDescr.SCT_TestBeamDetDescrConf import SCT_TBDetectorTool
+ GeoModelSvc.DetectorTools += [ SCT_TBDetectorTool() ]
+
+if ( DetFlags.detdescr.TRT_on()):
+ from TRT_TestBeamDetDescr.TRT_TestBeamDetDescrConf import TRT_TBDetectorTool
+ GeoModelSvc.DetectorTools += [ TRT_TBDetectorTool() ]
+
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/LArGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/LArGM.py
new file mode 100755
index 0000000000000000000000000000000000000000..853df4b8f2a57efbcd082d9a3544236197e51e05
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/LArGM.py
@@ -0,0 +1,23 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# LAr GeoModel initialization
+#
+from AthenaCommon.JobProperties import jobproperties
+from AthenaCommon.DetFlags import DetFlags
+
+if ( DetFlags.detdescr.LAr_on() ):
+ from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ GeoModelSvc = GeoModelSvc()
+
+ from LArGeoAlgsNV.LArGeoAlgsNVConf import LArDetectorToolNV
+ GeoModelSvc.DetectorTools += [ LArDetectorToolNV() ]
+
+ # as long as not created anywhere else in GeoModel :
+ from CaloDetMgrDetDescrCnv import CaloDetMgrDDCnv
+
+ # apply possible alignments
+ if ( jobproperties.Global.DetGeo() == "atlas" or
+ jobproperties.Global.DetGeo() == "commis" ):
+ from LArConditionsCommon import LArAlignable
+ GeoModelSvc.DetectorTools[ "LArDetectorToolNV" ].ApplyAlignments = True
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/MiscGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/MiscGM.py
new file mode 100755
index 0000000000000000000000000000000000000000..3a4173686123206f83a4b0dff5e4119c1c0fd617
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/MiscGM.py
@@ -0,0 +1,14 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# This contains material with no specific home:
+#
+from AthenaCommon.DetFlags import DetFlags
+
+if ( DetFlags.detdescr.ID_on() ):
+ from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ GeoModelSvc = GeoModelSvc()
+
+ from BeamPipeGeoModel.BeamPipeGeoModelConf import BeamPipeDetectorTool
+ GeoModelSvc.DetectorTools += [ BeamPipeDetectorTool() ]
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py
new file mode 100755
index 0000000000000000000000000000000000000000..6677d41824aa5d8b7b6eaecc6c6dd94688ae0867
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.JobProperties import jobproperties
+from AthenaCommon.DetFlags import DetFlags
+
+if ( jobproperties.Global.DetGeo() == "ctbh8" or jobproperties.Global.DetGeo() == "ctbh6" ):
+ print " CTB layout for Muon Spectrometer is not supported anymore"
+
+elif ( DetFlags.detdescr.Muon_on() ):
+ from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ GeoModelSvc = GeoModelSvc()
+
+ from MuonGeoModel.MuonGeoModelConf import MuonDetectorTool
+ GeoModelSvc.DetectorTools += [ MuonDetectorTool() ]
+ GeoModelSvc.DetectorTools[ "MuonDetectorTool" ].BuildFromNova = 0
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py
new file mode 100755
index 0000000000000000000000000000000000000000..06e3e3bc2584672af1404705b5674e3f21d516d3
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/SetGeometryVersion.py
@@ -0,0 +1,120 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.JobProperties import jobproperties
+from AthenaCommon.DetFlags import DetFlags
+
+DDversion = jobproperties.Global.DetDescrVersion()
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+from DetDescrCnvSvc.DetDescrCnvSvcConf import DetDescrCnvSvc
+
+GeoModelSvc = GeoModelSvc()
+DetDescrCnvSvc = DetDescrCnvSvc()
+
+DataSrc = jobproperties.Global.DataSource()
+DGeo = jobproperties.Global.DetGeo()
+
+if (DataSrc == "geant3"):
+ DDversion = "DC1"
+
+if (DGeo == "ctbh8"):
+ DDversion = "CTB"
+
+if (DDversion == "DC2" or DDversion == "DC2-Final"):
+ GeoModelSvc.AtlasVersion = "ATLAS-DC2-00"
+
+ DetDescrCnvSvc.IdDictGlobalTag = "final_layout"
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_P.03.xml"
+
+elif (DDversion == "DC2-Initial"):
+ GeoModelSvc.AtlasVersion = "ATLAS-DC2-00"
+ if (DetFlags.ID_on()):
+ GeoModelSvc.InDetVersionOverride = "InnerDetector-DC2-Initial-00"
+
+ DetDescrCnvSvc.IdDictGlobalTag = "initial_layout"
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_P.03.xml"
+
+elif (DDversion == "Rome-Initial"):
+ GeoModelSvc.AtlasVersion = "ATLAS-Rome-Initial-02"
+
+ DetDescrCnvSvc.IdDictGlobalTag = "initial_layout"
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_Q.02.xml"
+
+elif (DDversion == "Rome-Initial-v00"):
+ GeoModelSvc.AtlasVersion = "ATLAS-Rome-Initial-01"
+
+ DetDescrCnvSvc.IdDictGlobalTag = "initial_layout"
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_Q.02.xml"
+
+elif (DDversion == "Rome-Final"):
+ GeoModelSvc.AtlasVersion = "ATLAS-Rome-Final-00"
+
+ DetDescrCnvSvc.IdDictGlobalTag = "final_layout"
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_Q.02.xml"
+
+elif (DDversion == "DC1"):
+ GeoModelSvc.AtlasVersion = "ATLAS-DC2-00"
+ if (DetFlags.ID_on()):
+ GeoModelSvc.InDetVersionOverride = "InnerDetector-DC1-00"
+
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_P.03.xml"
+
+elif (DDversion == "DC1-Initial"):
+ GeoModelSvc.AtlasVersion = "ATLAS-DC2-00"
+ if (DetFlags.ID_on()):
+ GeoModelSvc.InDetVersionOverride = "InnerDetector-DC1-Initial-00"
+
+ DetDescrCnvSvc.IdDictGlobalTag = "initial_layout"
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_P.03.xml"
+
+elif (DDversion == "DC1-Final"):
+ GeoModelSvc.AtlasVersion = "ATLAS-DC2-00"
+ if (DetFlags.ID_on()):
+ GeoModelSvc.InDetVersionOverride = "InnerDetector-DC1-Final-00"
+
+ DetDescrCnvSvc.IdDictGlobalTag = "final_layout"
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_P.03.xml"
+
+elif (DDversion == "CTB"):
+ GeoModelSvc.AtlasVersion = "ATLAS-CTB-00"
+ if (DetFlags.Tile_on()):
+ GeoModelSvc.TileVersionOverride = "TileTB-3B-00"
+
+ DetDescrCnvSvc.InDetIDFileName="IdDictParser/IdDictInnerDetector_CTB2004.xml"
+ DetDescrCnvSvc.MuonIDFileName = "IdDictMuonSpectrometer_H8_2004.xml"
+
+elif (DDversion == "Commissioning-Calo"):
+ GeoModelSvc.AtlasVersion = "ATLAS-Commissioning-Calo-00"
+ DetFlags.ID_setOff()
+ DetFlags.Calo_setOn()
+ DetFlags.Muon_setOff()
+
+elif (DDversion == "Commissioning-Muon"):
+ GeoModelSvc.AtlasVersion = "ATLAS-Commissioning-Muon-00"
+ DetFlags.ID_setOff()
+ DetFlags.Calo_setOff()
+ DetFlags.Muon_setOn()
+
+elif (DDversion == "ATLAS-H6-2004-00"):
+ GeoModelSvc.AtlasVersion = "ATLAS-H6-2004-00"
+ DetFlags.ID_setOff()
+ DetFlags.Muon_setOff()
+ DetFlags.Tile_setOff()
+
+elif (DDversion == "ATLAS-H6-2003-00"):
+ GeoModelSvc.AtlasVersion = "ATLAS-H6-2003-00"
+ DetFlags.HEC_setOff()
+ DetFlags.em_setOff()
+
+elif (DDversion == "ATLAS-H6-2002-00"):
+ GeoModelSvc.AtlasVersion = "ATLAS-H6-2002-00"
+ DetFlags.FCal_setOff()
+
+elif (DDversion == "ATLAS-TBEC-00"):
+ GeoModelSvc.AtlasVersion = "ATLAS-TBEC-00"
+ DetFlags.HEC_setOff()
+ DetFlags.FCal_setOff()
+
+else:
+ GeoModelSvc.AtlasVersion = DDversion
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/SetupRecoGeometry.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/SetupRecoGeometry.py
new file mode 100644
index 0000000000000000000000000000000000000000..4c5de86c63cd1cbcad5f8bc796839c90f881fb2e
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/SetupRecoGeometry.py
@@ -0,0 +1,22 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# Configure GeoModel tools to build minimal geometry fo reconstruction
+#
+
+from AthenaCommon.DetFlags import DetFlags
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+GeoModelSvc = GeoModelSvc()
+
+if ( DetFlags.detdescr.LAr_on() ):
+ GeoModelSvc.DetectorTools["LArDetectorToolNV"].GeometryConfig = "RECO"
+
+if ( DetFlags.detdescr.Tile_on() ):
+ GeoModelSvc.DetectorTools["TileDetectorTool"].GeometryConfig = "RECO"
+
+#
+# Build Muon dead materials using AGDD2Geo
+#
+
+from AtlasGeoModel import Agdd2Geo
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/SimEnvelopes.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/SimEnvelopes.py
new file mode 100755
index 0000000000000000000000000000000000000000..b27ee8e342d265c89c097e24f26f74418afd7eb4
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/SimEnvelopes.py
@@ -0,0 +1,18 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# This contains envelopes used by Simulation
+#
+from AthenaCommon.DetFlags import DetFlags
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+GeoModelSvc = GeoModelSvc()
+
+# ForDet
+if ( DetFlags.detdescr.Lucid_on() or
+ DetFlags.detdescr.ALFA_on() or
+ DetFlags.detdescr.FwdRegion_on() or
+ DetFlags.detdescr.AFP_on() or
+ DetFlags.detdescr.ZDC_on() ):
+ from GeoModelEnvelopes.GeoModelEnvelopesConf import ForDetEnvelopeTool
+ GeoModelSvc.DetectorTools += [ ForDetEnvelopeTool() ]
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/TileGM.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/TileGM.py
new file mode 100755
index 0000000000000000000000000000000000000000..910995db60314bdf43e40ddefa879d9d9a4c3465
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/TileGM.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# TileCal GeoModel initialization
+#
+
+from AthenaCommon.JobProperties import jobproperties
+from AthenaCommon.DetFlags import DetFlags
+
+if ( DetFlags.detdescr.Tile_on() ):
+ from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+ GeoModelSvc = GeoModelSvc()
+
+ from TileGeoModel.TileGeoModelConf import TileDetectorTool
+ GeoModelSvc.DetectorTools += [ TileDetectorTool() ]
+
+ if ( jobproperties.Global.DetGeo() == "ctbh8" and jobproperties.Global.DetGeo() == "ctbh6" ):
+ GeoModelSvc.DetectorTools[ "TileDetectorTool" ].TestBeam = True
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/TileGMCTB.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/TileGMCTB.py
new file mode 100755
index 0000000000000000000000000000000000000000..94229659f6feccb41b6be7796192f3bbdd6c0cae
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/TileGMCTB.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+#
+# TileCal GeoModel initialization
+#
+from AthenaCommon.DetFlags import DetFlags
+
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+GeoModelSvc = GeoModelSvc()
+
+if ( DetFlags.detdescr.Tile_on() ):
+ from TileGeoModel.TileGeoModelConf import TileDetectorTool
+ GeoModelSvc.DetectorTools += [ TileDetectorTool() ]
+ GeoModelSvc.DetectorTools[ "TileDetectorTool" ].TestBeam = True
+
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/__init__.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..b50ea153f0f49dfa670401b616e7ada79f1f0032
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/__init__.py
@@ -0,0 +1,3 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+__author__ = 'Vakho Tsulaia'
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelBuildAll.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelBuildAll.py
new file mode 100755
index 0000000000000000000000000000000000000000..750b4dcb3fa77a8a9ed7df5f24e2f7ea14ac498a
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelBuildAll.py
@@ -0,0 +1,6 @@
+
+print "AtlasGeoModel/GeoModelBuildAll.py is OBSOLETE"
+
+from AtlasGeoModel import SetGeometryVersion
+from AtlasGeoModel import GeoModelInit
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelCommon.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelCommon.py
new file mode 100755
index 0000000000000000000000000000000000000000..c99b7cd38200b17a663ae0b240d2c5eeb63704cd
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelCommon.py
@@ -0,0 +1,6 @@
+
+print "AtlasGeoModel/GeoModelCommon.py is OBSOLETE"
+
+from AtlasGeoModel import SetGeometryVersion
+from AtlasGeoModel import GeoModelInit
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInit.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInit.py
new file mode 100755
index 0000000000000000000000000000000000000000..f63ef01982b62e5895e5ddc2ddc628e95fb60200
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInit.py
@@ -0,0 +1,4 @@
+
+print "AtlasGeoModel/GeoModelInit.py is OBSOLETE"
+
+from AtlasGeoModel import GeoModelInit
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitCTB.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitCTB.py
new file mode 100755
index 0000000000000000000000000000000000000000..116fc9ce10fb1916788fe31fd16e9e12f57eb52e
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitCTB.py
@@ -0,0 +1,4 @@
+print "AtlasGeoModel/GeoModelInitCTB.py is OBSOLETE"
+
+from AtlasGeoModel import GeoModelInitCTB
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitDC1.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitDC1.py
new file mode 100755
index 0000000000000000000000000000000000000000..34c62664445f22ba450bc0a726cdbedf5d004909
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitDC1.py
@@ -0,0 +1,4 @@
+print "AtlasGeoModel/GeoModelInitDC1.py is OBSOLETE"
+
+from AtlasGeoModel import GeoModelInitDC1
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitH6.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitH6.py
new file mode 100644
index 0000000000000000000000000000000000000000..ca5fca556792656d082225a269945ba19dc92fed
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitH6.py
@@ -0,0 +1,4 @@
+print "AtlasGeoModel/GeoModelInitH6.py is OBSOLETE"
+
+from AtlasGeoModel import GeoModelInitH6
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitStandard.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitStandard.py
new file mode 100755
index 0000000000000000000000000000000000000000..3d15de2aeb3dbf2577faa2ef1caa081146449514
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/GeoModelInitStandard.py
@@ -0,0 +1,5 @@
+
+print "AtlasGeoModel/GeoModelInitStandard.py is OBSOLETE"
+
+from AtlasGeoModel import GeoModelInitStandard
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModel.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModel.py
new file mode 100755
index 0000000000000000000000000000000000000000..3cd0c8974460a5adc2ab822b12802cd7c9d82fa8
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModel.py
@@ -0,0 +1,5 @@
+
+print "AtlasGeoModel/InDetGeoModel.py is OBSOLETE"
+
+from AtlasGeoModel import InDetGM
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModelCTB.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModelCTB.py
new file mode 100755
index 0000000000000000000000000000000000000000..173c59dac7731b64f829c4d9625c21a8702a370e
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModelCTB.py
@@ -0,0 +1,7 @@
+
+print "AtlasGeoModel/InDetGeoModelCTB.py is OBSOLETE"
+
+from AtlasGeoModel import InDetGMCTB
+
+
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModelDC2.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModelDC2.py
new file mode 100755
index 0000000000000000000000000000000000000000..5f043fb4571f6a480da86303019b8167e1e25a5f
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/InDetGeoModelDC2.py
@@ -0,0 +1,5 @@
+
+print "AtlasGeoModel/InDetGeoModelDC2.py is OBSOLETE"
+
+from AtlasGeoModel import InDetGM
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/LArGeoModel.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/LArGeoModel.py
new file mode 100755
index 0000000000000000000000000000000000000000..29a4b4563512bb277e99bd5934e44ae733f632ea
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/LArGeoModel.py
@@ -0,0 +1,2 @@
+from AtlasGeoModel import LArGM
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/MiscGeoModel.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/MiscGeoModel.py
new file mode 100755
index 0000000000000000000000000000000000000000..a57eb05c77ea3b06a2e4b19792abf68b60bdd26f
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/MiscGeoModel.py
@@ -0,0 +1,4 @@
+
+print "AtlasGeoModel/MiscGeoModel.py is OBSOLETE"
+
+from AtlasGeoModel import MiscGM
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/MuonGeoModel.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/MuonGeoModel.py
new file mode 100755
index 0000000000000000000000000000000000000000..f0b394a49478b3ade8e4a35e44c5e461f800c477
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/MuonGeoModel.py
@@ -0,0 +1,4 @@
+
+print "AtlasGeoModel/MuonGeoModel.py is OBSOLETE"
+
+from AtlasGeoModel import MuonGM
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/MuonGeoModelCTB.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/MuonGeoModelCTB.py
new file mode 100755
index 0000000000000000000000000000000000000000..0f5d97372a46b0417dd1e5a86d3b3034fc9aef38
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/MuonGeoModelCTB.py
@@ -0,0 +1,2 @@
+print " MuonGeoModelCTB is not supported "
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/SetGeometryVersion.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/SetGeometryVersion.py
new file mode 100755
index 0000000000000000000000000000000000000000..2da7d49a8bd312b41584b81398afd83247063418
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/SetGeometryVersion.py
@@ -0,0 +1,5 @@
+
+print "AtlasGeoModel/SetGeometryVersion.py is OBSOLETE"
+
+from AtlasGeoModel import SetGeometryVersion
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/SetGeometryVersionNew.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/SetGeometryVersionNew.py
new file mode 100755
index 0000000000000000000000000000000000000000..1e0eb7f3044d3823a0650f60a1b7cd2753348a21
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/SetGeometryVersionNew.py
@@ -0,0 +1,6 @@
+
+print "AtlasGeoModel/SetGeometryVersionNew.py is OBSOLETE"
+
+from AtlasGeoModel import SetGeometryVersion
+
+
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/TileGeoModel.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/TileGeoModel.py
new file mode 100755
index 0000000000000000000000000000000000000000..bbbe0de6cab50ef018bbf583b74b6519f1b4d84a
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/TileGeoModel.py
@@ -0,0 +1,4 @@
+
+print "AtlasGeoModel/TileGeoModel.py is OBSOLETE"
+
+from AtlasGeoModel import TileGM
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/share/TileGeoModelCTB.py b/DetectorDescription/GeoModel/AtlasGeoModel/share/TileGeoModelCTB.py
new file mode 100755
index 0000000000000000000000000000000000000000..33a6e3df95fb16e363cb6e415c0d69a62fb0cafd
--- /dev/null
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/share/TileGeoModelCTB.py
@@ -0,0 +1,6 @@
+
+print "AtlasGeoModel/TileGeoModelCTB.py is OBSOLETE"
+
+from AtlasGeoModel import TileGMCTB
+
+