diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py index 98b9dcc51d4244dc63002c903ba5e0b50cff21a4..a826109ac606f7fb201466dd07131b18d1922b68 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py @@ -339,8 +339,7 @@ if InDetFlags.doPattern(): # Igors propagator needed by Igors tools # from TrkExRungeKuttaPropagator.TrkExRungeKuttaPropagatorConf import Trk__RungeKuttaPropagator as Propagator - InDetPatternPropagator = Propagator(name = 'InDetPatternPropagator', - UseCondObj = False) + InDetPatternPropagator = Propagator(name = 'InDetPatternPropagator') ToolSvc += InDetPatternPropagator if (InDetFlags.doPrintConfigurables()): printfunc ( InDetPatternPropagator) diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/TrkExRungeKuttaPropagator/RungeKuttaPropagator.h b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/TrkExRungeKuttaPropagator/RungeKuttaPropagator.h index b1d07ac7fb75a411ff96508b2dbbf594f0d1488e..7cd43f637cb42c35ab84512f8d5cb3063bed0966 100755 --- a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/TrkExRungeKuttaPropagator/RungeKuttaPropagator.h +++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/TrkExRungeKuttaPropagator/RungeKuttaPropagator.h @@ -488,9 +488,6 @@ namespace Trk { double m_straightStep ; // max step whith srtaight line model bool m_usegradient ; // use magnetif field gradient - // temporary flag to be able to avoid the use of the AtlasFieldCacheCondObj - Gaudi::Property<bool> m_useCondObj {this, "UseCondObj", true, "Use the conditions object to fetch the field cache"}; - // Read handle for conditions object to get the field cache SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCondObjInputKey {this, "AtlasFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"}; void getFieldCacheObject(Cache& cache, const EventContext& ctx) const; diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/RungeKuttaPropagator.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/RungeKuttaPropagator.cxx index a29154f62a19a77d7438f770e7a32b7ba4ee1bc5..7f1c6d06c6ef1cd616e470f954c3a3ec1994c481 100755 --- a/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/RungeKuttaPropagator.cxx +++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaPropagator/src/RungeKuttaPropagator.cxx @@ -51,12 +51,9 @@ StatusCode Trk::RungeKuttaPropagator::initialize() // temporarily protect the use of the field cond object/field cache for clients with IOV callbacks // Read handle for AtlasFieldCacheCondObj - ATH_CHECK( m_fieldCondObjInputKey.initialize(m_useCondObj) ); - if (m_useCondObj) ATH_MSG_INFO("initialize() init key: " << m_fieldCondObjInputKey.key()); - else ATH_MSG_INFO("initialize() DID NOT init key: " << m_fieldCondObjInputKey.key()); - + ATH_CHECK( m_fieldCondObjInputKey.initialize() ); + ATH_MSG_INFO("initialize() init key: " << m_fieldCondObjInputKey.key()); -// msg(MSG::INFO) << name() <<" initialize() successful" << endmsg; return StatusCode::SUCCESS; } @@ -1986,21 +1983,18 @@ void Trk::RungeKuttaPropagator::propagateStep(const EventContext& ctx, void Trk::RungeKuttaPropagator::getFieldCacheObject( Cache& cache,const EventContext& ctx) const { - if (m_useCondObj) { - - SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCondObjInputKey, ctx}; - const AtlasFieldCacheCondObj* fieldCondObj{*readHandle}; - if (fieldCondObj == nullptr) { + SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCondObjInputKey, ctx}; + const AtlasFieldCacheCondObj* fieldCondObj{*readHandle}; + if (fieldCondObj == nullptr) { - // temporarily protect for when cache a cannot be retrieved in an IOV callback - ATH_MSG_ERROR("extrapolate: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCondObjInputKey.key() - << ". Skipping use of field cache!"); + // temporarily protect for when cache a cannot be retrieved in an IOV callback + ATH_MSG_ERROR("extrapolate: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCondObjInputKey.key() + << ". Skipping use of field cache!"); - // ATH_MSG_ERROR("extrapolate: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCondObjInputKey.key()); - // return; - } - fieldCondObj->getInitializedCache (cache.m_fieldCache); + // ATH_MSG_ERROR("extrapolate: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCondObjInputKey.key()); + // return; } + fieldCondObj->getInitializedCache (cache.m_fieldCache); }