From e0aeed5119405cf6dbb9e94246a2e1f2fc00b0de Mon Sep 17 00:00:00 2001
From: Peter Hansen <hansenph@lxplus130.cern.ch>
Date: Thu, 21 Mar 2019 16:22:21 +0100
Subject: [PATCH] Changed name m_trtid to m_trtId in TRT_ConditionsServices
---
.../TRT_ConditionsData/src/HTcalculator.cxx | 1 +
.../src/TRT_CalDbTool.cxx | 6 ++---
.../src/TRT_CalDbTool.h | 8 +++----
.../src/TRT_StrawStatusSummaryTool.cxx | 22 +++++++++----------
.../src/TRT_StrawStatusSummaryTool.h | 2 +-
5 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/src/HTcalculator.cxx b/InnerDetector/InDetConditions/TRT_ConditionsData/src/HTcalculator.cxx
index 9e418e49bb8..e1327d298bb 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/src/HTcalculator.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/src/HTcalculator.cxx
@@ -3,6 +3,7 @@
*/
#include "TRT_ConditionsData/HTcalculator.h"
#include "AsgTools/MsgStreamMacros.h"
+
/*****************************************************************************\
|*%%% Default Constructor %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*|
\*****************************************************************************/
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.cxx
index 64ffda6e934..7ddea9aa521 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.cxx
@@ -22,7 +22,7 @@
TRT_CalDbTool::TRT_CalDbTool( const std::string& type, const std::string& name, const IInterface* parent)
: base_class(type, name, parent),
- m_trtid(0),
+ m_trtId(0),
m_detstore("DetectorStore",name),
m_mutex{},
m_Rtcache{},
@@ -55,7 +55,7 @@ StatusCode TRT_CalDbTool::initialize()
}
// Get the TRT ID helper
- StatusCode sc = m_detstore->retrieve(m_trtid,"TRT_ID");
+ StatusCode sc = m_detstore->retrieve(m_trtId,"TRT_ID");
if(sc.isFailure()) {
ATH_MSG_FATAL("Problem retrieving TRTID helper");
return StatusCode::FAILURE;
@@ -243,7 +243,7 @@ double TRT_CalDbTool::driftRadius(const double& time, float& t0, const Identifie
if (rtr != 0)
radius = rtr->radius( time - t0 );
else
- ATH_MSG_FATAL(" cannot find an rt-relation for TRT layer_or_wheel " << m_trtid->layer_or_wheel(ident) << " Please check IOV ranges ");
+ ATH_MSG_FATAL(" cannot find an rt-relation for TRT layer_or_wheel " << m_trtId->layer_or_wheel(ident) << " Please check IOV ranges ");
ATH_MSG_VERBOSE(" time " << time << " t0 " << t0 << " t " << time-t0 << " radius " << radius);
//
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.h
index 9e40dece7b4..a4f2b273ed7 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_CalDbTool.h
@@ -87,7 +87,7 @@ class TRT_CalDbTool: public extends<AthAlgTool, ITRT_CalDbTool>
virtual const StrawT0Container* getT0Container() const override;
private:
- const TRT_ID* m_trtid; //!< id helper
+ const TRT_ID* m_trtId; //!< id helper
ServiceHandle<StoreGateSvc> m_detstore;
/// mutex to protect cache updates
@@ -131,9 +131,9 @@ class TRT_CalDbTool: public extends<AthAlgTool, ITRT_CalDbTool>
inline TRTCond::ExpandedIdentifier
TRT_CalDbTool::trtcondid( const Identifier& id, int level) const
{
- return TRTCond::ExpandedIdentifier( m_trtid->barrel_ec(id),m_trtid->layer_or_wheel(id),
- m_trtid->phi_module(id),m_trtid->straw_layer(id),
- m_trtid->straw(id),level ) ;
+ return TRTCond::ExpandedIdentifier( m_trtId->barrel_ec(id),m_trtId->layer_or_wheel(id),
+ m_trtId->phi_module(id),m_trtId->straw_layer(id),
+ m_trtId->straw(id),level ) ;
}
inline const TRTCond::RtRelation*
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
index 0248ca4f31b..ae77b2bcbff 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.cxx
@@ -35,7 +35,7 @@ TRT_StrawStatusSummaryTool::TRT_StrawStatusSummaryTool( const std::string& type,
m_par_strawstatuscontainerkey("/TRT/Cond/Status"),
m_par_strawstatuspermanentcontainerkey("/TRT/Cond/StatusPermanent"),
m_par_strawstatusHTcontainerkey("/TRT/Cond/StatusHT"),
- m_trtid(0),
+ m_trtId(0),
m_condSvc("CondSvc",name),
m_statReadKey("/TRT/Cond/Status"),
m_permReadKey("/TRT/Cond/StatusPermanent"),
@@ -81,7 +81,7 @@ StatusCode TRT_StrawStatusSummaryTool::initialize()
}
// Get the TRT ID helper
- if (StatusCode::SUCCESS!=m_detStore->retrieve(m_trtid,"TRT_ID")) {
+ if (StatusCode::SUCCESS!=m_detStore->retrieve(m_trtId,"TRT_ID")) {
ATH_MSG_FATAL("Problem retrieving TRTID helper");
return StatusCode::FAILURE;
}
@@ -122,9 +122,9 @@ StatusCode TRT_StrawStatusSummaryTool::finalize()
int TRT_StrawStatusSummaryTool::getStatus(Identifier offlineID) const{
int stat = 0;
int level = TRTCond::ExpandedIdentifier::STRAW ;
- TRTCond::ExpandedIdentifier id= TRTCond::ExpandedIdentifier( m_trtid->barrel_ec(offlineID),m_trtid->layer_or_wheel(offlineID),
- m_trtid->phi_module(offlineID),m_trtid->straw_layer(offlineID),
- m_trtid->straw(offlineID),level );
+ TRTCond::ExpandedIdentifier id= TRTCond::ExpandedIdentifier( m_trtId->barrel_ec(offlineID),m_trtId->layer_or_wheel(offlineID),
+ m_trtId->phi_module(offlineID),m_trtId->straw_layer(offlineID),
+ m_trtId->straw(offlineID),level );
const StrawStatusContainer* strawstatuscontainer = getStrawStatusContainer();
static int countStrawStatusContainerError(0);
if (!strawstatuscontainer) {
@@ -143,9 +143,9 @@ int TRT_StrawStatusSummaryTool::getStatus(Identifier offlineID) const{
int TRT_StrawStatusSummaryTool::getStatusPermanent(Identifier offlineID) const{
int stat = 0;
int level = TRTCond::ExpandedIdentifier::STRAW ;
- TRTCond::ExpandedIdentifier id= TRTCond::ExpandedIdentifier( m_trtid->barrel_ec(offlineID),m_trtid->layer_or_wheel(offlineID),
- m_trtid->phi_module(offlineID),m_trtid->straw_layer(offlineID),
- m_trtid->straw(offlineID),level );
+ TRTCond::ExpandedIdentifier id= TRTCond::ExpandedIdentifier( m_trtId->barrel_ec(offlineID),m_trtId->layer_or_wheel(offlineID),
+ m_trtId->phi_module(offlineID),m_trtId->straw_layer(offlineID),
+ m_trtId->straw(offlineID),level );
const StrawStatusContainer* strawstatuspermanentcontainer = getStrawStatusPermanentContainer();
static int countStrawStatusContainerError(0);
if (!strawstatuspermanentcontainer) {
@@ -163,9 +163,9 @@ int TRT_StrawStatusSummaryTool::getStatusPermanent(Identifier offlineID) const{
int TRT_StrawStatusSummaryTool::getStatusHT(Identifier offlineID) const{
int stat = 0;
int level = TRTCond::ExpandedIdentifier::STRAW ;
- TRTCond::ExpandedIdentifier id= TRTCond::ExpandedIdentifier( m_trtid->barrel_ec(offlineID),m_trtid->layer_or_wheel(offlineID),
- m_trtid->phi_module(offlineID),m_trtid->straw_layer(offlineID),
- m_trtid->straw(offlineID),level );
+ TRTCond::ExpandedIdentifier id= TRTCond::ExpandedIdentifier( m_trtId->barrel_ec(offlineID),m_trtId->layer_or_wheel(offlineID),
+ m_trtId->phi_module(offlineID),m_trtId->straw_layer(offlineID),
+ m_trtId->straw(offlineID),level );
const StrawStatusContainer* strawstatusHTcontainer = getStrawStatusHTContainer();
static int countStrawStatusContainerError(0);
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.h b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.h
index d993c08413a..c02352d3eb6 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_StrawStatusSummaryTool.h
@@ -68,7 +68,7 @@ class TRT_StrawStatusSummaryTool: public extends<AthAlgTool, ITRT_StrawStatusSum
std::string m_par_strawstatusHTcontainerkey;
- const TRT_ID* m_trtid;
+ const TRT_ID* m_trtId;
ServiceHandle<ICondSvc> m_condSvc;
// ReadHandle keys
--
GitLab