From d10262a162fa6f03fa46bcd812dfee0e0f5e8787 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Thu, 28 May 2020 00:27:15 +0200
Subject: [PATCH] Renaming methods and removing old code.
---
GeoModelRead/GeoModelRead/ReadGeoModel.h | 9 ++++-----
GeoModelRead/src/ReadGeoModel.cpp | 10 ++++------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/GeoModelRead/GeoModelRead/ReadGeoModel.h b/GeoModelRead/GeoModelRead/ReadGeoModel.h
index 07b55a8..17bcef5 100644
--- a/GeoModelRead/GeoModelRead/ReadGeoModel.h
+++ b/GeoModelRead/GeoModelRead/ReadGeoModel.h
@@ -34,7 +34,7 @@ typedef GeoModelIO::ReadGeoModel Persistifier;
// ****************************************************************
-
+// local includes
#include "GeoModelDBManager/GMDBManager.h"
#include "GeoModelKernel/GeoXF.h"
@@ -65,12 +65,12 @@ class GeoGraphNode;
class GeoShapeSubtraction;
class GeoBox;
-
+// namespaces
using namespace GeoGenfun;
using namespace GeoXF;
-
+// type definitions
typedef const Function & TRANSFUNCTION;
// containers for boolean shapes' information
typedef std::tuple<unsigned int/*shape ID*/, GeoShape*, unsigned int/*opA ID*/, unsigned int/*opB ID*/> tuple_shapes_boolean_info;
@@ -105,8 +105,7 @@ private:
std::string getEnvVar( std::string const & key ) const;
- GeoPhysVol* buildGeoModelByCalls();
- GeoPhysVol* buildGeoModelOneGo();
+ GeoPhysVol* buildGeoModelPrivate();
GeoBox* buildDummyShape();
diff --git a/GeoModelRead/src/ReadGeoModel.cpp b/GeoModelRead/src/ReadGeoModel.cpp
index dc65e41..129c256 100644
--- a/GeoModelRead/src/ReadGeoModel.cpp
+++ b/GeoModelRead/src/ReadGeoModel.cpp
@@ -148,9 +148,10 @@ ReadGeoModel::ReadGeoModel(GMDBManager* db, unsigned long* progress) : m_deepDeb
}
ReadGeoModel::~ReadGeoModel() {
- // TODO Auto-generated destructor stub
+ // FIXME: some cleaning...??
}
+
std::string ReadGeoModel::getEnvVar( std::string const & key ) const
{
char * val = std::getenv( key.c_str() );
@@ -161,8 +162,7 @@ GeoPhysVol* ReadGeoModel::buildGeoModel()
{
if (m_deepDebug) std::cout << "ReadGeoModel::buildGeoModel()" << std::endl;
- // return buildGeoModelByCalls();
- GeoPhysVol* rootVolume = buildGeoModelOneGo();
+ GeoPhysVol* rootVolume = buildGeoModelPrivate();
// warn the user if there are unknown/unhalded shapes
if (m_unknown_shapes.size() > 0) {
@@ -177,10 +177,8 @@ GeoPhysVol* ReadGeoModel::buildGeoModel()
}
-GeoPhysVol* ReadGeoModel::buildGeoModelOneGo()
+GeoPhysVol* ReadGeoModel::buildGeoModelPrivate()
{
- if (m_deepDebug) std::cout << "ReadGeoModel::buildGeoModelOneGo()" << std::endl;
-
// *** get all data from the DB ***
// get all GeoModel nodes from the DB
--
GitLab