From 6ab2e7ebe72a302f643dfc71df9cc512bc086ab1 Mon Sep 17 00:00:00 2001 From: Susumu Oda <susumu.oda@cern.ch> Date: Tue, 5 Mar 2019 14:25:29 +0100 Subject: [PATCH 1/3] Change SiLorentzAngleSvc to SiLorentzAngleTool in files --- .../SiLorentzAngleSvc/CMakeLists.txt | 10 +++++----- .../ATLAS_CHECK_THREAD_SAFETY | 2 +- .../SiLorentzAngleSvc/doc/packagedoc.h | 18 +++++++++--------- .../python/PixelLorentzAngleToolSetup.py | 4 ++-- .../python/SCTLorentzAngleToolSetup.py | 2 +- .../python/SiLorentzAngleSvcConfig.py | 4 ++-- .../python/SiLorentzAngleSvcConfigDb.py | 4 ++-- .../share/testSCTLorentzAngle.py | 4 ++-- .../src/PixelSiLorentzAngleCondAlg.h | 2 +- .../src/SCTSiLorentzAngleCondAlg.h | 2 +- .../src/SiLorentzAngleCondData.cxx | 2 +- .../SiLorentzAngleSvc/src/SiLorentzAngleTool.h | 2 +- .../python/FastSiDigitizationConfig.py | 4 ++-- .../python/PixelDigitizationConfig.py | 4 ++-- .../python/SCT_DigitizationConfig.py | 2 +- .../InDetPrepRawDataToxAOD/share/InDetDxAOD.py | 2 +- .../share/testSCTDecode.py | 4 ++-- .../share/ElectronEoverPTracking.py | 2 +- .../share/ReadSiDetectorElements_jobOptions.py | 4 ++-- .../share/InDetRecConditionsAccess.py | 4 ++-- .../InDetRecExample/share/InDetRecLoadTools.py | 12 ++++++------ .../share/InDetRecPreProcessingSilicon.py | 4 ++-- .../python/InDetTrigConfigConditions.py | 8 ++++---- .../python/InDetTrigConfigRecLoadTools.py | 2 +- .../share/ElectronEoverPTracking.py | 2 +- .../InDetPrepRawDataFormation/CMakeLists.txt | 2 +- .../share/ReadSiDetectorElements_jobOptions.py | 4 ++-- .../egammaRec/python/EMCommonRefitter.py | 6 +++--- ...rap_64TowersIBL_InDetClusters_jobOptions.py | 2 +- .../share/FTKMonitor_topOptions.py | 2 +- .../python/TrigFTKLoadTools.py | 2 +- .../python/TrigFTKTrackConverter_Config.py | 2 +- .../python/TrigInDetRecToolsFTK.py | 2 +- .../python/TrigInDetTrackFitter_Config.py | 2 +- .../python/TrigOnlineSpacePointTool_Config.py | 4 ++-- .../TrigUpgradeTest/python/InDetConfig.py | 8 ++++---- 36 files changed, 73 insertions(+), 73 deletions(-) diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt b/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt index 50f42535de49..86125e6f55e0 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY index 8fd15b490e94..372bf00d2df1 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY @@ -1 +1 @@ -InnerDetector/InDetConditions/SiLorentzAngleSvc +InnerDetector/InDetConditions/SiLorentzAngleTool diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h b/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h index c83b51348904..6b1909528d45 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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/SiLorentzAngleSvc/python/PixelLorentzAngleToolSetup.py index f6bad11a9b68..f9f0e2b6d0e3 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/PixelLorentzAngleToolSetup.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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/SiLorentzAngleSvc/python/SCTLorentzAngleToolSetup.py index e259c39cc974..270b01b6f0a4 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleToolSetup.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py index 305fe9fe0e1e..00c6e6103ce8 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.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/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py index 77499920a058..2176f55ea05d 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py @@ -4,5 +4,5 @@ from AthenaCommon.CfgGetter import addTool -addTool("SiLorentzAngleSvc.SiLorentzAngleSvcConfig.getSCTLorentzAngleTool", "SCTLorentzAngleTool") -addTool("SiLorentzAngleSvc.SiLorentzAngleSvcConfig.getPixelLorentzAngleTool", "PixelLorentzAngleTool") +addTool("SiLorentzAngleTool.SiLorentzAngleToolConfig.getSCTLorentzAngleTool", "SCTLorentzAngleTool") +addTool("SiLorentzAngleTool.SiLorentzAngleToolConfig.getPixelLorentzAngleTool", "PixelLorentzAngleTool") diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/share/testSCTLorentzAngle.py b/InnerDetector/InDetConditions/SiLorentzAngleSvc/share/testSCTLorentzAngle.py index 2824eb152213..0da2a95e94f9 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/share/testSCTLorentzAngle.py +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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.h b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h index 0537d770ab0d..6cc0db2b2612 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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.h b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleCondAlg.h index 189038555b48..f8819e341189 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleCondAlg.h +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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/SiLorentzAngleCondData.cxx b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleCondData.cxx index ffbcb3921920..5ecd26e94802 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleCondData.cxx +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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.h b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h index 37a02d769139..80a054455c28 100644 --- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h +++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/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/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py b/InnerDetector/InDetDigitization/FastSiDigitization/python/FastSiDigitizationConfig.py index f661898dcc59..216d0071c575 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 f676c1442aea..971dd4962dc8 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 0f8996f573ed..a753c90b1b32 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 b757c8256324..6b51841abe78 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 f67b4de2e4d7..4e62db0218b7 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 d0c8b10b17be..48d91adf59a5 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 f417a79e9e75..14186022d588 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 e84ea5da7869..ef043d6801ff 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 b1b74a7ec6e2..fe6329886ca0 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 57a5bf0ee8ae..3eba016b1616 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 dcef27870564..a6e0389c9113 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 bfc77bbc0089..d9c5eb709bce 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 50868637b9b5..e46f6e1db332 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 a08cf39d9142..d254eafd0ebd 100644 --- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt +++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt @@ -23,7 +23,7 @@ atlas_depends_on_subdirs( PUBLIC InnerDetector/InDetDetDescr/InDetReadoutGeometry InnerDetector/InDetRecTools/TRT_DriftCircleTool InnerDetector/InDetConditions/SCT_ConditionsData - InnerDetector/InDetConditions/SiLorentzAngleSvc + InnerDetector/InDetConditions/SiLorentzAngleTool ) # Component(s) in the package: diff --git a/InnerDetector/InDetValidation/InDetGeometryValidation/share/ReadSiDetectorElements_jobOptions.py b/InnerDetector/InDetValidation/InDetGeometryValidation/share/ReadSiDetectorElements_jobOptions.py index b6702d3e9111..74951c2704b5 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 c42ebc0cd12e..88c83ee17639 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 4ea54f381f90..0016477cf6ff 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 76dd63324cc7..b853f7f2523d 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 d40a71e2140c..16f50abaaf92 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 0030fd1b7388..92dd11e939e8 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 c62802a90a8d..9cc703298910 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 0af00a77642e..7930fe15ed88 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 b55388c2af0b..7d3225a1a093 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 e8c25f0b6884..9bdce5fb7333 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) -- GitLab From 55733e63f50ce9cdb127098e3a8909b2affc666f Mon Sep 17 00:00:00 2001 From: Susumu Oda <susumu.oda@cern.ch> Date: Tue, 5 Mar 2019 14:28:58 +0100 Subject: [PATCH 2/3] Move SiLorentzAngleSvc to SiLorentzAngleTool in locations --- .../{SiLorentzAngleSvc => SiLorentzAngleTool}/CMakeLists.txt | 0 .../SiLorentzAngleTool}/ATLAS_CHECK_THREAD_SAFETY | 0 .../SiLorentzAngleTool}/SiLorentzAngleCondData.h | 0 .../{SiLorentzAngleSvc => SiLorentzAngleTool}/doc/packagedoc.h | 0 .../python/PixelLorentzAngleToolSetup.py | 0 .../python/SCTLorentzAngleToolSetup.py | 0 .../python/SiLorentzAngleToolConfig.py} | 0 .../python/SiLorentzAngleToolConfigDb.py} | 0 .../{SiLorentzAngleSvc => SiLorentzAngleTool}/python/__init__.py | 0 .../share/testSCTLorentzAngle.py | 0 .../src/PixelSiLorentzAngleCondAlg.cxx | 0 .../src/PixelSiLorentzAngleCondAlg.h | 0 .../src/SCTSiLorentzAngleCondAlg.cxx | 0 .../src/SCTSiLorentzAngleCondAlg.h | 0 .../src/SCTSiLorentzAngleTestAlg.cxx | 0 .../src/SCTSiLorentzAngleTestAlg.h | 0 .../src/SiLorentzAngleCondData.cxx | 0 .../src/SiLorentzAngleTool.cxx | 0 .../src/SiLorentzAngleTool.h | 0 .../src/components/SiLorentzAngleTool_entries.cxx} | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/CMakeLists.txt (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc/SiLorentzAngleSvc => SiLorentzAngleTool/SiLorentzAngleTool}/ATLAS_CHECK_THREAD_SAFETY (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc/SiLorentzAngleSvc => SiLorentzAngleTool/SiLorentzAngleTool}/SiLorentzAngleCondData.h (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/doc/packagedoc.h (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/python/PixelLorentzAngleToolSetup.py (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/python/SCTLorentzAngleToolSetup.py (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py => SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py} (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py => SiLorentzAngleTool/python/SiLorentzAngleToolConfigDb.py} (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/python/__init__.py (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/share/testSCTLorentzAngle.py (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/PixelSiLorentzAngleCondAlg.cxx (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/PixelSiLorentzAngleCondAlg.h (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/SCTSiLorentzAngleCondAlg.cxx (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/SCTSiLorentzAngleCondAlg.h (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/SCTSiLorentzAngleTestAlg.cxx (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/SCTSiLorentzAngleTestAlg.h (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/SiLorentzAngleCondData.cxx (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/SiLorentzAngleTool.cxx (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc => SiLorentzAngleTool}/src/SiLorentzAngleTool.h (100%) rename InnerDetector/InDetConditions/{SiLorentzAngleSvc/src/components/SiLorentzAngleSvc_entries.cxx => SiLorentzAngleTool/src/components/SiLorentzAngleTool_entries.cxx} (100%) diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt b/InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt similarity index 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/CMakeLists.txt rename to InnerDetector/InDetConditions/SiLorentzAngleTool/CMakeLists.txt diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetConditions/SiLorentzAngleTool/SiLorentzAngleTool/ATLAS_CHECK_THREAD_SAFETY similarity index 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/SiLorentzAngleSvc/ATLAS_CHECK_THREAD_SAFETY rename to InnerDetector/InDetConditions/SiLorentzAngleTool/SiLorentzAngleTool/ATLAS_CHECK_THREAD_SAFETY 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 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/doc/packagedoc.h rename to InnerDetector/InDetConditions/SiLorentzAngleTool/doc/packagedoc.h diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/PixelLorentzAngleToolSetup.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py similarity index 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/python/PixelLorentzAngleToolSetup.py rename to InnerDetector/InDetConditions/SiLorentzAngleTool/python/PixelLorentzAngleToolSetup.py diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleToolSetup.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py similarity index 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SCTLorentzAngleToolSetup.py rename to InnerDetector/InDetConditions/SiLorentzAngleTool/python/SCTLorentzAngleToolSetup.py diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py similarity index 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfig.py rename to InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfig.py diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfigDb.py similarity index 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/python/SiLorentzAngleSvcConfigDb.py rename to InnerDetector/InDetConditions/SiLorentzAngleTool/python/SiLorentzAngleToolConfigDb.py 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 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/share/testSCTLorentzAngle.py rename to InnerDetector/InDetConditions/SiLorentzAngleTool/share/testSCTLorentzAngle.py 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 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/PixelSiLorentzAngleCondAlg.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 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SCTSiLorentzAngleCondAlg.h rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SCTSiLorentzAngleCondAlg.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 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleCondData.cxx rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleCondData.cxx 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 100% rename from InnerDetector/InDetConditions/SiLorentzAngleSvc/src/SiLorentzAngleTool.h rename to InnerDetector/InDetConditions/SiLorentzAngleTool/src/SiLorentzAngleTool.h 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 -- GitLab From d292039e1985aa052ba401327d157943975568f6 Mon Sep 17 00:00:00 2001 From: Susumu Oda <susumu.oda@cern.ch> Date: Thu, 7 Mar 2019 07:46:35 +0100 Subject: [PATCH 3/3] Remove unnecessary dependence. --- .../InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/CMakeLists.txt index d254eafd0ebd..cd3ae93527b6 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/SiLorentzAngleTool ) # Component(s) in the package: -- GitLab