From 3b6dc3a58e4b38ac9e168b7059a06bc9d6c80e27 Mon Sep 17 00:00:00 2001
From: Susumu Oda <Susumu.Oda@cern.ch>
Date: Mon, 21 Jan 2019 04:53:36 +0100
Subject: [PATCH] Remove SiDetectorManager.h/SCT_DetectorManager.h if possible.
Migrate SiDetectorManager.h to SCT_DetectorManager.h and/or
PixelDetectorManager.h if possible.
---
.../SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx | 2 +-
.../SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h | 4 ++--
.../InDetPrepRawDataFormation/PixelClusterization.h | 5 ++---
.../InDetPrepRawDataFormation/src/PixelClusterization.cxx | 2 +-
Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h | 7 ++++---
Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx | 7 ++-----
Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx | 1 -
Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx | 1 -
8 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx
index 547be166c22..e4d988f4621 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.cxx
@@ -8,7 +8,7 @@
#include "GaudiKernel/PhysicalConstants.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
+#include "InDetReadoutGeometry/PixelDetectorManager.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "InDetReadoutGeometry/PixelModuleDesign.h"
#include "SiPropertiesSvc/SiliconProperties.h"
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h
index daae17abcf5..8253c56259b 100644
--- a/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h
+++ b/InnerDetector/InDetConditions/SiLorentzAngleSvc/src/PixelSiLorentzAngleCondAlg.h
@@ -21,7 +21,7 @@
// forward declarations
namespace InDetDD {
- class SiDetectorManager;
+ class PixelDetectorManager;
}
namespace MagField {
@@ -38,7 +38,7 @@ class PixelSiLorentzAngleCondAlg: public AthAlgorithm {
private:
const PixelID* m_pixid;
- const InDetDD::SiDetectorManager* m_detManager;
+ const InDetDD::PixelDetectorManager* m_detManager;
ServiceHandle<ICondSvc> m_condSvc;
ServiceHandle<MagField::IMagFieldSvc> m_magFieldSvc;
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
index f6b8f2968a8..a468c5787c3 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
@@ -41,7 +41,7 @@ class PixelRDORawData;
class PixelID;
namespace InDetDD{
- class SiDetectorManager;
+ class PixelDetectorManager;
}
namespace InDet {
class PixelGangedAmbiguitiesFinder;
@@ -58,7 +58,6 @@ namespace InDet {
class PixelClusterization : public AthAlgorithm {
public:
typedef InDetRawDataCollection<PixelRDORawData> COLLECTION;
- typedef InDetDD::SiDetectorManager SiDetectorManager;
/// Constructor with parameters:
PixelClusterization(const std::string &name,ISvcLocator *pSvcLocator);
@@ -90,7 +89,7 @@ private:
SG::WriteHandleKey<SiClusterContainer> m_clusterContainerLinkKey;
SG::WriteHandleKey<PixelGangedClusterAmbiguities> m_ambiguitiesMapKey;
SG::UpdateHandleKey<InDet::PixelClusterContainerCache> m_clusterContainercacheKey;
- const SiDetectorManager* m_manager;
+ const InDetDD::PixelDetectorManager* m_manager;
};
}//end of ns
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
index 8c0f55792c0..37e961582d8 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
@@ -18,7 +18,7 @@
#include "Identifier/Identifier.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
#include "InDetIdentifier/PixelID.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
+#include "InDetReadoutGeometry/PixelDetectorManager.h"
#include "InDetPrepRawData/PixelClusterCollection.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
index bbfaae5807d..7370fcaabe9 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
@@ -17,7 +17,8 @@
namespace InDetDD {
class InDetDetectorManager;
- class SiDetectorManager;
+ class PixelDetectorManager;
+ class SCT_DetectorManager;
class TRT_DetectorManager;
}
@@ -54,8 +55,8 @@ private:
ServiceHandle<IActsTrackingGeometrySvc> m_trackingGeometrySvc;
ServiceHandle<StoreGateSvc> m_detStore;
- const InDetDD::SiDetectorManager* p_pixelManager;
- const InDetDD::SiDetectorManager* p_SCTManager;
+ const InDetDD::PixelDetectorManager* p_pixelManager;
+ const InDetDD::SCT_DetectorManager* p_SCTManager;
const InDetDD::TRT_DetectorManager* p_TRTManager;
std::vector<const GeoAlignableTransform*> m_topAligns;
diff --git a/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx b/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
index 977386546e6..0042a2872b7 100644
--- a/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/GeomShiftCondAlg.cxx
@@ -11,8 +11,8 @@
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
#include "GeoModelKernel/GeoAlignableTransform.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
#include "InDetReadoutGeometry/PixelDetectorManager.h"
+#include "InDetReadoutGeometry/SCT_DetectorManager.h"
#include "InDetReadoutGeometry/TRT_DetectorManager.h"
#include "GeoPrimitives/CLHEPtoEigenConverter.h"
#include "InDetReadoutGeometry/ExtendedAlignableTransform.h"
@@ -129,12 +129,9 @@ StatusCode GeomShiftCondAlg::execute() {
ActsAlignmentStore* alignStore = new ActsAlignmentStore();
- const InDetDD::PixelDetectorManager* pixMgr
- = dynamic_cast<const InDetDD::PixelDetectorManager*>(p_pixelManager);
-
InDetDD::PixelDetectorManager::AlignableTransformMap& atMatL1
= const_cast<InDetDD::PixelDetectorManager::AlignableTransformMap&>(
- pixMgr->m_higherAlignableTransforms.at(1));
+ p_pixelManager->m_higherAlignableTransforms.at(1));
PixelID idHelper;
diff --git a/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx b/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
index 728a9df955a..db58edd2846 100644
--- a/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
@@ -9,7 +9,6 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/EventIDBase.h"
#include "GaudiKernel/EventIDRange.h"
-#include "InDetReadoutGeometry/SiDetectorManager.h"
#include "InDetReadoutGeometry/PixelDetectorManager.h"
#include "InDetReadoutGeometry/TRT_DetectorManager.h"
diff --git a/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx b/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx
index 584f6959c27..cca2f1dcba4 100644
--- a/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx
+++ b/Trigger/TrigFTK/FTK_RecTools/src/FTK_HashIDTool.cxx
@@ -14,7 +14,6 @@
#include "InDetIdentifier/SCT_ID.h"
#include "InDetIdentifier/PixelID.h"
#include "InDetReadoutGeometry/PixelDetectorManager.h"
-#include "InDetReadoutGeometry/SCT_DetectorManager.h"
#include "InDetReadoutGeometry/PixelModuleDesign.h"
#include "InDetReadoutGeometry/SCT_ModuleSideDesign.h"
#include "InDetReadoutGeometry/SCT_BarrelModuleSideDesign.h"
--
GitLab