diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/IAlgToolCalo.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/IAlgToolCalo.h index 908fe6ae24b93e28b9363d3f1991ebfedbde4b7d..cbe4e2178dab52e7e98718d72a7f1f4cc79cf824 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/IAlgToolCalo.h +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/IAlgToolCalo.h @@ -209,7 +209,7 @@ class IAlgToolCalo: public virtual IAlgTool, CaloCellContainer** m_CaloCellContPoint; // Objects that the Tools should not worry about protected: - bool lardecoded, tiledecoded; + bool m_lardecoded, m_tiledecoded; /** error control */ uint32_t m_error; /** caloDDE (of the cluster 2nd layer hottest cell) */ diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/IAlgToolCalo.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/IAlgToolCalo.cxx index e2e5759757dcb2f6a5b71e3650aea9a25d1f6ba2..327d6f0f7ff9d78395e67df635c85513715d62dd 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/IAlgToolCalo.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/IAlgToolCalo.cxx @@ -80,8 +80,8 @@ StatusCode IAlgToolCalo::initialize() if ( m_limit.size() != 0 ){ m_calib->initialize(m_limit,m_dimension,m_correction); } - lardecoded=true; - tiledecoded=true; + m_lardecoded=true; + m_tiledecoded=true; return StatusCode::SUCCESS; } // End of initialize @@ -392,14 +392,14 @@ void IAlgToolCalo::storeCells( void ) { } } // End of if retrieve // Now I have a LAr container - if ( lardecoded ) + if ( m_lardecoded ) for ( m_it = m_iBegin; m_it != m_iEnd; ++m_it) { CaloCell* larcell = (CaloCell*)(*m_it)->clone(); ContainerLAr->push_back(larcell); } ATH_MSG_DEBUG( "LAr Container size : " << ContainerLAr->size() ); // Now I have a Tile container - if ( tiledecoded ) + if ( m_tiledecoded ) for ( m_itt = m_itBegin; m_itt != m_itEnd; ++m_itt) { CaloCell* tilecell = (CaloCell*)(*m_itt)->clone(); ContainerTile->push_back(tilecell); diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/CosmicHadEnFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/CosmicHadEnFex.cxx index 6aa4a3eff2b65aa0c753b63bb22de74678f1c400..35192b4467d27b1378a9fd30cb291a935434be16 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/CosmicHadEnFex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/CosmicHadEnFex.cxx @@ -44,8 +44,8 @@ CosmicHadEnFex::~CosmicHadEnFex(){ StatusCode CosmicHadEnFex::execute(TrigEMCluster &rtrigEmCluster,double etamin, double etamax, double phimin, double phimax){ - lardecoded=false; - tiledecoded=false; + m_lardecoded=false; + m_tiledecoded=false; // Time total AlgTool time if (!m_timersvc.empty()) m_timer[0]->start(); @@ -100,7 +100,7 @@ StatusCode CosmicHadEnFex::execute(TrigEMCluster &rtrigEmCluster,double etamin, // For the others no if ( m_data->LoadCollections(m_itBegin,m_itEnd,iR,!iR).isFailure() ) return StatusCode::FAILURE; - tiledecoded=true; + m_tiledecoded=true; if ( m_saveCells ) IAlgToolCalo::storeCells(); // Finished to access Collection if (!m_timersvc.empty()) m_timer[2]->pause(); diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/CosmicSamp2Fex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/CosmicSamp2Fex.cxx index 85d2d215f6a09e5be9f2ec45be5b58e12883a379..ea92895a3e1e4d3e2958243ff9a687b59ebf7906 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/CosmicSamp2Fex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloCosmic/src/CosmicSamp2Fex.cxx @@ -39,8 +39,8 @@ CosmicSamp2Fex::~CosmicSamp2Fex(){ StatusCode CosmicSamp2Fex::execute(TrigEMCluster &rtrigEmCluster, const IRoiDescriptor& roi ) { - lardecoded=false; - tiledecoded=false; + m_lardecoded=false; + m_tiledecoded=false; // Time total AlgTool time if (!m_timersvc.empty()) m_timer[0]->start(); @@ -62,7 +62,7 @@ StatusCode CosmicSamp2Fex::execute(TrigEMCluster &rtrigEmCluster, if ( m_data->LoadCollections(m_iBegin,m_iEnd).isFailure() ) return StatusCode::FAILURE; - lardecoded=true; + m_lardecoded=true; if ( m_saveCells ) IAlgToolCalo::storeCells(); // Finished to access Collection if (!m_timersvc.empty()) m_timer[2]->stop(); diff --git a/Trigger/TrigAlgorithms/TrigT2CaloTileMon/src/TileMonHadEnFex.cxx b/Trigger/TrigAlgorithms/TrigT2CaloTileMon/src/TileMonHadEnFex.cxx index f3dc56cb79b46b7def99a486c16a240c9341d87a..ec5551a799c1138646b0fa670bae934f973d002c 100755 --- a/Trigger/TrigAlgorithms/TrigT2CaloTileMon/src/TileMonHadEnFex.cxx +++ b/Trigger/TrigAlgorithms/TrigT2CaloTileMon/src/TileMonHadEnFex.cxx @@ -273,7 +273,7 @@ StatusCode TileMonHadEnFex::execute(TrigEMCluster &/*rtrigEmCluster*/,double eta // If there was a problem in configuration, stop now if ( !m_configured ) return StatusCode::SUCCESS; - tiledecoded=false; + m_tiledecoded=false; // Time total AlgTool time if (!m_timersvc.empty()) m_timer[0]->start();