From dbfd3490ba2d71f231efa9b2e3aaaeac91665fd5 Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Thu, 11 Jan 2018 15:36:50 +0100
Subject: [PATCH] CavernInfraGeoModel: Comply with ATLAS naming conventions.
Private data members should start with m_.
Identifiers should not start with underscores.
Former-commit-id: 11f5946862d5ecfb25ffcc1313078df0d96526c8
---
.../src/CavernInfraDetectorFactory.cxx | 18 +++++++++---------
.../src/CavernInfraDetectorFactory.h | 6 +++---
.../src/CavernInfraDetectorFactory01.cxx | 18 +++++++++---------
.../src/CavernInfraDetectorFactory01.h | 6 +++---
.../src/CavernInfraDetectorTool.cxx | 6 +++---
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx
index 296943cd1cc..0baf848ca2e 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx
@@ -30,9 +30,9 @@
CavernInfraDetectorFactory::CavernInfraDetectorFactory(StoreGateSvc *detStore,
IRDBAccessSvc *pAccess)
- :detectorManager(NULL),
- detectorStore(detStore),
- access(pAccess)
+ :m_detectorManager(NULL),
+ m_detectorStore(detStore),
+ m_access(pAccess)
{
}
@@ -42,10 +42,10 @@ CavernInfraDetectorFactory::~CavernInfraDetectorFactory()
void CavernInfraDetectorFactory::create(GeoPhysVol *world)
{
- detectorManager=new CavernInfraDetectorManager();
+ m_detectorManager=new CavernInfraDetectorManager();
const DataHandle<StoredMaterialManager> materialManager;
- if (StatusCode::SUCCESS != detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
+ if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
return;
}
@@ -56,7 +56,7 @@ void CavernInfraDetectorFactory::create(GeoPhysVol *world)
const GeoMaterial *shieldSteel = materialManager->getMaterial("shield::ShieldSteel");
// Get Recordset CavernElements.
- IRDBRecordset_ptr cavernElements = access->getRecordsetPtr("CavernElements",m_versionTag,m_versionNode);
+ IRDBRecordset_ptr cavernElements = m_access->getRecordsetPtr("CavernElements",m_versionTag,m_versionNode);
std::map<std::string, unsigned int> elementMap;
@@ -436,14 +436,14 @@ void CavernInfraDetectorFactory::create(GeoPhysVol *world)
//// NOW INSERT ALL OF THIS INTO THE WORLD.
- detectorManager->addTreeTop(sx1);
- detectorManager->addTreeTop(bedrock);
+ m_detectorManager->addTreeTop(sx1);
+ m_detectorManager->addTreeTop(bedrock);
}
const CavernInfraDetectorManager * CavernInfraDetectorFactory::getDetectorManager() const
{
- return detectorManager;
+ return m_detectorManager;
}
void CavernInfraDetectorFactory::setTagNode(std::string tag, std::string node)
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h
index e316564417c..3bb555a89f7 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h
@@ -38,10 +38,10 @@ class CavernInfraDetectorFactory : public GeoVDetectorFactory
CavernInfraDetectorFactory(const CavernInfraDetectorFactory &right);
// The manager:
- CavernInfraDetectorManager *detectorManager;
+ CavernInfraDetectorManager *m_detectorManager;
- StoreGateSvc *detectorStore;
- IRDBAccessSvc *access;
+ StoreGateSvc *m_detectorStore;
+ IRDBAccessSvc *m_access;
std::string m_versionTag;
std::string m_versionNode;
};
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx
index 0869847dcdb..6e95b482722 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.cxx
@@ -44,9 +44,9 @@ using namespace GeoXF;
CavernInfraDetectorFactory01::CavernInfraDetectorFactory01(StoreGateSvc *detStore,
IRDBAccessSvc *pAccess)
- :detectorManager(NULL),
- detectorStore(detStore),
- access(pAccess)
+ :m_detectorManager(NULL),
+ m_detectorStore(detStore),
+ m_access(pAccess)
{
}
@@ -57,10 +57,10 @@ CavernInfraDetectorFactory01::~CavernInfraDetectorFactory01()
void CavernInfraDetectorFactory01::create(GeoPhysVol *world)
{
- detectorManager=new CavernInfraDetectorManager();
+ m_detectorManager=new CavernInfraDetectorManager();
const DataHandle<StoredMaterialManager> materialManager;
- if (StatusCode::SUCCESS != detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
+ if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
return;
}
@@ -71,7 +71,7 @@ void CavernInfraDetectorFactory01::create(GeoPhysVol *world)
const GeoMaterial *shieldSteel = materialManager->getMaterial("shield::ShieldSteel");
// Get Recordset CavernElements.
- IRDBRecordset_ptr cavernElements = access->getRecordsetPtr("CavernElements", "CavernElements-02");
+ IRDBRecordset_ptr cavernElements = m_access->getRecordsetPtr("CavernElements", "CavernElements-02");
std::map<std::string, unsigned int> elementMap;
@@ -377,15 +377,15 @@ void CavernInfraDetectorFactory01::create(GeoPhysVol *world)
//// NOW INSERT ALL OF THIS INTO THE WORLD.
- detectorManager->addTreeTop(sx1);
- detectorManager->addTreeTop(bedrock);
+ m_detectorManager->addTreeTop(sx1);
+ m_detectorManager->addTreeTop(bedrock);
}
const CavernInfraDetectorManager * CavernInfraDetectorFactory01::getDetectorManager() const
{
- return detectorManager;
+ return m_detectorManager;
}
void CavernInfraDetectorFactory01::setTagNode(std::string tag, std::string node)
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h
index cc3d217eac0..96c5446b175 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h
@@ -40,10 +40,10 @@ class CavernInfraDetectorFactory01 : public GeoVDetectorFactory
CavernInfraDetectorFactory01(const CavernInfraDetectorFactory01 &right);
// The manager:
- CavernInfraDetectorManager *detectorManager;
+ CavernInfraDetectorManager *m_detectorManager;
- StoreGateSvc *detectorStore;
- IRDBAccessSvc *access;
+ StoreGateSvc *m_detectorStore;
+ IRDBAccessSvc *m_access;
std::string m_versionTag;
std::string m_versionNode;
};
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx
index 6050f9d731a..db2970fbae2 100755
--- a/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.cxx
@@ -98,9 +98,9 @@ StatusCode CavernInfraDetectorTool::create()
StatusCode CavernInfraDetectorTool::clear()
{
- SG::DataProxy* _proxy = detStore()->proxy(ClassID_traits<CavernInfraDetectorManager>::ID(),m_manager->getName());
- if(_proxy) {
- _proxy->reset();
+ SG::DataProxy* proxy = detStore()->proxy(ClassID_traits<CavernInfraDetectorManager>::ID(),m_manager->getName());
+ if(proxy) {
+ proxy->reset();
m_manager = 0;
}
return StatusCode::SUCCESS;
--
GitLab