Merge branch 'DetectorGeometrySvcPrivateTools_ATLASSIM-3379_21.0' into '21.0'

Detector geometry svc private tools atlassim 3379 21.0

See merge request !3539

Former-commit-id: d9c1b9eb

Simulation/G4Atlas/G4AtlasServices/src/DetectorGeometrySvc.cxx

@@ -25,10 +25,10 @@
 
 DetectorGeometrySvc::DetectorGeometrySvc( const std::string& name, ISvcLocator* pSvcLocator )
   : AthService(name,pSvcLocator),
-    m_detTool(""),
-    m_detConstruction(""),
-    m_regionCreators(),
-    m_parallelWorlds(),
+    m_detTool("",this),
+    m_detConstruction("",this),
+    m_regionCreators(this),
+    m_parallelWorlds(this),
     m_fieldManagers(this),
     m_activateParallelWorlds(false)
 {

Simulation/SimulationJobOptions/share/cavern/postInclude.Cavern.py

+#########################################################
+#
+# SimulationJobOptions/Cavern.py
+# Andrea Dell'Acqua
+#
+# Setting special range cuts in G4 for use with cavern
+# background production.
+#########################################################
+
+from AthenaCommon.CfgGetter import getPrivateTool,getService
+getService('DetectorGeometrySvc').RegionCreators += [getPrivateTool('MuonPhysicsRegionTool')]
+#FIXME need to add this to the list of RegionCreators, but
+#currently initializing the DetectorGeometrySvc too early causes
+#problems with the GeoModelSvc configuration.

Simulation/SimulationJobOptions/share/cavern/preInclude.Cavern.py

@@ -12,8 +12,3 @@ simFlags.CalibrationRun.set_Off()
 simFlags.CavernCuts = True
 simFlags.LArParameterization = 0
 
-from AthenaCommon.CfgGetter import getPublicTool,getService
-getService('DetectorGeometrySvc').RegionCreators += [getPublicTool('MuonPhysicsRegionTool')]
-#FIXME need to add this to the list of RegionCreators, but
-#currently initializing the DetectorGeometrySvc too early causes
-#problems with the GeoModelSvc configuration.

Simulation/SimulationJobOptions/share/g4/preInclude.PixelCuts10.py → Simulation/SimulationJobOptions/share/g4/postInclude.PixelCuts10.py

@@ -9,9 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 PIX Config: Setting PIX cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-pixelRegionTool = getPublicTool('PixelPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+pixelRegionTool = getService('DetectorGeometrySvc').RegionCreators['PixelPhysicsRegionTool']
 pixelRegionTool.ElectronCut = 0.01
 pixelRegionTool.PositronCut = 0.01
 pixelRegionTool.GammaCut = 0.01

Simulation/SimulationJobOptions/share/g4/preInclude.PixelCuts100.py → Simulation/SimulationJobOptions/share/g4/postInclude.PixelCuts100.py

@@ -9,9 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 PIX Config: Setting PIX cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-pixelRegionTool = getPublicTool('PixelPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+pixelRegionTool = getService('DetectorGeometrySvc').RegionCreators['PixelPhysicsRegionTool']
 pixelRegionTool.ElectronCut = 0.1
 pixelRegionTool.PositronCut = 0.1
 pixelRegionTool.GammaCut = 0.1

Simulation/SimulationJobOptions/share/g4/preInclude.PixelCuts20.py → Simulation/SimulationJobOptions/share/g4/postInclude.PixelCuts20.py

@@ -9,9 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 PIX Config: Setting PIX cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-pixelRegionTool = getPublicTool('PixelPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+pixelRegionTool = getService('DetectorGeometrySvc').RegionCreators['PixelPhysicsRegionTool']
 pixelRegionTool.ElectronCut = 0.02
 pixelRegionTool.PositronCut = 0.02
 pixelRegionTool.GammaCut = 0.02

Simulation/SimulationJobOptions/share/g4/preInclude.PixelCuts5.py → Simulation/SimulationJobOptions/share/g4/postInclude.PixelCuts5.py

@@ -9,9 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 PIX Config: Setting PIX cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-pixelRegionTool = getPublicTool('PixelPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+pixelRegionTool = getService('DetectorGeometrySvc').RegionCreators['PixelPhysicsRegionTool']
 pixelRegionTool.ElectronCut = 0.005
 pixelRegionTool.PositronCut = 0.005
 pixelRegionTool.GammaCut = 0.005

Simulation/SimulationJobOptions/share/g4/preInclude.PixelCuts50.py → Simulation/SimulationJobOptions/share/g4/postInclude.PixelCuts50.py

@@ -9,9 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 PIX Config: Setting PIX cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-pixelRegionTool = getPublicTool('PixelPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+pixelRegionTool = getService('DetectorGeometrySvc').RegionCreators['PixelPhysicsRegionTool']
 pixelRegionTool.ElectronCut = 0.05
 pixelRegionTool.PositronCut = 0.05
 pixelRegionTool.GammaCut = 0.05

Simulation/SimulationJobOptions/share/g4/preInclude.SCTCuts10.py → Simulation/SimulationJobOptions/share/g4/postInclude.SCTCuts10.py

@@ -9,9 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 SCT Config: Setting SCT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-sctRegionTool = getPublicTool('SCTPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+sctRegionTool = getService('DetectorGeometrySvc').RegionCreators['SCTPhysicsRegionTool']
 sctRegionTool.ElectronCut = 0.01
 sctRegionTool.PositronCut = 0.01
 sctRegionTool.GammaCut = 0.01

Simulation/SimulationJobOptions/share/g4/preInclude.SCTCuts100.py → Simulation/SimulationJobOptions/share/g4/postInclude.SCTCuts100.py

@@ -12,9 +12,8 @@
 #########################################################
 
 atlasG4log.info("G4 SCT Config: Setting SCT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-sctRegionTool = getPublicTool('SCTPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+sctRegionTool = getService('DetectorGeometrySvc').RegionCreators['SCTPhysicsRegionTool']
 sctRegionTool.ElectronCut = 0.1
 sctRegionTool.PositronCut = 0.1
 sctRegionTool.GammaCut = 0.1

Simulation/SimulationJobOptions/share/g4/preInclude.SCTCuts20.py → Simulation/SimulationJobOptions/share/g4/postInclude.SCTCuts20.py

@@ -9,8 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 SCT Config: Setting SCT cut")
-from AthenaCommon.CfgGetter import getPublicTool
-sctRegionTool = getPublicTool('SCTPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+sctRegionTool = getService('DetectorGeometrySvc').RegionCreators['SCTPhysicsRegionTool']
 sctRegionTool.ElectronCut = 0.02
 sctRegionTool.PositronCut = 0.02
 sctRegionTool.GammaCut = 0.02

Simulation/SimulationJobOptions/share/g4/preInclude.SCTCuts5.py → Simulation/SimulationJobOptions/share/g4/postInclude.SCTCuts5.py

@@ -9,9 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 SCT Config: Setting SCT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-sctRegionTool = getPublicTool('SCTPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+sctRegionTool = getService('DetectorGeometrySvc').RegionCreators['SCTPhysicsRegionTool']
 sctRegionTool.ElectronCut = 0.005
 sctRegionTool.PositronCut = 0.005
 sctRegionTool.GammaCut = 0.005

Simulation/SimulationJobOptions/share/g4/preInclude.SCTCuts50.py → Simulation/SimulationJobOptions/share/g4/postInclude.SCTCuts50.py

@@ -9,9 +9,8 @@
 #########################################################
 
 atlasG4log.info("G4 SCT Config: Setting SCT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-sctRegionTool = getPublicTool('SCTPhysicsRegionTool')
+from AthenaCommon.CfgGetter import getService
+sctRegionTool = getService('DetectorGeometrySvc').RegionCreators['SCTPhysicsRegionTool']
 sctRegionTool.ElectronCut = 0.05
 sctRegionTool.PositronCut = 0.05
 sctRegionTool.GammaCut = 0.05

Simulation/SimulationJobOptions/share/g4/postInclude.ScoringVolumeKiller.py

+#############################################################
+#
+#  postOptions.ScoringVolume.py : calls ScoringVolumeKiller
+#  while running a G4 simulation of the ATLAS detector.
+#  The ScoringVolumeKiller will kill all particles leaving
+#  the scoring volumes surrounding the muon stations.
+#
+#  Dennis Wright (SLAC)
+#  25 May 2010
+#############################################################
+
+from AthenaCommon.CfgGetter import getPrivateTool,getService
+getService('DetectorGeometrySvc').RegionCreators += [getPrivateTool('MuonPhysicsRegionTool')]
+#FIXME need to add this to the list of RegionCreators, but
+#currently initializing the DetectorGeometrySvc too early causes
+#problems with the GeoModelSvc configuration.

Simulation/SimulationJobOptions/share/g4/preInclude.TRTCuts10.py → Simulation/SimulationJobOptions/share/g4/postInclude.TRTCuts10.py

@@ -8,8 +8,7 @@
 #########################################################
 
 atlasG4log.info("G4 TRT Config: Setting TRT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-getPublicTool('TRTPhysicsRegionTool').ElectronCut=10. #FIXME Units?!
+rom AthenaCommon.CfgGetter import getService
+getService('DetectorGeometrySvc').RegionCreators['TRTPhysicsRegionTool'].ElectronCut=10. #FIXME Units?!
 # FIXME: Is it correct to alter only the e- cut and leave the e+ and
 # photon cuts unchanged?

Simulation/SimulationJobOptions/share/g4/preInclude.TRTCuts100.py → Simulation/SimulationJobOptions/share/g4/postInclude.TRTCuts100.py

@@ -8,8 +8,7 @@
 #########################################################
 
 atlasG4log.info("G4 TRT Config: Setting TRT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-getPublicTool('TRTPhysicsRegionTool').ElectronCut=100. #FIXME Units?!
+from AthenaCommon.CfgGetter import getService
+getService('DetectorGeometrySvc').RegionCreators['TRTPhysicsRegionTool'].ElectronCut=100. #FIXME Units?!
 # FIXME: Is it correct to alter only the e- cut and leave the e+ and
 # photon cuts unchanged?

Simulation/SimulationJobOptions/share/g4/preInclude.TRTCuts5.py → Simulation/SimulationJobOptions/share/g4/postInclude.TRTCuts5.py

@@ -8,8 +8,7 @@
 #########################################################
 
 atlasG4log.info("G4 TRT Config: Setting TRT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-getPublicTool('TRTPhysicsRegionTool').ElectronCut=5. #FIXME Units?!
+from AthenaCommon.CfgGetter import getService
+getService('DetectorGeometrySvc').RegionCreators['TRTPhysicsRegionTool'].ElectronCut=5. #FIXME Units?!
 # FIXME: Is it correct to alter only the e- cut and leave the e+ and
 # photon cuts unchanged?

Simulation/SimulationJobOptions/share/g4/preInclude.TRTCuts50.py → Simulation/SimulationJobOptions/share/g4/postInclude.TRTCuts50.py

@@ -8,8 +8,7 @@
 #########################################################
 
 atlasG4log.info("G4 TRT Config: Setting TRT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-getPublicTool('TRTPhysicsRegionTool').ElectronCut=50. #FIXME Units?!
+from AthenaCommon.CfgGetter import getService
+getService('DetectorGeometrySvc').RegionCreators['TRTPhysicsRegionTool'].ElectronCut=50. #FIXME Units?!
 # FIXME: Is it correct to alter only the e- cut and leave the e+ and
 # photon cuts unchanged?

Simulation/SimulationJobOptions/share/g4/preInclude.TRTCuts500.py → Simulation/SimulationJobOptions/share/g4/postInclude.TRTCuts500.py

@@ -8,8 +8,7 @@
 #########################################################
 
 atlasG4log.info("G4 TRT Config: Setting TRT cut")
-
-from AthenaCommon.CfgGetter import getPublicTool
-getPublicTool('TRTPhysicsRegionTool').ElectronCut=500. #FIXME Units?!
+from AthenaCommon.CfgGetter import getService
+getService('DetectorGeometrySvc').RegionCreators['TRTPhysicsRegionTool'].ElectronCut=500. #FIXME Units?!
 # FIXME: Is it correct to alter only the e- cut and leave the e+ and
 # photon cuts unchanged?

Simulation/SimulationJobOptions/share/g4/preInclude.ScoringVolumeKiller.py

@@ -13,10 +13,4 @@ from G4AtlasApps.SimFlags import simFlags
 simFlags.NeutronTimeCut = int(2**31 - 1) #probably not required.
 simFlags.NeutronTimeCut.set_Off()
 
-from AthenaCommon.CfgGetter import getPublicTool,getService
-getService('DetectorGeometrySvc').RegionCreators += [getPublicTool('MuonPhysicsRegionTool')]
-#FIXME need to add this to the list of RegionCreators, but
-#currently initializing the DetectorGeometrySvc too early causes
-#problems with the GeoModelSvc configuration.
-
 simFlags.OptionalUserActionList.addAction('G4UA::ScoringVolumeTrackKillerTool',['EndOfEvent', 'Step'])