diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py index dcb207141ca00276213e3037c301f4af2ac26b76..5a3e3422ff64e1192492f3656c4af9fe168d6d56 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 d256f360cb829f8e2941b442c8fb2cb15ab3958e..344b73f7c571222923baf5fe276223204e44afb4 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 deb6fcb76dd4b34186371d7d5eb242095a4d877e..0409f8144ce696fdfae61e86c125035c36e1096e 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 4367777a5908a34929dfd15cc094a89e937a7b2d..de1a5dab77842783d0af7cee62f608dfa1b54b9e 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) {