From 59a01b6777c0a4918111bceb9cb61cac2445599c Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Sun, 27 Oct 2019 19:45:28 +0000
Subject: [PATCH] Fix ATLASRECTS-5174. Declare and initialize ReadCondHandleKey
of PixelDetectorElementCollection in SiTrackerSpacePointFinder. Configure
PixelDistortionAlg in SiSPSeededTracksStandalone(FromESD).py
---
.../SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py | 3 +++
.../share/SiSPSeededTracksStandaloneFromESD.py | 3 +++
.../SiSpacePointFormation/SiTrackerSpacePointFinder.h | 1 +
.../SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx | 1 +
4 files changed, 8 insertions(+)
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
index dcb207141ca..5a3e3422ff6 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
@@ -201,6 +201,9 @@ if doPixel:
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
+ if not hasattr(condSeq, 'PixelDistortionAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDistortionAlg
+ condSeq += PixelDistortionAlg(name="PixelDistortionAlg")
# Takne from InDetRecExample/share/InDetRecLoadTools.py
from InDetRecExample.TrackingCommon import createAndAddCondAlg,getPixelClusterNnCondAlg,getPixelClusterNnWithTrackCondAlg
createAndAddCondAlg( getPixelClusterNnCondAlg, "PixelClusterNnCondAlg", GetInputsInfo = do_runI)
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
index d256f360cb8..344b73f7c57 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
@@ -188,6 +188,9 @@ if doPixel:
if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
+ if not hasattr(condSeq, 'PixelDistortionAlg'):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelDistortionAlg
+ condSeq += PixelDistortionAlg(name="PixelDistortionAlg")
# Takne from InDetRecExample/share/InDetRecLoadTools.py
from InDetRecExample.TrackingCommon import createAndAddCondAlg,getPixelClusterNnCondAlg,getPixelClusterNnWithTrackCondAlg
createAndAddCondAlg( getPixelClusterNnCondAlg, "PixelClusterNnCondAlg", GetInputsInfo = do_runI)
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
index deb6fcb76dd..0409f8144ce 100755
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/SiSpacePointFormation/SiTrackerSpacePointFinder.h
@@ -174,6 +174,7 @@ namespace InDet {
ToolHandle< SiSpacePointMakerTool > m_SiSpacePointMakerTool;
ToolHandle<GenericMonitoringTool> m_monTool{this, "monTool", "", "Monitoring tool"};
+ SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_pixelDetEleCollKey{this, "PixelDetEleCollKey", "PixelDetectorElementCollection", "Key of SiDetectorElementCollection for Pixel"};
SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_SCTDetEleCollKey{this, "SCTDetEleCollKey", "SCT_DetectorElementCollection", "Key of SiDetectorElementCollection for SCT"};
SG::ReadCondHandleKey<InDet::SiElementPropertiesTable> m_SCTPropertiesKey{this, "SCTPropertiesKey", "SCT_ElementPropertiesTable", "Key of input SiElementPropertiesTable for SCT"};
};
diff --git a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
index 4367777a590..de1a5dab778 100755
--- a/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
@@ -138,6 +138,7 @@ StatusCode SiTrackerSpacePointFinder::initialize()
// create containers (requires the Identifier Helpers)
if (m_selectPixels){
ATH_CHECK(detStore()->retrieve(m_idHelperPixel,"PixelID"));
+ ATH_CHECK(m_pixelDetEleCollKey.initialize());
}
if (m_selectSCTs) {
--
GitLab