diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY
deleted file mode 100644
index 8fd15b490e94ceed5df882f101861f1334cffad6..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY
+++ /dev/null
@@ -1 +0,0 @@
-InnerDetector/InDetConditions/SiLorentzAngleSvc
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py
deleted file mode 100644
index 77499920a0588387ccc65c6ada9f38092ab4552c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConfiguredFactory
-
-from AthenaCommon.CfgGetter import addTool
-
-addTool("SiLorentzAngleSvc.SiLorentzAngleSvcConfig.getSCTLorentzAngleTool", "SCTLorentzAngleTool")
-addTool("SiLorentzAngleSvc.SiLorentzAngleSvcConfig.getPixelLorentzAngleTool", "PixelLorentzAngleTool")
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt b/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
similarity index 89%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
index 50f42535de49e12669a34f7724bd213a729b72ca..86125e6f55e0f9b5d90085a3cc64e8f2bd0baf0c 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt
@@ -1,9 +1,9 @@
################################################################################
-# Package: SiLorentzAngleSvc
+# Package: SiLorentzAngleTool
################################################################################
# Declare the package name:
-atlas_subdir( SiLorentzAngleSvc )
+atlas_subdir( SiLorentzAngleTool )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
@@ -29,7 +29,7 @@ atlas_depends_on_subdirs( PUBLIC
find_package( Eigen )
# Component(s) in the package:
-atlas_add_component( SiLorentzAngleSvc
+atlas_add_component( SiLorentzAngleTool
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
@@ -37,11 +37,11 @@ atlas_add_component( SiLorentzAngleSvc
# Run tests:
atlas_add_test( TestSCTLorentzAngle
- SCRIPT athena.py --threads=5 SiLorentzAngleSvc/testSCTLorentzAngle.py
+ SCRIPT athena.py --threads=5 SiLorentzAngleTool/testSCTLorentzAngle.py
PROPERTIES TIMEOUT 300
ENVIRONMENT THREADS=5 )
# Install files from the package:
-atlas_install_headers( SiLorentzAngleSvc )
+atlas_install_headers( SiLorentzAngleTool )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/SiLorentzAngleTool/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetConditions/SiLorentzAngleTool/SiLorentzAngleTool/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..372bf00d2df19e4c2caebf243ebcc38310857d48
--- /dev/null
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/SiLorentzAngleTool/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetConditions/SiLorentzAngleTool
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/SiLorentzAngleCondData.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/SiLorentzAngleTool/SiLorentzAngleCondData.h
similarity index 100%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/SiLorentzAngleCondData.h
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/SiLorentzAngleTool/SiLorentzAngleCondData.h
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/doc/packagedoc.h
similarity index 79%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/doc/packagedoc.h
index c83b513489040770ab492c779f9538bd06b398dc..6b1909528d45d1c580153a4916ebb8f4d02d1ae3 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/doc/packagedoc.h
@@ -4,29 +4,29 @@
/**
-@page SiLorentzAngleSvc_page SiLorentzAngleSvc Package
+@page SiLorentzAngleTool_page SiLorentzAngleTool Package
@authors Grant Gorfine
-@section SiLorentzAngleSvc_SiLorentzAngleSvcIntro Introduction
+@section SiLorentzAngleTool_SiLorentzAngleToolIntro Introduction
Service for providing Lorentz angle (and the corresponding shift of the measurement)
for each detector element.
-@section SiLorentzAngleSvc_SiLorentzAngleSvcUsage Usage Notes
+@section SiLorentzAngleTool_SiLorentzAngleToolUsage Usage Notes
A python module has been provided for easy setup.
To load simply include the following in your job options.
@verbatim
- from SiLorentzAngleSvc.LorentzAngleSvcSetup import lorentzAngleSvc
+ from SiLorentzAngleTool.LorentzAngleSvcSetup import lorentzAngleSvc
@endverbatim
This will setup both pixel and SCT. If you only want to setup them up separately you can do
@verbatim
- from SiLorentzAngleSvc.PixelLorentzAngleSvcSetup import pixelLorentzAngleSvcSetup
- from SiLorentzAngleSvc.SCTLorentzAngleSvcSetup import sctLorentzAngleSvcSetup
+ from SiLorentzAngleTool.PixelLorentzAngleSvcSetup import pixelLorentzAngleSvcSetup
+ from SiLorentzAngleTool.SCTLorentzAngleSvcSetup import sctLorentzAngleSvcSetup
@endverbatim
@@ -91,7 +91,7 @@ or
Alternatively, you can also access the services by:
@verbatim
- from SiLorentzAngleSvc.LorentzAngleSvcSetup import PixelLorentzAngleSvc,SCTLorentzAngleSvc
+ from SiLorentzAngleTool.LorentzAngleSvcSetup import PixelLorentzAngleSvc,SCTLorentzAngleSvc
PixelLorentzAngleSvc.OutputLevel = VERBOSE
SCTLorentzAngleSvc.OutputLevel = VERBOSE
@endverbatim
@@ -99,10 +99,10 @@ Alternatively, you can also access the services by:
or
@verbatim
- from SiLorentzAngleSvc.PixelLorentzAngleSvcSetup import PixelLorentzAngleSvc
+ from SiLorentzAngleTool.PixelLorentzAngleSvcSetup import PixelLorentzAngleSvc
PixelLorentzAngleSvc.OutputLevel = VERBOSE
- from SiLorentzAngleSvc.SCTLorentzAngleSvcSetup import SCTLorentzAngleSvc
+ from SiLorentzAngleTool.SCTLorentzAngleSvcSetup import SCTLorentzAngleSvc
SCTLorentzAngleSvc.OutputLevel = VERBOSE
@endverbatim
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/PixelLorentzAngleToolSetup.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py
similarity index 94%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/python/PixelLorentzAngleToolSetup.py
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py
index f6bad11a9b68e3ebefd8b32ea7f478b72b7c197a..f9f0e2b6d0e364cae01f3a3d23ce2c4d3e074d01 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/PixelLorentzAngleToolSetup.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py
@@ -43,7 +43,7 @@ class PixelLorentzAngleToolSetup:
ReadKey = "PixelSiliconPropertiesVector")
if not hasattr(condSeq, "PixelSiLorentzAngleCondAlg"):
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import PixelSiLorentzAngleCondAlg
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import PixelSiLorentzAngleCondAlg
condSeq += PixelSiLorentzAngleCondAlg(name = "PixelSiLorentzAngleCondAlg",
SiPropertiesTool = ToolSvc.PixelSiPropertiesTool,
UseMagFieldSvc = True,
@@ -51,7 +51,7 @@ class PixelLorentzAngleToolSetup:
pixelSiLorentzAngleCondAlg = condSeq.PixelSiLorentzAngleCondAlg
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
ToolSvc += SiLorentzAngleTool(name="PixelLorentzAngleTool", DetectorName="Pixel", SiLorentzAngleCondData="PixelSiLorentzAngleCondData")
pixelLorentzAngleTool = ToolSvc.PixelLorentzAngleTool
# Pass the silicon conditions tool to the Lorentz angle tool
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleToolSetup.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py
similarity index 97%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleToolSetup.py
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py
index e259c39cc974b37ead81d8b1902edc15364f7a8b..270b01b6f0a442a5760f828f8348efc830fb5b16 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleToolSetup.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py
@@ -45,7 +45,7 @@ class SCTLorentzAngleToolSetup:
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
if not hasattr(condSeq, "SCTSiLorentzAngleCondAlg"):
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SCTSiLorentzAngleCondAlg
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SCTSiLorentzAngleCondAlg
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
condSeq += SCTSiLorentzAngleCondAlg(name = "SCTSiLorentzAngleCondAlg",
SiConditionsTool = sctSiliconConditionsTool,
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py
similarity index 81%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py
index 305fe9fe0e1ecc69d09d98912dd7e3beae5ebdb4..00c6e6103ce87efce9ee6bdf4ead921094a9c72b 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py
@@ -7,11 +7,11 @@ from AthenaCommon import CfgMgr
def getSCTLorentzAngleTool(name="SCTLorentzAngleTool", **kwargs):
kwargs.setdefault("DetectorName", "SCT")
kwargs.setdefault("SiLorentzAngleCondData", "SCTSiLorentzAngleCondData")
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
return CfgMgr.SiLorentzAngleTool(name, **kwargs)
def getPixelLorentzAngleTool(name="PixelLorentzAngleTool", **kwargs):
kwargs.setdefault("DetectorName", "Pixel")
kwargs.setdefault("SiLorentzAngleCondData","PixelSiLorentzAngleCondData")
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
return CfgMgr.SiLorentzAngleTool(name, **kwargs)
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfigDb.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfigDb.py
new file mode 100644
index 0000000000000000000000000000000000000000..2176f55ea05d6bcd6d7e6a94877d7f175ca63ad7
--- /dev/null
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfigDb.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+
+# https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/ConfiguredFactory
+
+from AthenaCommon.CfgGetter import addTool
+
+addTool("SiLorentzAngleTool.SiLorentzAngleToolConfig.getSCTLorentzAngleTool", "SCTLorentzAngleTool")
+addTool("SiLorentzAngleTool.SiLorentzAngleToolConfig.getPixelLorentzAngleTool", "PixelLorentzAngleTool")
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/__init__.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/__init__.py
similarity index 100%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/python/__init__.py
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/python/__init__.py
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/share/testSCTLorentzAngle.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/share/testSCTLorentzAngle.py
similarity index 94%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/share/testSCTLorentzAngle.py
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/share/testSCTLorentzAngle.py
index 2824eb152213f95815b99041e06e0111d039551f..0da2a95e94f9441854b464039d9b172ba4e4bb16 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/share/testSCTLorentzAngle.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/share/testSCTLorentzAngle.py
@@ -69,10 +69,10 @@ from IOVDbSvc.CondDB import conddb
IOVDbSvc.GlobalTag="OFLCOND-MC16-SDR-18"
IOVDbSvc.OutputLevel = 3
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
-from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SCTSiLorentzAngleTestAlg
+from SiLorentzAngleTool.SiLorentzAngleToolConf import SCTSiLorentzAngleTestAlg
job += SCTSiLorentzAngleTestAlg(SCTLorentzAngleTool=sctLorentzAngleToolSetup.SCTLorentzAngleTool)
# Prepare EventSelector
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.cxx
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
similarity index 97%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
index 0537d770ab0da0a4bfa3a2eae8c9b64fd8947f6d..6cc0db2b2612a8040618eaf445164c7a7af3e5bb 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.h
@@ -14,7 +14,7 @@
#include "GaudiKernel/ICondSvc.h"
#include "SiPropertiesTool/ISiPropertiesTool.h"
-#include "SiLorentzAngleSvc/SiLorentzAngleCondData.h"
+#include "SiLorentzAngleTool/SiLorentzAngleCondData.h"
#include "InDetIdentifier/PixelID.h"
#include "InDetReadoutGeometry/PixelDetectorManager.h"
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleCondAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleCondAlg.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleCondAlg.cxx
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleCondAlg.cxx
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleCondAlg.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleCondAlg.h
similarity index 98%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleCondAlg.h
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleCondAlg.h
index 189038555b487882f19679ff28c2926d562d3d17..f8819e3411897cf9b99e0671cf92d99077f15a2b 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleCondAlg.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleCondAlg.h
@@ -17,7 +17,7 @@
#include "InDetConditionsSummaryService/ISiliconConditionsTool.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "SCT_ConditionsData/SCT_DCSFloatCondData.h"
-#include "SiLorentzAngleSvc/SiLorentzAngleCondData.h"
+#include "SiLorentzAngleTool/SiLorentzAngleCondData.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/WriteCondHandleKey.h"
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleTestAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleTestAlg.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleTestAlg.cxx
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleTestAlg.cxx
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleTestAlg.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleTestAlg.h
similarity index 100%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleTestAlg.h
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleTestAlg.h
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleCondData.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleCondData.cxx
similarity index 98%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleCondData.cxx
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleCondData.cxx
index ffbcb39219201de8050c13ae5102366fc7aaf280..5ecd26e9480204a0de60e835ed1b02f06c6b4779 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleCondData.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleCondData.cxx
@@ -7,7 +7,7 @@
* @author Susumu.Oda@cern.ch
**/
-#include "SiLorentzAngleSvc/SiLorentzAngleCondData.h"
+#include "SiLorentzAngleTool/SiLorentzAngleCondData.h"
#include <limits>
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleTool.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.cxx
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleTool.cxx
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleTool.h
similarity index 98%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleTool.h
index 37a02d769139f2022087f005a1828a89a13ea67f..80a054455c2816ff25696e88d1ae8557392fd6b0 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleTool.h
@@ -15,7 +15,7 @@
#include "GeoPrimitives/GeoPrimitives.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiLorentzAngleSvc/SiLorentzAngleCondData.h"
+#include "SiLorentzAngleTool/SiLorentzAngleCondData.h"
#include "StoreGate/ReadCondHandleKey.h"
//Gaudi Includes
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx b/InnerDetector/InDetConditions/SiLorentzAngleTool/src/components/SiLorentzAngleTool_entries.cxx
similarity index 100%
rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx
rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/components/SiLorentzAngleTool_entries.cxx
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
index f661898dcc597fdb09a2cf74f4e7c60769ab916d..216d0071c5757764c57c56ced89ad70231cb36e7 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py
@@ -83,7 +83,7 @@ def commonPixelFastDigitizationConfig(name,**kwargs):
# SiLorentzAngleTool for PixelFastDigitizationTool
from AthenaCommon.AppMgr import ToolSvc
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
kwargs.setdefault("LorentzAngleTool", ToolSvc.PixelLorentzAngleTool)
@@ -125,7 +125,7 @@ def commonSCT_FastDigitizationConfig(name,**kwargs):
# SiLorentzAngleTool for SCT_FastDigitizationTool
from AthenaCommon.AppMgr import ToolSvc
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
kwargs.setdefault("LorentzAngleTool", sctLorentzAngleToolSetup.SCTLorentzAngleTool)
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
index f676c1442aea57981d5f2908ee28f48ed28cc537..971dd4962dc84303a802dcbf1f59e0d8ef401c10 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfig.py
@@ -47,7 +47,7 @@ def SensorSimPlanarTool(name="SensorSimPlanarTool", **kwargs):
pixelSiPropertiesToolSetup = PixelSiPropertiesToolSetup()
pixelSiPropertiesToolSetup.setup()
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
kwargs.setdefault("SiPropertiesTool", ToolSvc.PixelSiPropertiesTool)
kwargs.setdefault("LorentzAngleTool", ToolSvc.PixelLorentzAngleTool)
@@ -60,7 +60,7 @@ def SensorSim3DTool(name="SensorSim3DTool", **kwargs):
pixelSiPropertiesToolSetup = PixelSiPropertiesToolSetup()
pixelSiPropertiesToolSetup.setup()
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
kwargs.setdefault("SiPropertiesTool", ToolSvc.PixelSiPropertiesTool)
return CfgMgr.SensorSim3DTool(name, **kwargs)
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py b/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py
index 0f8996f573ed2209c0b6d7692f2609dae632bf55..a753c90b1b327a9b6e1026ab88f90d0b693e7675 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfig.py
@@ -54,7 +54,7 @@ def getSCT_SurfaceChargesGenerator(name="SCT_SurfaceChargesGenerator", **kwargs)
from SCT_ConditionsTools.SCT_ConditionsToolsConf import SCT_RadDamageSummaryTool
ToolSvc += SCT_RadDamageSummaryTool(name = "InDetSCT_RadDamageSummaryTool")
## SiLorentzAngleTool for SCT_SurfaceChargesGenerator
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
kwargs.setdefault("FixedTime", -999)
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
index b757c825632442e6f342dd82d02828f45ba78859..6b51841abe78d7f6084c994bf3707368deacfbbc 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/share/InDetDxAOD.py
@@ -419,7 +419,7 @@ if dumpPixInfo:
from AthenaCommon.AppMgr import ToolSvc
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
from InDetPrepRawDataToxAOD.InDetPrepRawDataToxAODConf import PixelPrepDataToxAOD
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
index f67b4de2e4d7c14dbbe46f9891f6f33b003ac03c..4e62db0218b731ba55a24939348a9963cad2bfcb 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
@@ -101,8 +101,8 @@ topSequence.InDetSCTRawDataProvider.ProviderTool.Decoder.OutputLevel = INFO
topSequence.InDetSCTEventFlagWriter.OutputLevel = DEBUG
# Set up SCT clsutering
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
-from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
diff --git a/InnerDetector/InDetExample/InDetAlignExample/share/ElectronEoverPTracking.py b/InnerDetector/InDetExample/InDetAlignExample/share/ElectronEoverPTracking.py
index d0c8b10b17be291d4a55f63f88921979324c5774..48d91adf59a564f49c7dd3d5148c0bd45388bf7c 100755
--- a/InnerDetector/InDetExample/InDetAlignExample/share/ElectronEoverPTracking.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/share/ElectronEoverPTracking.py
@@ -22,7 +22,7 @@ topSequence = AlgSequence()
#
# SiLorentzAngleTool
#
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
#
# load SCT ROT creator, we overwrite the defaults for it
diff --git a/InnerDetector/InDetExample/InDetDetDescrExample/share/ReadSiDetectorElements_jobOptions.py b/InnerDetector/InDetExample/InDetDetDescrExample/share/ReadSiDetectorElements_jobOptions.py
index f417a79e9e75413ded1a36a9903af7da29da5331..14186022d588cb838fe0966082dbe3acc4b7ed3f 100644
--- a/InnerDetector/InDetExample/InDetDetDescrExample/share/ReadSiDetectorElements_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetDetDescrExample/share/ReadSiDetectorElements_jobOptions.py
@@ -64,7 +64,7 @@ from SiPropertiesTool.PixelSiPropertiesToolSetup import PixelSiPropertiesToolSet
pixelSiPropertiesToolSetup = PixelSiPropertiesToolSetup()
pixelSiPropertiesToolSetup.setup()
pixelSiPropertiesTool = pixelSiPropertiesToolSetup.getTool()
-from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
pixelLorentzAngleTool = pixelLorentzAngleToolSetup.PixelLorentzAngleTool
@@ -77,7 +77,7 @@ ReadPixelElements.SiConditionsTool = pixelDCSConditionsTool
# SCT
#
# Silicon Lorentz angle tool
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
sctLorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool
sctSiliconConditionsTool = sctLorentzAngleToolSetup.sctSiliconConditionsTool
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index e84ea5da7869ac6532bbe0539d4edeea1bc0aa01..ef043d6801ff0feb932f8d9f153b89667eb7ad51 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -103,7 +103,7 @@ if DetFlags.haveRIO.pixel_on():
condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg")
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
@@ -267,7 +267,7 @@ if DetFlags.haveRIO.SCT_on():
InDetSCT_ConditionsSummaryToolWithoutFlagged.ConditionsTools = condTools
# Setup Lorentz angle tool.
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
forceUseDB = False
forceUseGeoModel = False
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
index b1b74a7ec6e2bbaaac04da208d447e4bf34873bd..fe6329886ca02ea3c56510969f69995d3b08cd93 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
@@ -52,7 +52,7 @@ if InDetFlags.doPixelClusterSplitting() and not InDetFlags.doSLHC():
# --- a better solution is needed...
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
from SiClusterizationTool.SiClusterizationToolConf import InDet__NnClusterizationFactory
@@ -96,7 +96,7 @@ if InDetFlags.doPixelClusterSplitting() and not InDetFlags.doSLHC():
print NnClusterizationFactory
elif InDetFlags.doPixelClusterSplitting():
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
from SiClusterizationTool.SiClusterizationToolConf import InDet__TruthClusterizationFactory
@@ -134,7 +134,7 @@ if InDetFlags.loadRotCreator():
# tool to always make conservative pixel cluster errors
# SiLorentzAngleTool
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__PixelClusterOnTrackTool
if InDetFlags.doDBM():
@@ -197,7 +197,7 @@ if InDetFlags.loadRotCreator():
if DetFlags.haveRIO.SCT_on():
# SiLorentzAngleTool
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__SCT_ClusterOnTrackTool
SCT_ClusterOnTrackTool = InDet__SCT_ClusterOnTrackTool ("InDetSCT_ClusterOnTrackTool",
@@ -258,7 +258,7 @@ if InDetFlags.loadRotCreator():
if DetFlags.haveRIO.pixel_on():
# SiLorentzAngleTool
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
#
# tool to always make conservative pixel cluster errors
@@ -290,7 +290,7 @@ if InDetFlags.loadRotCreator():
if DetFlags.haveRIO.SCT_on():
# SiLorentzAngleTool
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
#
# tool to always make conservative sct cluster errors
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
index 57a5bf0ee8aeccebd52942f84f6919c9bf214675..3eba016b1616abee8cd22b58a96be55e1407a804 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecPreProcessingSilicon.py
@@ -28,10 +28,10 @@ if InDetFlags.doPRDFormation():
# --- SiLorentzAngleTool
#
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
#
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
index dcef2787056408ab08cd40841088153dad1573f0..a6e0389c9113d00a6c13ccfe75854787c40d6b38 100644
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigConditions.py
@@ -190,13 +190,13 @@ class PixelConditionsServicesSetup:
ToolSvc += TrigSiPropertiesTool
if not hasattr(condSeq, 'PixelSiLorentzAngleCondAlg'):
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import PixelSiLorentzAngleCondAlg
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import PixelSiLorentzAngleCondAlg
condSeq += PixelSiLorentzAngleCondAlg(name="PixelSiLorentzAngleCondAlg",
SiPropertiesTool=TrigSiPropertiesTool,
UseMagFieldSvc = True,
UseMagFieldDcs = (not athenaCommonFlags.isOnline()))
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
TrigPixelLorentzAngleTool = SiLorentzAngleTool(name=self.instanceName('PixelLorentzAngleTool'), DetectorName="Pixel", SiLorentzAngleCondData="PixelSiLorentzAngleCondData")
ToolSvc += TrigPixelLorentzAngleTool
@@ -427,7 +427,7 @@ class SCT_ConditionsToolsSetup:
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
if not hasattr(condSeq, "SCTSiLorentzAngleCondAlg"):
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SCTSiLorentzAngleCondAlg
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SCTSiLorentzAngleCondAlg
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
condSeq += SCTSiLorentzAngleCondAlg(name = "SCTSiLorentzAngleCondAlg",
SiConditionsTool = sctSiliconConditionsTool,
@@ -436,7 +436,7 @@ class SCT_ConditionsToolsSetup:
sctSiLorentzAngleCondAlg = condSeq.SCTSiLorentzAngleCondAlg
"Inititalize Lorentz angle Tool"
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
SCTLorentzAngleTool = SiLorentzAngleTool(name=instanceName, DetectorName="SCT", SiLorentzAngleCondData="SCTSiLorentzAngleCondData")
SCTLorentzAngleTool.UseMagFieldSvc = True #may need also MagFieldSvc instance
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index bfc77bbc0089b24498f9910954fef2d5e5ebff4d..d9c5eb709bce514e4350f0064a94cc425f110b4a 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -22,7 +22,7 @@ from AthenaCommon.CfgGetter import getPublicTool,getPrivateTool
TrigPixelLorentzAngleTool = getPublicTool("PixelLorentzAngleTool")
TrigSCTLorentzAngleTool = getPrivateTool("SCTLorentzAngleTool")
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
#
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/ElectronEoverPTracking.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/ElectronEoverPTracking.py
index 50868637b9b5649fc379fbf7683f801fd721cbea..e46f6e1db332269577536d42f8a2031f9eb9715b 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/ElectronEoverPTracking.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/ElectronEoverPTracking.py
@@ -20,7 +20,7 @@ topSequence = AlgSequence()
###############################################################################
###############################################################################
# SiLorentzAngleTool
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
#
# load SCT ROT creator, we overwrite the defaults for it
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt
index a08cf39d91427e802ec194054a6b06d02dc1ee37..cd3ae93527b62ba7cf40292a3371e44827d47ae0 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt
@@ -23,7 +23,6 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecTools/TRT_DriftCircleTool
InnerDetector/InDetConditions/SCT_ConditionsData
- InnerDetector/InDetConditions/SiLorentzAngleSvc
)
# Component(s) in the package:
diff --git a/InnerDetector/InDetValidation/InDetGeometryValidation/share/ReadSiDetectorElements_jobOptions.py b/InnerDetector/InDetValidation/InDetGeometryValidation/share/ReadSiDetectorElements_jobOptions.py
index b6702d3e9111310b70b2cf0816463923f175fbb2..74951c2704b5408c137f1d2e9c0617c88f593389 100644
--- a/InnerDetector/InDetValidation/InDetGeometryValidation/share/ReadSiDetectorElements_jobOptions.py
+++ b/InnerDetector/InDetValidation/InDetGeometryValidation/share/ReadSiDetectorElements_jobOptions.py
@@ -68,7 +68,7 @@ from SiPropertiesTool.PixelSiPropertiesToolSetup import PixelSiPropertiesToolSet
pixelSiPropertiesToolSetup = PixelSiPropertiesToolSetup()
pixelSiPropertiesToolSetup.setup()
pixelSiPropertiesTool = pixelSiPropertiesToolSetup.getTool()
-from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
pixelLorentzAngleTool = pixelLorentzAngleToolSetup.PixelLorentzAngleTool
@@ -81,7 +81,7 @@ ReadPixelElements.SiConditionsTool = pixelDCSConditionsTool
# SCT
#
# Silicon Lorentz angle tool
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
sctLorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool
sctSiliconConditionsTool = sctLorentzAngleToolSetup.sctSiliconConditionsTool
diff --git a/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py b/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
index c42ebc0cd12e249bcc95e5d23a0993a064d07a81..88c83ee17639ccf259a63f704406706caa8aa30f 100644
--- a/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
+++ b/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
@@ -28,7 +28,7 @@ def CreateEgammaRotCreator():
# --- since a correction is needed to fix biases when running on new run 2 compatible calibation
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
from SiClusterizationTool.SiClusterizationToolConf import InDet__NnClusterizationFactory
@@ -61,7 +61,7 @@ def CreateEgammaRotCreator():
# load Pixel ROT creator, we overwrite the defaults for the
# tool to always make conservative pixel cluster errors
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
- from SiLorentzAngleSvc.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__PixelClusterOnTrackTool
@@ -80,7 +80,7 @@ def CreateEgammaRotCreator():
if DetFlags.haveRIO.SCT_on():
# SiLorentzAngleTool
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__SCT_ClusterOnTrackTool
egSCT_ClusterOnTrackTool = InDet__SCT_ClusterOnTrackTool ("egSCT_ClusterOnTrackTool",
diff --git a/Trigger/TrigFTK/FastTrackSimWrap/share/FastTrackSimRegionalWrap_64TowersIBL_InDetClusters_jobOptions.py b/Trigger/TrigFTK/FastTrackSimWrap/share/FastTrackSimRegionalWrap_64TowersIBL_InDetClusters_jobOptions.py
index 4ea54f381f908a8103ce759447a19be6bad35b42..0016477cf6ff15d7674ea10a0c2e81ab7da9bd9f 100644
--- a/Trigger/TrigFTK/FastTrackSimWrap/share/FastTrackSimRegionalWrap_64TowersIBL_InDetClusters_jobOptions.py
+++ b/Trigger/TrigFTK/FastTrackSimWrap/share/FastTrackSimRegionalWrap_64TowersIBL_InDetClusters_jobOptions.py
@@ -32,7 +32,7 @@ FTKSGInput.ReadTruthTracks = True
ToolSvc += FTKSGInput
# SiLorentzAngleTool for SCT
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
from TrigFTKTrackConverter.TrigFTKTrackConverterConf import TrigFTKClusterConverterTool
diff --git a/Trigger/TrigFTK/TrigFTK_RawDataAlgs/share/FTKMonitor_topOptions.py b/Trigger/TrigFTK/TrigFTK_RawDataAlgs/share/FTKMonitor_topOptions.py
index 76dd63324cc7e1c638ed7ede233bdc01976cc7b2..b853f7f2523d7367ebba71f3b6fccab3a3fbbd1e 100644
--- a/Trigger/TrigFTK/TrigFTK_RawDataAlgs/share/FTKMonitor_topOptions.py
+++ b/Trigger/TrigFTK/TrigFTK_RawDataAlgs/share/FTKMonitor_topOptions.py
@@ -33,7 +33,7 @@ FTK_RDO_Monitor.offlineTracksName="Tracks"
FTK_RDO_Monitor.FTK_DataProvider=theFTK_DataProviderSvc
from AthenaCommon.AppMgr import ToolSvc
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
FTK_RDO_Monitor.PixelLorentzAngleTool = ToolSvc.InDetTrigPixelLorentzAngleTool
FTK_RDO_Monitor.SCTLorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool
diff --git a/Trigger/TrigFTK/TrigFTK_RecExample/python/TrigFTKLoadTools.py b/Trigger/TrigFTK/TrigFTK_RecExample/python/TrigFTKLoadTools.py
index d40a71e2140c9dc0ad9ad42a8ce0312b36841463..16f50abaaf92b119a4c7f5dc76bf8711357b774c 100644
--- a/Trigger/TrigFTK/TrigFTK_RecExample/python/TrigFTKLoadTools.py
+++ b/Trigger/TrigFTK/TrigFTK_RecExample/python/TrigFTKLoadTools.py
@@ -7,7 +7,7 @@ jiri.masik@manchester.ac.uk
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
# SiLorentzAngleTool for SCT
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
from TrigFTK_RecExample.TrigFTK_DataProviderSvc_Config import TrigFTK_DataProviderSvc
diff --git a/Trigger/TrigTools/TrigFTKTrackConverter/python/TrigFTKTrackConverter_Config.py b/Trigger/TrigTools/TrigFTKTrackConverter/python/TrigFTKTrackConverter_Config.py
index 0030fd1b73887eda8cb5e53f996f969399b9b92e..92dd11e939e88f103940b75ef0de7e9abf47d5cf 100644
--- a/Trigger/TrigTools/TrigFTKTrackConverter/python/TrigFTKTrackConverter_Config.py
+++ b/Trigger/TrigTools/TrigFTKTrackConverter/python/TrigFTKTrackConverter_Config.py
@@ -68,7 +68,7 @@ class ConfiguredTrigFTKTool(TrigFTKClusterConverterTool):
def __init__(self, name = "ConfiguredTrigFTKClusterConverterTool"):
TrigFTKClusterConverterTool.__init__(self, name)
from AthenaCommon.AppMgr import ToolSvc
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
TrigFTKClusterConverterTool.PixelLorentzAngleTool = ToolSvc.InDetTrigPixelLorentzAngleTool
TrigFTKClusterConverterTool.SCTLorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool
diff --git a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecToolsFTK.py b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecToolsFTK.py
index c62802a90a8d93ee406513101619b2c510fb9250..9cc70329891002abc20cd4d13989095e9ea9fd59 100644
--- a/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecToolsFTK.py
+++ b/Trigger/TrigTools/TrigInDetConf/python/TrigInDetRecToolsFTK.py
@@ -54,7 +54,7 @@ if (InDetTrigFlags.doPrintConfigurables()):
print InDetTrigBroadPixelClusterOnTrackToolFTK
# SiLorentzAngleTool for SCT
-from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
InDetTrigBroadSCT_ClusterOnTrackToolFTK = FTK_SCTClusterOnTrackTool("InDetTrigBroadSCT_ClusterOnTrackToolFTK",
diff --git a/Trigger/TrigTools/TrigInDetTrackFitter/python/TrigInDetTrackFitter_Config.py b/Trigger/TrigTools/TrigInDetTrackFitter/python/TrigInDetTrackFitter_Config.py
index 0af00a77642ee1a8c6fa2258f940a986bcdb9058..7930fe15ed88a6de4a4b398c91323c068a3e36f8 100644
--- a/Trigger/TrigTools/TrigInDetTrackFitter/python/TrigInDetTrackFitter_Config.py
+++ b/Trigger/TrigTools/TrigInDetTrackFitter/python/TrigInDetTrackFitter_Config.py
@@ -68,7 +68,7 @@ class ConfiguredTrigL2_InDetRotCreator(Trk__RIO_OnTrackCreator) :
from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
# SiLorentzAngleTool
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
if InDetTrigFlags.doCommissioning() :
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/python/TrigOnlineSpacePointTool_Config.py b/Trigger/TrigTools/TrigOnlineSpacePointTool/python/TrigOnlineSpacePointTool_Config.py
index b55388c2af0bf1ea6a5ebc13014f8b15be85c3bc..7d3225a1a0938f65f9e04dd2e6a764c69e5fbfde 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/python/TrigOnlineSpacePointTool_Config.py
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/python/TrigOnlineSpacePointTool_Config.py
@@ -25,7 +25,7 @@ class ConfiguredOnlineSpacePointProviderTool(OnlineSpacePointProviderTool) :
from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
# --- SiLorentzAngleTool
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
InDetL2TrigClusterMakerTool = InDet__ClusterMakerTool( name = "InDetL2TrigClusterMakerTool",
@@ -59,7 +59,7 @@ class ConfiguredOnlineSpacePointProviderTool(OnlineSpacePointProviderTool) :
ToolSvc += InDetL2TrigSCT_ClusteringTool
# SiLorentzAngleTool for FastSCT_RodDecoder
- from SiLorentzAngleSvc.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
# FastSCT_RodDecoder
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
index aa5e993d021cce89244bc306e401e1f74d54b78c..1ceea268c68aaa247ed22f88dc113a53a8941236 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py
@@ -116,12 +116,12 @@ def TrigInDetCondConfig( flags ):
acc.addCondAlgo(SCT_SiliconTempCondAlg(UseState = dcsTool.ReadAllDBFolders, DCSConditionsTool = dcsTool))
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SCTSiLorentzAngleCondAlg
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SCTSiLorentzAngleCondAlg
acc.addCondAlgo(SCTSiLorentzAngleCondAlg(name = "SCTSiLorentzAngleCondAlg",
SiConditionsTool = sctSiliconConditionsTool,
UseMagFieldSvc = True,
UseMagFieldDcs = False))
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
SCTLorentzAngleTool = SiLorentzAngleTool(name = "SCTLorentzAngleTool", DetectorName="SCT", SiLorentzAngleCondData="SCTSiLorentzAngleCondData")
SCTLorentzAngleTool.UseMagFieldSvc = True #may need also MagFieldSvc instance
acc.addPublicTool(SCTLorentzAngleTool)
@@ -177,13 +177,13 @@ def TrigInDetCondConfig( flags ):
acc.addPublicTool(TrigSiPropertiesTool)
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import PixelSiLorentzAngleCondAlg
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import PixelSiLorentzAngleCondAlg
acc.addCondAlgo(PixelSiLorentzAngleCondAlg(name="PixelSiLorentzAngleCondAlg",
SiPropertiesTool=TrigSiPropertiesTool,
UseMagFieldSvc = True,
UseMagFieldDcs = False))
- from SiLorentzAngleSvc.SiLorentzAngleSvcConf import SiLorentzAngleTool
+ from SiLorentzAngleTool.SiLorentzAngleToolConf import SiLorentzAngleTool
TrigPixelLorentzAngleTool = SiLorentzAngleTool(name = "PixelLorentzAngleTool", DetectorName="Pixel", SiLorentzAngleCondData="PixelSiLorentzAngleCondData")
acc.addPublicTool(TrigPixelLorentzAngleTool)