Merge branch 'naming.ForwardRegionGeoModel-20170920' into 'master'

ForwardRegionGeoModel: Comply with ATLAS naming conventions.

See merge request !4810

Former-commit-id: 6e8d71f6

ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/ForwardRegionGeoModel/ForwardRegionGeoModelFactory.h

@@ -62,7 +62,7 @@ class ForwardRegionGeoModelFactory : public GeoVDetectorFactory  {
   
  private:
 
-  StoreGateSvc             *detectorStore;
+  StoreGateSvc             *m_detectorStore;
 
   // map of defined materials
   std::map<std::string,const GeoMaterial*> m_MapMaterials;
@@ -103,7 +103,7 @@ class ForwardRegionGeoModelFactory : public GeoVDetectorFactory  {
   ForwardRegionGeoModelFactory(const ForwardRegionGeoModelFactory &right);
   
   // The manager:
-  ForwardRegionGeoModelManager       *detectorManager;
+  ForwardRegionGeoModelManager       *m_detectorManager;
 };
 
 // Class ForwardRegionGeoModelFactory

ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/ForwardRegionGeoModel/ForwardRegionGeoModelManager.h

@@ -32,7 +32,7 @@ class ForwardRegionGeoModelManager : public GeoVDetectorManager  {
 
   const ForwardRegionGeoModelManager & operator=(const ForwardRegionGeoModelManager &right);
   ForwardRegionGeoModelManager(const ForwardRegionGeoModelManager &right);
-  std::vector<PVLink> volume;
+  std::vector<PVLink> m_volume;
 };
 
 // Class ForwardRegionGeoModelManager

ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelFactory.cxx

@@ -74,10 +74,10 @@ void FWD_CONFIGURATION::clear()
 
 
 ForwardRegionGeoModelFactory::ForwardRegionGeoModelFactory(StoreGateSvc *detStore, const PFWD_CONFIGURATION pConfig)
-  :detectorStore(detStore),
+  :m_detectorStore(detStore),
    m_properties("ForwardRegionProperties")
 {
-    detectorManager = NULL;
+    m_detectorManager = NULL;
     MsgStream LogStream(Athena::getMessageSvc(), "ForwardRegionGeoModel::ForwardRegionGeoModel()");
 
     m_Config = *pConfig;
@@ -102,7 +102,7 @@ void ForwardRegionGeoModelFactory::DefineMaterials()
     std::string matName;
 
     DataHandle<StoredMaterialManager> materialManager;
-    if (StatusCode::SUCCESS != detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
+    if (StatusCode::SUCCESS != m_detectorStore->retrieve(materialManager, std::string("MATERIALS"))) {
       return;
     }
 
@@ -384,7 +384,7 @@ void ForwardRegionGeoModelFactory::constructElements(GeoPhysVol *fwrPhys,std::ve
 
 void ForwardRegionGeoModelFactory::create(GeoPhysVol *world)
 {
-  detectorManager=new ForwardRegionGeoModelManager();
+  m_detectorManager=new ForwardRegionGeoModelManager();
 
   MsgStream LogStream(Athena::getMessageSvc(), "ForwardRegionGeoModel::create()");
 
@@ -437,7 +437,7 @@ void ForwardRegionGeoModelFactory::create(GeoPhysVol *world)
   GeoNameTag *tag = new GeoNameTag("ForwardRegionGeoModel");
   world->add(tag);
   world->add(fwrPhys);
-  detectorManager->addTreeTop(fwrPhys);
+  m_detectorManager->addTreeTop(fwrPhys);
 
   constructElements(fwrPhys,loadedDataFileR,1);
   constructElements(fwrPhys,loadedDataFileL,2);
@@ -447,7 +447,7 @@ void ForwardRegionGeoModelFactory::create(GeoPhysVol *world)
 
 const ForwardRegionGeoModelManager * ForwardRegionGeoModelFactory::getDetectorManager() const
 {
-  return detectorManager;
+  return m_detectorManager;
 }
 
 // Load data from file into 2D array of strings. Input is filename and wanted numbestd::stringof columns

ForwardDetectors/ForwardSimulation/ForwardRegionGeoModel/src/ForwardRegionGeoModelManager.cxx

@@ -16,14 +16,14 @@ ForwardRegionGeoModelManager::~ForwardRegionGeoModelManager()
 
 unsigned int ForwardRegionGeoModelManager::getNumTreeTops() const
 {
-  return volume.size(); 
+  return m_volume.size(); 
 }
 
 PVConstLink ForwardRegionGeoModelManager::getTreeTop(unsigned int i) const
 {
-  return volume[i];
+  return m_volume[i];
 }
 
 void  ForwardRegionGeoModelManager::addTreeTop(PVLink vol){
-  volume.push_back(vol);
+  m_volume.push_back(vol);
 }