Skip to content
Snippets Groups Projects
Commit f12582fe authored by Susumu Oda's avatar Susumu Oda
Browse files

Add IGeoModelSvc to retrieve geometry information by following...

Add IGeoModelSvc to retrieve geometry information by following PixelConditionsTools/PixelCalibDbTool
parent 20df4c4e
No related branches found
No related tags found
No related merge requests found
...@@ -14,6 +14,7 @@ atlas_depends_on_subdirs( PUBLIC ...@@ -14,6 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkTools/TrkToolInterfaces Tracking/TrkTools/TrkToolInterfaces
PRIVATE PRIVATE
DetectorDescription/AtlasDetDescr DetectorDescription/AtlasDetDescr
DetectorDescription/GeoModel/GeoModelInterfaces
DetectorDescription/Identifier DetectorDescription/Identifier
InnerDetector/InDetConditions/InDetConditionsSummaryService InnerDetector/InDetConditions/InDetConditionsSummaryService
InnerDetector/InDetConditions/SCT_ConditionsServices InnerDetector/InDetConditions/SCT_ConditionsServices
......
...@@ -25,6 +25,7 @@ class AtlasID; ...@@ -25,6 +25,7 @@ class AtlasID;
class IInDetConditionsSvc; class IInDetConditionsSvc;
class ISCT_ConfigurationConditionsSvc; class ISCT_ConfigurationConditionsSvc;
namespace InDet {class IInDetTestPixelLayerTool; } namespace InDet {class IInDetTestPixelLayerTool; }
class IGeoModelSvc;
namespace Trk { class RIO_OnTrack; class TrackStateOnSurface; class Track;} namespace Trk { class RIO_OnTrack; class TrackStateOnSurface; class Track;}
namespace Trk { class IExtrapolator;} namespace Trk { class IExtrapolator;}
...@@ -117,6 +118,9 @@ namespace InDet ...@@ -117,6 +118,9 @@ namespace InDet
ToolHandle< IInDetTestPixelLayerTool > m_pixelLayerTool; ToolHandle< IInDetTestPixelLayerTool > m_pixelLayerTool;
ServiceHandle <ISCT_ConfigurationConditionsSvc> m_sctConfCondSvc; ServiceHandle <ISCT_ConfigurationConditionsSvc> m_sctConfCondSvc;
/** Handle for IGeoModelSvc to retrieve geo model information */
ServiceHandle<IGeoModelSvc> m_geoModelSvc;
const SCT_ID* m_sct_id; const SCT_ID* m_sct_id;
/** Configure outwards hole search */ /** Configure outwards hole search */
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "InDetRecToolInterfaces/IInDetTestPixelLayerTool.h" #include "InDetRecToolInterfaces/IInDetTestPixelLayerTool.h"
#include "TrkVolumes/Volume.h" #include "TrkVolumes/Volume.h"
#include "TrkVolumes/CylinderVolumeBounds.h" #include "TrkVolumes/CylinderVolumeBounds.h"
#include "GeoModelInterfaces/IGeoModelSvc.h"
#include <set> #include <set>
//================ Constructor ================================================= //================ Constructor =================================================
...@@ -41,6 +42,7 @@ InDet::InDetTrackHoleSearchTool::InDetTrackHoleSearchTool(const std::string& t, ...@@ -41,6 +42,7 @@ InDet::InDetTrackHoleSearchTool::InDetTrackHoleSearchTool(const std::string& t,
m_sctCondSummarySvc ("SCT_ConditionsSummarySvc",n), m_sctCondSummarySvc ("SCT_ConditionsSummarySvc",n),
m_pixelLayerTool("InDet::InDetTestPixelLayerTool"), m_pixelLayerTool("InDet::InDetTestPixelLayerTool"),
m_sctConfCondSvc("SCT_ConfigurationConditionsSvc", n), m_sctConfCondSvc("SCT_ConfigurationConditionsSvc", n),
m_geoModelSvc("GeoModelSvc", n),
m_sct_id(nullptr), m_sct_id(nullptr),
m_extendedListOfHoles(false), m_extendedListOfHoles(false),
m_cosmic(false), m_cosmic(false),
...@@ -55,6 +57,7 @@ InDet::InDetTrackHoleSearchTool::InDetTrackHoleSearchTool(const std::string& t, ...@@ -55,6 +57,7 @@ InDet::InDetTrackHoleSearchTool::InDetTrackHoleSearchTool(const std::string& t,
declareProperty("SctSummarySvc" , m_sctCondSummarySvc); declareProperty("SctSummarySvc" , m_sctCondSummarySvc);
declareProperty("SctConfCondSvc" , m_sctConfCondSvc); declareProperty("SctConfCondSvc" , m_sctConfCondSvc);
declareProperty("PixelLayerTool" , m_pixelLayerTool); declareProperty("PixelLayerTool" , m_pixelLayerTool);
declareProperty("GeoModelService" , m_geoModelSvc);
declareProperty("ExtendedListOfHoles" , m_extendedListOfHoles = false); declareProperty("ExtendedListOfHoles" , m_extendedListOfHoles = false);
declareProperty("Cosmics" , m_cosmic); declareProperty("Cosmics" , m_cosmic);
declareProperty("usePixel" , m_usepix); declareProperty("usePixel" , m_usepix);
...@@ -130,6 +133,19 @@ StatusCode InDet::InDetTrackHoleSearchTool::initialize() ...@@ -130,6 +133,19 @@ StatusCode InDet::InDetTrackHoleSearchTool::initialize()
} }
} }
if(m_checkBadSCTChip) {
// Check if ITk Strip is used because isBadSCTChip method is valid only for SCT.
if(m_geoModelSvc.retrieve().isFailure()) {
ATH_MSG_FATAL("Could not locate GeoModelSvc");
return StatusCode::FAILURE;
}
if(m_geoModelSvc->geoConfig()==GeoModel::GEO_RUN4 or
m_geoModelSvc->geoConfig()==GeoModel::GEO_ITk) {
ATH_MSG_WARNING("Since ITk Strip is used, m_checkBadSCTChip is turned off.");
m_checkBadSCTChip = false;
}
}
if (m_extendedListOfHoles) if (m_extendedListOfHoles)
msg(MSG::INFO) << "Search for extended list of holes " << endmsg; msg(MSG::INFO) << "Search for extended list of holes " << endmsg;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment