From 111e89d88a9f29e0104decbccdfed9ee0e86a43d Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@stfc.ac.uk>
Date: Tue, 18 Mar 2014 08:25:19 +0000
Subject: [PATCH] Geometry/GeometryTest compiles & the tests pass.
Refs #9059
---
.../Geometry/inc/MantidGeometry/Instrument.h | 4 --
.../inc/MantidGeometry/Instrument/Detector.h | 3 --
.../MantidGeometry/Instrument/DetectorGroup.h | 2 -
.../Instrument/InstrumentDefinitionParser.h | 3 --
.../MantidGeometry/Instrument/ParameterMap.h | 4 --
.../MantidGeometry/Instrument/XMLlogfile.h | 6 ---
.../MDGeometry/MDGeometryXMLBuilder.h | 6 +--
.../Geometry/inc/MantidGeometry/Math/Acomp.h | 2 -
.../inc/MantidGeometry/Math/Algebra.h | 3 --
.../Geometry/inc/MantidGeometry/Math/BnId.h | 7 ++--
.../Objects/InstrumentRayTracer.h | 3 --
.../inc/MantidGeometry/Objects/Object.h | 5 ---
.../inc/MantidGeometry/Objects/Rules.h | 13 -------
.../inc/MantidGeometry/Objects/ShapeFactory.h | 7 ----
.../Rendering/CacheGeometryGenerator.h | 2 -
.../Rendering/CacheGeometryHandler.h | 1 -
.../Rendering/CacheGeometryRenderer.h | 6 +--
.../Rendering/GluGeometryRenderer.h | 4 +-
.../Rendering/OCGeometryGenerator.h | 7 ----
.../Rendering/vtkGeometryCacheReader.h | 2 -
.../Rendering/vtkGeometryCacheWriter.h | 4 +-
.../inc/MantidGeometry/Surfaces/Cone.h | 4 +-
.../inc/MantidGeometry/Surfaces/General.h | 10 -----
.../inc/MantidGeometry/Surfaces/Line.h | 4 --
.../Surfaces/LineIntersectVisit.h | 2 -
.../inc/MantidGeometry/Surfaces/Plane.h | 3 --
.../inc/MantidGeometry/Surfaces/Quadratic.h | 3 --
.../inc/MantidGeometry/Surfaces/Sphere.h | 8 ----
.../inc/MantidGeometry/Surfaces/Surface.h | 5 +--
.../MantidGeometry/Surfaces/SurfaceFactory.h | 2 -
.../inc/MantidGeometry/Surfaces/Torus.h | 2 -
.../Framework/Geometry/src/Instrument.cpp | 6 ++-
.../Geometry/src/Instrument/Detector.cpp | 9 +++--
.../Geometry/src/Instrument/DetectorGroup.cpp | 8 +++-
.../Geometry/src/Instrument/FitParameter.cpp | 10 ++---
.../Instrument/InstrumentDefinitionParser.cpp | 9 +++--
.../Geometry/src/Instrument/ParameterMap.cpp | 38 +++++++++----------
.../Geometry/src/Instrument/XMLlogfile.cpp | 8 +++-
.../Framework/Geometry/src/Math/Acomp.cpp | 1 -
.../Framework/Geometry/src/Math/Algebra.cpp | 5 +--
.../Framework/Geometry/src/Math/BnId.cpp | 3 --
.../src/Objects/InstrumentRayTracer.cpp | 5 ---
.../Framework/Geometry/src/Objects/Object.cpp | 4 --
.../Geometry/src/Objects/RuleItems.cpp | 10 -----
.../Framework/Geometry/src/Objects/Rules.cpp | 4 --
.../Geometry/src/Objects/ShapeFactory.cpp | 7 +++-
.../src/Rendering/CacheGeometryGenerator.cpp | 2 -
.../src/Rendering/CacheGeometryHandler.cpp | 2 +-
.../src/Rendering/CacheGeometryRenderer.cpp | 2 -
.../src/Rendering/GluGeometryRenderer.cpp | 2 -
.../src/Rendering/OCGeometryGenerator.cpp | 9 ++++-
.../src/Rendering/vtkGeometryCacheReader.cpp | 21 ++++++----
.../src/Rendering/vtkGeometryCacheWriter.cpp | 11 ++++--
.../Framework/Geometry/src/Surfaces/Cone.cpp | 4 --
.../Geometry/src/Surfaces/Cylinder.cpp | 7 +---
.../Geometry/src/Surfaces/General.cpp | 3 --
.../Framework/Geometry/src/Surfaces/Line.cpp | 3 --
.../src/Surfaces/LineIntersectVisit.cpp | 3 --
.../Framework/Geometry/src/Surfaces/Plane.cpp | 6 ---
.../Geometry/src/Surfaces/Quadratic.cpp | 4 --
.../Geometry/src/Surfaces/Sphere.cpp | 3 --
.../Geometry/src/Surfaces/Surface.cpp | 4 --
.../Geometry/src/Surfaces/SurfaceFactory.cpp | 2 -
.../Framework/Geometry/src/Surfaces/Torus.cpp | 7 ++--
64 files changed, 102 insertions(+), 257 deletions(-)
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument.h
index fb7464c68ed..b4964063e11 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument.h
@@ -10,7 +10,6 @@
#include "MantidGeometry/Instrument/ObjComponent.h"
#include "MantidKernel/DateAndTime.h"
-#include "MantidKernel/Logger.h"
#include <string>
#include <map>
@@ -235,9 +234,6 @@ namespace Mantid
/// Private copy assignment operator
Instrument& operator=(const Instrument&);
- /// Static reference to the logger class
- static Kernel::Logger& g_log;
-
/// Add a plottable component
void appendPlottable(const CompAssembly& ca,std::vector<IObjComponent_const_sptr>& lst)const;
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h
index 53a79ead134..4e0d56e33e1 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/Detector.h
@@ -82,9 +82,6 @@ private:
const detid_t m_id;
/// Flags if this is a monitor
bool m_isMonitor;
-
- /// Static reference to the logger class
- static Kernel::Logger& g_log;
};
} // namespace Geometry
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
index cc098c7e8cb..12a2b25b061 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorGroup.h
@@ -214,8 +214,6 @@ namespace Mantid
/// Private, unimplemented copy assignment operator
DetectorGroup& operator=(const DetectorGroup&);
- /// Static reference to the logger class
- static Kernel::Logger& g_log;
/// function calculates the detectors arrangement (topology)
void calculateGroupTopology()const;
};
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h
index 3d2749435c0..f79821f4fef 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/InstrumentDefinitionParser.h
@@ -6,7 +6,6 @@
#include <Poco/AutoPtr.h>
#include <Poco/DOM/Document.h>
#include "MantidKernel/System.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/V3D.h"
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/IDFObject.h"
@@ -96,8 +95,6 @@ namespace Geometry
CachingOption getAppliedCachingOption() const;
private:
- /// Static reference to the logger class
- static Kernel::Logger& g_log;
/// Set location (position) of comp as specified in XML location element
void setLocation(Geometry::IComponent* comp, const Poco::XML::Element* pElem, const double angleConvertConst,
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
index 74da3b528ef..9eed6ca14dd 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
@@ -9,7 +9,6 @@
#include "MantidGeometry/Instrument/ParameterFactory.h"
#include "MantidGeometry/Objects/BoundingBox.h"
#include "MantidKernel/Cache.h"
-#include "MantidKernel/Logger.h"
#ifndef HAS_UNORDERED_MAP_H
#include <map>
@@ -289,9 +288,6 @@ namespace Geometry
mutable Kernel::Cache<const ComponentID, Kernel::Quat > m_cacheRotMap;
///internal cache map for cached bounding boxes
mutable Kernel::Cache<const ComponentID,BoundingBox> m_boundingBoxMap;
-
- /// Static reference to the logger class
- static Kernel::Logger& g_log;
};
/// ParameterMap shared pointer typedef
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/XMLlogfile.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/XMLlogfile.h
index 0686c06e850..d71a0da1a97 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/XMLlogfile.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Instrument/XMLlogfile.h
@@ -86,12 +86,6 @@ namespace Mantid
/// when this const equals 1 it means that angle=degree (default) is set in IDF
/// otherwise if this const equals 180/pi it means that angle=radian is set in IDF
double m_angleConvertConst;
-
- private:
-
- ///static reference to the logger class
- static Kernel::Logger& g_log;
-
};
} // namespace Geometry
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
index b1a84960052..d8814bbcbb0 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDGeometryXMLBuilder.h
@@ -6,7 +6,6 @@
#include <algorithm>
#include "MantidGeometry/DllConfig.h"
#include "MantidGeometry/MDGeometry/IMDDimension.h"
-#include "MantidKernel/Logger.h"
namespace Mantid
{
@@ -131,17 +130,14 @@ private:
*/
struct StrictDimensionPolicy: public std::unary_function<IMDDimension_const_sptr, void>
{
-private:
- Kernel::Logger& g_log;
public:
- StrictDimensionPolicy() : g_log(Kernel::Logger::get("StrictDimensionPolicy")){}
+ StrictDimensionPolicy() {}
void operator()(IMDDimension_const_sptr item)
{
if(true == item->getIsIntegrated())
{
std::string message = "StrictDimensionPolicy bans the use of integrated IMDDimensions mapped to x, y, z or t in a IMDWorkspace.";
message += "Attempted to do so with IMDDimension: " + item->getDimensionId();
- g_log.error(message);
throw std::invalid_argument(message);
}
}
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/Acomp.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/Acomp.h
index d27fafecebe..9387fe92584 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/Acomp.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/Acomp.h
@@ -12,7 +12,6 @@ namespace Mantid
{
namespace Kernel
{
- class Logger;
template<typename T> class Matrix;
}
@@ -64,7 +63,6 @@ namespace Mantid
private:
- static Kernel::Logger& PLog; ///< The official logger
int Intersect; ///< Union/Intersection (0,1)
std::vector<int> Units; ///< Units in list
std::vector<Acomp> Comp; ///< Components in list
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/Algebra.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/Algebra.h
index 550bf1a04c1..b28a18eb401 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/Algebra.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/Algebra.h
@@ -2,7 +2,6 @@
#define Algebra_h
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Matrix.h"
#include "MantidGeometry/Math/BnId.h"
#include "MantidGeometry/Math/Acomp.h"
@@ -48,8 +47,6 @@ class MANTID_GEOMETRY_DLL Algebra
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
std::map<int,std::string> SurfMap; ///< Internal surface map
Acomp F; ///< Factor
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/BnId.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/BnId.h
index c5e9baefcb7..7039f4b267b 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/BnId.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Math/BnId.h
@@ -2,10 +2,11 @@
#define BNID_H
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/Logger.h"
-#include <vector>
+#include <iosfwd>
#include <set>
+#include <string>
#include <map>
+#include <vector>
namespace Mantid
{
@@ -53,8 +54,6 @@ class MANTID_GEOMETRY_DLL BnId
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
size_t size; ///< number of variables
int PI; ///< Prime Implicant
int Tnum; ///< True number (1 in Tval)
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h
index 0eef1fe397b..c098c94a45f 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/InstrumentRayTracer.h
@@ -6,7 +6,6 @@
//-------------------------------------------------------------
#include "MantidGeometry/IDetector.h"
#include "MantidGeometry/Instrument.h"
-#include "MantidKernel/Logger.h"
#include <deque>
#include <list>
@@ -79,8 +78,6 @@ namespace Mantid
Instrument_const_sptr m_instrument;
/// Accumulate results in this Track object, aids performance. This is cleared when getResults is called.
mutable Track m_resultsTrack;
- /// Logger
- static Kernel::Logger & g_log;
};
}
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Object.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Object.h
index be1197e6caa..0a7e3da5010 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Object.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Object.h
@@ -15,10 +15,6 @@
namespace Mantid
{
- namespace Kernel
- {
- class Logger;
- }
namespace Geometry
{
@@ -161,7 +157,6 @@ namespace Mantid
/// Getter for the shape xml
std::string getShapeXML() const;
private:
- static Kernel::Logger& PLog; ///< The official logger
int ObjName; ///< Creation number
Rule* TopRule; ///< Top rule [ Geometric scope of object]
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
index 47ac1635f9b..a6f572503bf 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/Rules.h
@@ -45,8 +45,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
Rule* Parent; ///< Parent object (for tree)
static int addToKey(std::vector<int>& AV,const int passN=-1);
@@ -121,8 +119,6 @@ namespace Mantid
private:
- static Kernel::Logger& PLog; ///< The official logger
-
Rule* A; ///< Rule 1
Rule* B; ///< Rule 2
@@ -171,8 +167,6 @@ namespace Mantid
private:
- static Kernel::Logger& PLog; ///< The official logger
-
Rule* A; ///< Leaf rule A
Rule* B; ///< Leaf rule B
@@ -222,7 +216,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
Surface* key; ///< Actual Surface Base Object
int keyN; ///< Key Number (identifer)
@@ -275,8 +268,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
int objN; ///< Object number
Object* key; ///< Object Pointer
@@ -328,8 +319,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
Rule* A; ///< The rule
public:
@@ -375,8 +364,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
int status; ///< Three values 0 False : 1 True : -1 doesn't matter
public:
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
index 0b1bf7f2286..32b987b7eec 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Objects/ShapeFactory.h
@@ -21,10 +21,6 @@ namespace XML {
namespace Mantid
{
- namespace Kernel
- {
- class Logger;
- }
namespace Geometry
{
@@ -102,9 +98,6 @@ namespace Mantid
double getDoubleAttribute(Poco::XML::Element* pElem, const std::string& name);
Kernel::V3D parsePosition(Poco::XML::Element* pElem);
void createGeometryHandler(Poco::XML::Element*,boost::shared_ptr<Object>);
-
- /// static reference to the logger class
- static Kernel::Logger& g_log;
};
} // namespace Geometry
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryGenerator.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryGenerator.h
index 822cbcf4e3c..fac2a158d00 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryGenerator.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryGenerator.h
@@ -2,7 +2,6 @@
#define CACHE_GEOMETRYGENERATOR_H
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/Logger.h"
#include <boost/shared_ptr.hpp>
namespace Mantid
@@ -44,7 +43,6 @@ namespace Mantid
class MANTID_GEOMETRY_DLL CacheGeometryGenerator
{
private:
- static Kernel::Logger& PLog; ///< Static reference to the logger class
Object *Obj; ///< Input Object
int mNoOfVertices; ///< number of vertices
int mNoOfTriangles; ///< number of triangles
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
index 116b77e2050..d03a177f924 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryHandler.h
@@ -52,7 +52,6 @@ namespace Mantid
class MANTID_GEOMETRY_DLL CacheGeometryHandler: public GeometryHandler
{
private:
- static Kernel::Logger& PLog; ///< The official logger
CacheGeometryRenderer* Renderer; ///< Geometry renderer variable used for rendering Object/ObjComponent
CacheGeometryGenerator* Triangulator; ///< Geometry generator to triangulate Object
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryRenderer.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryRenderer.h
index 0d0dbe7a525..a92b63637d7 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryRenderer.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/CacheGeometryRenderer.h
@@ -2,7 +2,7 @@
#define CACHE_GEOMETRYRENDERER_H
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/Logger.h"
+
namespace Mantid
{
namespace Kernel
@@ -42,10 +42,6 @@ namespace Mantid
*/
class MANTID_GEOMETRY_DLL CacheGeometryRenderer
{
- private:
-
- static Kernel::Logger& PLog; ///< The official logger
-
public:
CacheGeometryRenderer(); ///< Constructor
~CacheGeometryRenderer(); ///< Destructor
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryRenderer.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryRenderer.h
index 9aee7139654..3368ad8bce0 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryRenderer.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryRenderer.h
@@ -2,7 +2,7 @@
#define GLU_GEOMETRYRENDERER_H
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/Logger.h"
+
namespace Mantid
{
namespace Kernel
@@ -43,8 +43,6 @@ namespace Mantid
class MANTID_GEOMETRY_DLL GluGeometryRenderer
{
private:
-
- static Kernel::Logger& PLog; ///< The official logger
int mErrorCode; ///< The lastest error code
public:
GluGeometryRenderer(); ///< Constructor
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
index f81f48f2952..d9ab3e81cd5 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
@@ -2,18 +2,12 @@
#define OC_GEOMETRYGENERATOR_H
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/Logger.h"
#include <boost/shared_ptr.hpp>
class TopoDS_Shape;
namespace Mantid
{
- namespace Kernel
- {
- class Logger;
- }
-
namespace Geometry
{
class Object;
@@ -62,7 +56,6 @@ namespace Mantid
class MANTID_GEOMETRY_DLL OCGeometryGenerator
{
private:
- static Kernel::Logger& PLog; ///< Static reference to the logger class
const Object *Obj; ///< Input Object
TopoDS_Shape* ObjSurface; ///< Storage for the output surface
int iGridSize; ///< Grid size for sampling the object
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
index 7184b2cadd6..d4ee748b33a 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
@@ -2,7 +2,6 @@
#define VTKGEOMETRYCACHEREADER_H
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/Logger.h"
namespace Poco
{
@@ -50,7 +49,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
Poco::XML::Document* mDoc; ///< The XML document
Poco::XML::Element* mRoot; ///< The root XML element
Poco::XML::DOMParser* pParser; ///< The XML parser
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h
index 5084bd6375d..33deb807678 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h
@@ -2,8 +2,8 @@
#define VTKGEOMETRYCACHEWRITER_H
#include "MantidGeometry/DllConfig.h"
-#include "MantidKernel/Logger.h"
#include <string>
+
namespace Poco{
namespace XML{
class Document;
@@ -47,8 +47,6 @@ namespace Mantid
class MANTID_GEOMETRY_DLL vtkGeometryCacheWriter
{
private:
-
- static Kernel::Logger& PLog; ///< The official logger
Poco::XML::Document* mDoc; ///< The XML document
Poco::XML::Element* mRoot; ///< The root XML element
std::string mFileName; ///< The file name
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
index 2d717e931dc..79f1f0d42a1 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Cone.h
@@ -3,7 +3,7 @@
#include "MantidGeometry/DllConfig.h"
#include "MantidKernel/V3D.h"
-#include "MantidKernel/Logger.h"
+
namespace Mantid
{
@@ -46,8 +46,6 @@ class MANTID_GEOMETRY_DLL Cone : public Quadratic
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
Kernel::V3D Centre; ///< Kernel::V3D for centre
Kernel::V3D Normal; ///< Normal
double alpha; ///< Angle (degrees)
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
index 01d4a8c74fd..2bc18cb9bd7 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/General.h
@@ -6,12 +6,6 @@
namespace Mantid
{
-
- namespace Kernel
- {
- class Logger;
- }
-
namespace Geometry
{
@@ -49,10 +43,6 @@ namespace Geometry
class MANTID_GEOMETRY_DLL General : public Quadratic
{
- private:
-
- static Kernel::Logger& PLog; ///< The official logger
-
public:
General();
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Line.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Line.h
index de21dd1ee86..e5f8957178b 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Line.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Line.h
@@ -9,7 +9,6 @@ namespace Mantid
namespace Kernel
{
- class Logger;
template<typename T> class Matrix;
}
@@ -59,9 +58,6 @@ namespace Mantid
private:
- static Kernel::Logger& PLog; ///< The official logger
-
-
Kernel::V3D Origin; ///< Orign point (on plane)
Kernel::V3D Direct; ///< Direction of outer surface (Unit Vector)
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h
index 8777608247e..dba93f49362 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/LineIntersectVisit.h
@@ -55,8 +55,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
Line ATrack; ///< The line
std::vector<Kernel::V3D> PtOut; ///< The intersection point
std::vector<double> DOut; ///< The distance
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
index e995a0c7e08..8e4c34e0d41 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Plane.h
@@ -10,7 +10,6 @@ namespace Mantid
namespace Kernel
{
- class Logger;
template <typename T> class Matrix;
}
@@ -54,8 +53,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
Kernel::V3D NormV; ///< Normal vector
double Dist; ///< Distance
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
index e817ec5dcae..87f1618f6b9 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Quadratic.h
@@ -3,7 +3,6 @@
#include "MantidGeometry/DllConfig.h"
#include "MantidGeometry/Surfaces/Surface.h"
-#include "MantidKernel/Logger.h"
#include <vector>
namespace Mantid
@@ -28,8 +27,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
void matrixForm(Kernel::Matrix<double>&,
Kernel::V3D&,double&) const;
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
index 71a52a4c3fc..e66962c9b54 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Sphere.h
@@ -8,13 +8,6 @@
namespace Mantid
{
- //---------------------------------------------
- // Forward declaration
- //---------------------------------------------
- namespace Kernel
- {
- class Logger;
- }
namespace Geometry
{
@@ -51,7 +44,6 @@ namespace Mantid
{
private:
- static Kernel::Logger& PLog; ///< The official logger
Kernel::V3D Centre; ///< Point for centre
double Radius; ///< Radius of sphere
void rotate(const Kernel::Matrix<double>&);
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Surface.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Surface.h
index 663e31affb5..9a779773b67 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Surface.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Surface.h
@@ -3,7 +3,7 @@
#include "MantidGeometry/DllConfig.h"
#include "BaseVisit.h"
-#include "MantidKernel/Logger.h"
+#include <string>
namespace Mantid
{
@@ -50,9 +50,6 @@ class MANTID_GEOMETRY_DLL Surface
{
private:
- /// Static reference to the logger class
- static Kernel::Logger& PLog;
-
int Name; ///< Surface number (MCNPX identifier)
public:
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
index fe1cd626ba7..0738e286407 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/SurfaceFactory.h
@@ -43,8 +43,6 @@ class MANTID_GEOMETRY_DLL SurfaceFactory
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
typedef std::map<std::string,Surface*> MapType; ///< Storage of surface pointers
static SurfaceFactory* FOBJ; ///< Effective "this"
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
index 9ef1b7c97b7..03973216689 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Surfaces/Torus.h
@@ -48,8 +48,6 @@ class MANTID_GEOMETRY_DLL Torus : public Surface
{
private:
- static Kernel::Logger& PLog; ///< The official logger
-
Kernel::V3D Centre; ///< Geometry::Vec3D for centre
Kernel::V3D Normal; ///< Normal
double Iradius; ///< Inner radius
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument.cpp b/Code/Mantid/Framework/Geometry/src/Instrument.cpp
index 81a87adb2c2..02720418061 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument.cpp
@@ -1,6 +1,7 @@
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/V3D.h"
#include "MantidKernel/Exception.h"
+#include "MantidKernel/Logger.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidGeometry/Instrument/ParComponentFactory.h"
#include "MantidGeometry/Objects/BoundingBox.h"
@@ -23,7 +24,10 @@ namespace Mantid
namespace Geometry
{
- Kernel::Logger& Instrument::g_log = Kernel::Logger::get("Instrument");
+ namespace
+ {
+ Kernel::Logger g_log("Instrument");
+ }
/// Default constructor
Instrument::Instrument() : CompAssembly(),
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/Detector.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/Detector.cpp
index 50c1bde6914..44647572279 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/Detector.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/Detector.cpp
@@ -5,14 +5,15 @@ namespace Mantid
{
namespace Geometry
{
+ namespace
+ {
+ // static logger object
+ Kernel::Logger g_log("Detector");
+ }
using Kernel::V3D;
using Kernel::Quat;
-// Get a reference to the logger
-Kernel::Logger& Detector::g_log = Kernel::Logger::get("Detector");
-
-
/** Constructor for a parametrized Detector
* @param base: the base (un-parametrized) IComponent
* @param map: pointer to the ParameterMap
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/DetectorGroup.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/DetectorGroup.cpp
index 0f8c2864cb2..805a46016c2 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/DetectorGroup.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/DetectorGroup.cpp
@@ -9,11 +9,15 @@ namespace Mantid
{
namespace Geometry
{
+ namespace
+ {
+ // static logger
+ Kernel::Logger g_log("DetectorGroup");
+ }
+
using Kernel::V3D;
using Kernel::Quat;
- // Get a reference to the logger
- Kernel::Logger& DetectorGroup::g_log = Kernel::Logger::get("DetectorGroup");
/**
* Default constructor
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/FitParameter.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/FitParameter.cpp
index 3dd67cb8a43..0e4a7b4dfb1 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/FitParameter.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/FitParameter.cpp
@@ -11,11 +11,11 @@ namespace Mantid
{
namespace Geometry
{
-
- // Get a reference to the logger, here stored in statis variable to
- // have access to in operator<< and operator>>
- static Kernel::Logger& g_log = Kernel::Logger::get("FitParameter");
-
+ namespace
+ {
+ /// static logger object
+ Kernel::Logger g_log("FitParameter");
+ }
/**
Get constraint string.
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
index bd77d7c4862..1b3cf23c4eb 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/InstrumentDefinitionParser.cpp
@@ -8,6 +8,7 @@
#include "MantidGeometry/Rendering/vtkGeometryCacheReader.h"
#include "MantidGeometry/Rendering/vtkGeometryCacheWriter.h"
#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/Logger.h"
#include "MantidKernel/ProgressBase.h"
#include "MantidKernel/UnitFactory.h"
#include <fstream>
@@ -34,9 +35,11 @@ namespace Mantid
{
namespace Geometry
{
- // Initialize the logger
- Kernel::Logger& InstrumentDefinitionParser::g_log = Kernel::Logger::get("InstrumentDefinitionParser");
-
+ namespace
+ {
+ // initialize the static logger
+ Kernel::Logger g_log("InstrumentDefinitionParser");
+ }
//----------------------------------------------------------------------------------------------
/** Constructor
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp
index bdc7d5e38bc..de205302f68 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp
@@ -15,29 +15,29 @@ namespace Mantid
using Kernel::V3D;
using Kernel::Quat;
- namespace // for strings to be inserted into the parameter map
+ namespace
{
- const std::string POS_PARAM_NAME="pos";
- const std::string POSX_PARAM_NAME="x";
- const std::string POSY_PARAM_NAME="y";
- const std::string POSZ_PARAM_NAME="z";
+ // names of common parameter types
+ const std::string POS_PARAM_NAME="pos";
+ const std::string POSX_PARAM_NAME="x";
+ const std::string POSY_PARAM_NAME="y";
+ const std::string POSZ_PARAM_NAME="z";
- const std::string ROT_PARAM_NAME="rot";
- const std::string ROTX_PARAM_NAME="rotx";
- const std::string ROTY_PARAM_NAME="roty";
- const std::string ROTZ_PARAM_NAME="rotz";
+ const std::string ROT_PARAM_NAME="rot";
+ const std::string ROTX_PARAM_NAME="rotx";
+ const std::string ROTY_PARAM_NAME="roty";
+ const std::string ROTZ_PARAM_NAME="rotz";
- const std::string DOUBLE_PARAM_NAME="double";
- const std::string INT_PARAM_NAME="int";
- const std::string BOOL_PARAM_NAME="bool";
- const std::string STRING_PARAM_NAME="string";
- const std::string V3D_PARAM_NAME="V3D";
- const std::string QUAT_PARAM_NAME="Quat";
- }
-
- // Get a reference to the logger
- Kernel::Logger& ParameterMap::g_log = Kernel::Logger::get("ParameterMap");
+ const std::string DOUBLE_PARAM_NAME="double";
+ const std::string INT_PARAM_NAME="int";
+ const std::string BOOL_PARAM_NAME="bool";
+ const std::string STRING_PARAM_NAME="string";
+ const std::string V3D_PARAM_NAME="V3D";
+ const std::string QUAT_PARAM_NAME="Quat";
+ // static logger reference
+ Kernel::Logger g_log("ParameterMap");
+ }
//--------------------------------------------------------------------------
// Public method
//--------------------------------------------------------------------------
diff --git a/Code/Mantid/Framework/Geometry/src/Instrument/XMLlogfile.cpp b/Code/Mantid/Framework/Geometry/src/Instrument/XMLlogfile.cpp
index 9ecc20a400a..4840b6a452e 100644
--- a/Code/Mantid/Framework/Geometry/src/Instrument/XMLlogfile.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Instrument/XMLlogfile.cpp
@@ -3,9 +3,10 @@
//----------------------------------------------------------------------
#include "MantidGeometry/Instrument/XMLlogfile.h"
#include "MantidGeometry/IComponent.h"
+#include "MantidGeometry/muParser_Silent.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/LogParser.h"
-#include "MantidGeometry/muParser_Silent.h"
+#include "MantidKernel/Logger.h"
#include <ctime>
#include <fstream>
@@ -13,10 +14,13 @@ namespace Mantid
{
namespace Geometry
{
+ namespace
+ {
+ Kernel::Logger g_log("XMLlogfile");
+ }
using namespace Kernel;
- Logger& XMLlogfile::g_log = Logger::get("XMLlogfile");
/** Constructor
* @param logfileID :: The logfile id -- the part of the file name which identifies the log
diff --git a/Code/Mantid/Framework/Geometry/src/Math/Acomp.cpp b/Code/Mantid/Framework/Geometry/src/Math/Acomp.cpp
index 5ba425e04db..4cdd5ed230d 100644
--- a/Code/Mantid/Framework/Geometry/src/Math/Acomp.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Math/Acomp.cpp
@@ -17,7 +17,6 @@ namespace Mantid
using Kernel::Matrix;
- Kernel::Logger& Acomp::PLog( Kernel::Logger::get("Acomp"));
// Friend function
std::ostream&
operator<<(std::ostream& OX,const Acomp& A)
diff --git a/Code/Mantid/Framework/Geometry/src/Math/Algebra.cpp b/Code/Mantid/Framework/Geometry/src/Math/Algebra.cpp
index b986942edbb..0fb7a38b21d 100644
--- a/Code/Mantid/Framework/Geometry/src/Math/Algebra.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Math/Algebra.cpp
@@ -13,10 +13,10 @@
#include <iterator>
#include "MantidKernel/Exception.h"
+#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
-#include "MantidGeometry/Math/MapSupport.h"
#include "MantidGeometry/Math/Algebra.h"
-
+#include "MantidGeometry/Math/MapSupport.h"
namespace Mantid
{
@@ -37,7 +37,6 @@ operator<<(std::ostream& OX,const Algebra& A)
return OX;
}
-Kernel::Logger& Algebra::PLog(Kernel::Logger::get("Algebra"));
Algebra::Algebra() :
F(0)
diff --git a/Code/Mantid/Framework/Geometry/src/Math/BnId.cpp b/Code/Mantid/Framework/Geometry/src/Math/BnId.cpp
index 6b4f5f57f8a..1e0132b042b 100644
--- a/Code/Mantid/Framework/Geometry/src/Math/BnId.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Math/BnId.cpp
@@ -12,7 +12,6 @@
#include <iterator>
#include <functional>
-#include "MantidKernel/Logger.h"
#include "MantidGeometry/Math/BnId.h"
namespace Mantid
@@ -21,8 +20,6 @@ namespace Mantid
namespace Geometry
{
-Kernel::Logger& BnId::PLog(Kernel::Logger::get("BnId"));
-
/** Output as a stream
* @param of :: Reference to the output stream
* @param A :: The object to output
diff --git a/Code/Mantid/Framework/Geometry/src/Objects/InstrumentRayTracer.cpp b/Code/Mantid/Framework/Geometry/src/Objects/InstrumentRayTracer.cpp
index 40b342bcc6d..ba3f0254a29 100644
--- a/Code/Mantid/Framework/Geometry/src/Objects/InstrumentRayTracer.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Objects/InstrumentRayTracer.cpp
@@ -16,9 +16,6 @@ namespace Mantid
using Kernel::V3D;
- // Initialize logger
- Kernel::Logger & InstrumentRayTracer::g_log = Kernel::Logger::get("InstrumentRayTracer");
-
//-------------------------------------------------------------
// Public member functions
//-------------------------------------------------------------
@@ -34,13 +31,11 @@ namespace Mantid
{
std::ostringstream lexer;
lexer << "Cannot create a InstrumentRayTracer, invalid instrument given. Input = " << m_instrument.get() << "\n";
- g_log.error(lexer.str());
throw std::invalid_argument(lexer.str());
}
if( !m_instrument->getSource() )
{
std::string errorMsg = "Cannot create InstrumentRayTracer, instrument has no defined source.\n";
- g_log.error(errorMsg);
throw std::invalid_argument(errorMsg);
}
}
diff --git a/Code/Mantid/Framework/Geometry/src/Objects/Object.cpp b/Code/Mantid/Framework/Geometry/src/Objects/Object.cpp
index f4ef12080a7..850ab857e56 100644
--- a/Code/Mantid/Framework/Geometry/src/Objects/Object.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Objects/Object.cpp
@@ -1,5 +1,4 @@
#include "MantidGeometry/Objects/Object.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/MultiThreaded.h"
@@ -30,8 +29,6 @@ namespace Mantid
using Kernel::V3D;
using Kernel::Quat;
- Kernel::Logger& Object::PLog(Kernel::Logger::get("Object"));
-
/**
* Default constuctor
*/
@@ -304,7 +301,6 @@ namespace Mantid
}
else
{
- PLog.error("Error finding key");
throw Kernel::Exception::NotFoundError("Object::populate", KV->getKeyN());
}
}
diff --git a/Code/Mantid/Framework/Geometry/src/Objects/RuleItems.cpp b/Code/Mantid/Framework/Geometry/src/Objects/RuleItems.cpp
index 9a4ba2cc890..b78500bee17 100644
--- a/Code/Mantid/Framework/Geometry/src/Objects/RuleItems.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Objects/RuleItems.cpp
@@ -13,7 +13,6 @@
#include <iterator>
#include <cfloat>
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Exception.h"
#include "MantidGeometry/Math/Triple.h"
@@ -32,8 +31,6 @@ namespace Geometry
{
using Kernel::V3D;
-Kernel::Logger& Intersection::PLog(Kernel::Logger::get("Intersection"));
-
Intersection::Intersection() : Rule(),
A(0),B(0)
/**
@@ -364,8 +361,6 @@ void Intersection::getBoundingBox(double &xmax,double &ymax,double &zmax,double
// UNION
//---------------------------------------------------------------
-Kernel::Logger& Union::PLog(Kernel::Logger::get("Union"));
-
Union::Union() :
Rule(),A(0),B(0)
/**
@@ -699,7 +694,6 @@ void Union::getBoundingBox(double &xmax, double &ymax, double &zmax, double &xmi
// -------------------------------------------------------------
// SURF KEYS
//---------------------------------------------------------------
-Kernel::Logger& SurfPoint::PLog(Kernel::Logger::get("SurfPoint"));
SurfPoint::SurfPoint() : Rule(),
key(0),keyN(0),sign(1)
@@ -957,7 +951,6 @@ void SurfPoint::getBoundingBox(double &xmax,double &ymax,double &zmax,double &xm
//----------------------------------------
// COMPOBJ
//----------------------------------------
-Kernel::Logger& CompObj::PLog(Kernel::Logger::get("CompObj"));
CompObj::CompObj() : Rule(),
objN(0),key(0)
@@ -1207,8 +1200,6 @@ void CompObj::getBoundingBox(double &xmax, double &ymax, double &zmax, double &x
// BOOLVALUE
// -----------------------------------------------
-Kernel::Logger& BoolValue::PLog(Kernel::Logger::get("BoolValue"));
-
BoolValue::BoolValue() : Rule(), status(-1)
/**
Constructor
@@ -1385,7 +1376,6 @@ void BoolValue::getBoundingBox(double &xmax, double &ymax, double &zmax, double
//----------------------------------------
// COMPGRP
//----------------------------------------
-Kernel::Logger& CompGrp::PLog(Kernel::Logger::get("CompGrp"));
CompGrp::CompGrp() :
Rule(),A(0)
diff --git a/Code/Mantid/Framework/Geometry/src/Objects/Rules.cpp b/Code/Mantid/Framework/Geometry/src/Objects/Rules.cpp
index 8a70742b0c8..1d5492b30bf 100644
--- a/Code/Mantid/Framework/Geometry/src/Objects/Rules.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Objects/Rules.cpp
@@ -12,8 +12,6 @@
#include <algorithm>
#include <iterator>
-#include "MantidKernel/Logger.h"
-
#include "MantidGeometry/Math/Triple.h"
#include "MantidKernel/Matrix.h"
#include "MantidKernel/V3D.h"
@@ -27,8 +25,6 @@ namespace Mantid
namespace Geometry
{
-Kernel::Logger& Rule::PLog(Kernel::Logger::get("Rule"));
-
int
Rule::addToKey(std::vector<int>& AV,const int passN)
/**
diff --git a/Code/Mantid/Framework/Geometry/src/Objects/ShapeFactory.cpp b/Code/Mantid/Framework/Geometry/src/Objects/ShapeFactory.cpp
index 95a287f8953..0a5a829a770 100644
--- a/Code/Mantid/Framework/Geometry/src/Objects/ShapeFactory.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Objects/ShapeFactory.cpp
@@ -15,6 +15,7 @@
#include "MantidGeometry/Rendering/GluGeometryHandler.h"
#include "MantidKernel/Quat.h"
+#include "MantidKernel/Logger.h"
#include <Poco/AutoPtr.h>
#include <Poco/DOM/DOMParser.h>
@@ -46,9 +47,11 @@ namespace
{
const V3D DEFAULT_CENTRE(0, 0, 0);
const V3D DEFAULT_AXIS(0, 0, 1);
-}
-Logger& ShapeFactory::g_log = Logger::get("ShapeFactory");
+ /// static logger
+ Logger g_log("ShapeFactory");
+
+}
/// Empty default constructor
ShapeFactory::ShapeFactory()
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryGenerator.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryGenerator.cpp
index 15c615ee093..ec8adc12682 100644
--- a/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryGenerator.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryGenerator.cpp
@@ -1,4 +1,3 @@
-#include "MantidKernel/Logger.h"
#include <vector>
#include <cmath>
#include "MantidKernel/V3D.h"
@@ -13,7 +12,6 @@ namespace Mantid
namespace Geometry
{
- Kernel::Logger& CacheGeometryGenerator::PLog(Kernel::Logger::get("CacheGeometryGenerator"));
/**
* Constructor
* @param obj :: input object
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryHandler.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryHandler.cpp
index 62c81c6f3b2..f02531276f3 100644
--- a/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryHandler.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryHandler.cpp
@@ -9,7 +9,7 @@ namespace Mantid
{
namespace Geometry
{
- Kernel::Logger& CacheGeometryHandler::PLog(Kernel::Logger::get("CacheGeometryHandler"));
+
CacheGeometryHandler::CacheGeometryHandler(IObjComponent *comp):GeometryHandler(comp)
{
Triangulator=NULL;
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryRenderer.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryRenderer.cpp
index 10458816a6d..932243a8d3f 100644
--- a/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryRenderer.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryRenderer.cpp
@@ -11,8 +11,6 @@ namespace Mantid
using Kernel::V3D;
using Kernel::Quat;
- Kernel::Logger& CacheGeometryRenderer::PLog(Kernel::Logger::get("CacheGeometryRenderer"));
-
/**
* Constructor
* Generated the display list
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/GluGeometryRenderer.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/GluGeometryRenderer.cpp
index 80857d02e38..049789a3d06 100644
--- a/Code/Mantid/Framework/Geometry/src/Rendering/GluGeometryRenderer.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Rendering/GluGeometryRenderer.cpp
@@ -14,8 +14,6 @@ namespace Mantid
using Kernel::V3D;
using Kernel::Quat;
- Kernel::Logger& GluGeometryRenderer::PLog(Kernel::Logger::get("GluGeometryRenderer"));
-
/**
* Constructor
*/
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp
index ed5d1bece8b..241827002fd 100644
--- a/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Rendering/OCGeometryGenerator.cpp
@@ -59,7 +59,12 @@ namespace Mantid
namespace Geometry
{
- Kernel::Logger& OCGeometryGenerator::PLog(Kernel::Logger::get("OCGeometryGenerator"));
+ namespace
+ {
+ /// static logger
+ Kernel::Logger g_log("OCGeometryGenerator");
+ }
+
/**
* Constructor
* @param obj :: input object
@@ -119,7 +124,7 @@ namespace Mantid
}
catch(StdFail_NotDone &)
{
- PLog.error("Cannot build the geometry. Check the geometry definition");
+ g_log.error("Cannot build the geometry. Check the geometry definition");
}
}
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
index aa5e9cf1bb5..791c4d89de8 100644
--- a/Code/Mantid/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Rendering/vtkGeometryCacheReader.cpp
@@ -20,6 +20,7 @@ using Poco::Exception;
using Poco::XML::Element;
#include "MantidKernel/Exception.h"
+#include "MantidKernel/Logger.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Rendering/GeometryHandler.h"
#include "MantidGeometry/Rendering/vtkGeometryCacheReader.h"
@@ -29,7 +30,12 @@ namespace Mantid
{
namespace Geometry
{
- Kernel::Logger& vtkGeometryCacheReader::PLog(Kernel::Logger::get("Object"));
+ namespace
+ {
+ /// static logger
+ Kernel::Logger g_log("vtkGeometryCacheReader");
+ }
+
/**
* Constructor
@@ -63,8 +69,7 @@ namespace Mantid
}
catch(...)
{
- PLog.error("Unable to parse file " + mFileName);
- throw Kernel::Exception::FileError("Unable to parse File:" , mFileName);
+ throw Kernel::Exception::FileError("Unable to parse File:" , mFileName);
}
}
@@ -79,8 +84,8 @@ namespace Mantid
Poco::XML::Element *pEle=getElementByObjectName(objName.str());
if(pEle==NULL) //Element not found
{
- PLog.debug("Cache not found for Object with name " + objName.str());
- return;
+ g_log.debug("Cache not found for Object with name " + objName.str());
+ return;
}
// Read the cache from the element
int noOfTriangles=0
@@ -138,7 +143,7 @@ namespace Mantid
*points=new double[(*noOfPoints)*3];
if(*points==NULL) // Out of memory
{
- PLog.error("Cannot allocate memory for triangle cache of Object ");
+ g_log.error("Cannot allocate memory for triangle cache of Object ");
return;
}
if(pEle->getAttribute("format").compare("ascii")==0)
@@ -170,8 +175,8 @@ namespace Mantid
*faces=new int[(*noOfTriangles)*3];
if(*faces==NULL) // Out of memory
{
- PLog.error("Cannot allocate memory for triangle cache of Object ");
- return;
+ g_log.error("Cannot allocate memory for triangle cache of Object ");
+ return;
}
if(pEle->getAttribute("format").compare("ascii")==0)
{ //Read from Ascii
diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
index d4745297ac4..0445aec5c90 100644
--- a/Code/Mantid/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Rendering/vtkGeometryCacheWriter.cpp
@@ -1,5 +1,5 @@
#include "MantidGeometry/Rendering/vtkGeometryCacheWriter.h"
-#include "MantidKernel/ConfigService.h"
+#include "MantidKernel/Logger.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Rendering/GeometryHandler.h"
@@ -39,7 +39,12 @@ namespace Mantid
{
namespace Geometry
{
- Kernel::Logger& vtkGeometryCacheWriter::PLog(Kernel::Logger::get("vtkGeometryCacheWriter"));
+ namespace
+ {
+ ///static object
+ Kernel::Logger g_log("vtkGeometryCacheWriter");
+ }
+
/**
* Constructor
*/
@@ -188,7 +193,7 @@ namespace Mantid
}
catch(...)
{
- PLog.error("Geometry Cache file writing exception");
+ g_log.error("Geometry Cache file writing exception");
}
}
}
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/Cone.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/Cone.cpp
index 319fbee680d..49a7e26d389 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/Cone.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/Cone.cpp
@@ -11,8 +11,6 @@
#include <string>
#include <algorithm>
-#include "MantidKernel/Logger.h"
-
#include "MantidKernel/Strings.h"
#include "MantidKernel/Tolerance.h"
#include "MantidKernel/Matrix.h"
@@ -31,8 +29,6 @@ namespace Mantid
using Kernel::Tolerance;
using Kernel::V3D;
- Kernel::Logger& Cone::PLog(Kernel::Logger::get("Cone"));
-
// The number of slices to use to approximate a cylinder
int Cone::g_nslices = 10;
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/Cylinder.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/Cylinder.cpp
index 8a88f862b95..2eb9ff52cd4 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/Cylinder.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/Cylinder.cpp
@@ -1,5 +1,4 @@
#include "MantidGeometry/Surfaces/Cylinder.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/Tolerance.h"
#include "MantidKernel/Matrix.h"
@@ -15,12 +14,10 @@ namespace Mantid
using Kernel::Tolerance;
using Kernel::V3D;
- Kernel::Logger& Cylinder::PLog(Kernel::Logger::get("Cylinder"));
-
-// The number of slices to use to approximate a cylinder
+ // The number of slices to use to approximate a cylinder
int Cylinder::g_nslices = 10;
-// The number of slices to use to approximate a cylinder
+ // The number of slices to use to approximate a cylinder
int Cylinder::g_nstacks = 1;
Cylinder::Cylinder() :
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/General.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/General.cpp
index 39dd5092054..efa04f7d809 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/General.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/General.cpp
@@ -1,5 +1,4 @@
#include "MantidGeometry/Surfaces/General.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/Matrix.h"
@@ -9,8 +8,6 @@ namespace Mantid
namespace Geometry
{
-Kernel::Logger& General::PLog(Kernel::Logger::get("General"));
-
const double GTolerance(1e-6); ///< Tolerance
General::General() : Quadratic()
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/Line.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/Line.cpp
index c5c41a66c5d..69e2dbbc1e1 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/Line.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/Line.cpp
@@ -1,5 +1,4 @@
#include "MantidGeometry/Surfaces/Line.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidGeometry/Math/mathSupport.h"
#include "MantidKernel/Matrix.h"
@@ -18,8 +17,6 @@ namespace Mantid
using Kernel::Tolerance;
using Kernel::V3D;
- Kernel::Logger& Line::PLog(Kernel::Logger::get("Line"));
-
Line::Line() : Origin(),Direct()
/**
Constructor
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/LineIntersectVisit.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/LineIntersectVisit.cpp
index fdd3489c9a1..97cf15de8f2 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/LineIntersectVisit.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/LineIntersectVisit.cpp
@@ -1,5 +1,4 @@
#include "MantidGeometry/Surfaces/LineIntersectVisit.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/Exception.h"
#include "MantidGeometry/Surfaces/Surface.h"
@@ -18,8 +17,6 @@ namespace Mantid
namespace Geometry
{
-Kernel::Logger& LineIntersectVisit::PLog(Kernel::Logger::get("LineIntersectVisit"));
-
LineIntersectVisit::LineIntersectVisit
(const Kernel::V3D& Pt,const Kernel::V3D& uVec) :
ATrack(Pt,uVec)
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/Plane.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/Plane.cpp
index faadaf3cc29..95962e6acb5 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/Plane.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/Plane.cpp
@@ -1,6 +1,5 @@
#include "MantidGeometry/Surfaces/Plane.h"
#include "MantidKernel/Exception.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/Tolerance.h"
#include <cfloat>
@@ -15,11 +14,6 @@ namespace Geometry
using Kernel::Tolerance;
using Kernel::V3D;
-Kernel::Logger& Plane::PLog(Kernel::Logger::get("Plane"));
-
-/// Numerical tolerance, now set by Surface::Tolerance
-//const double PTolerance(1e-6);
-
Plane::Plane() : Quadratic(),
NormV(1.0,0.0,0.0),Dist(0)
/**
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/Quadratic.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/Quadratic.cpp
index ecc6b957931..448e4149949 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/Quadratic.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/Quadratic.cpp
@@ -23,7 +23,6 @@
#include "MantidGeometry/Surfaces/Surface.h"
#include "MantidGeometry/Surfaces/Quadratic.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
namespace Mantid
@@ -34,9 +33,6 @@ namespace Geometry
using Kernel::Tolerance;
using Kernel::V3D;
-Kernel::Logger& Quadratic::PLog(Kernel::Logger::get("Quadratic"));
-
-
Quadratic::Quadratic() : Surface(),
BaseEqn(10)
/**
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/Sphere.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/Sphere.cpp
index c88d7ad6f7b..476bf61dc33 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/Sphere.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/Sphere.cpp
@@ -1,5 +1,4 @@
#include "MantidGeometry/Surfaces/Sphere.h"
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/Tolerance.h"
@@ -11,8 +10,6 @@ namespace Mantid
using Kernel::Tolerance;
using Kernel::V3D;
- Kernel::Logger& Sphere::PLog(Kernel::Logger::get("Sphere"));
-
// The number of slices to use to approximate a sphere
int Sphere::g_nslices = 5;
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/Surface.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/Surface.cpp
index 3a22e9264b9..e7593998c1d 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/Surface.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/Surface.cpp
@@ -12,8 +12,6 @@
#include <algorithm>
#include "MantidKernel/Exception.h"
-#include "MantidKernel/Logger.h"
-
#include "MantidKernel/Strings.h"
#include "MantidGeometry/Math/mathSupport.h"
#include "MantidKernel/Matrix.h"
@@ -28,8 +26,6 @@ namespace Mantid
namespace Geometry
{
-Kernel::Logger& Surface::PLog = Kernel::Logger::get("Surface");
-
Surface::Surface() :
Name(-1)
/**
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/SurfaceFactory.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/SurfaceFactory.cpp
index 044ff1d5688..602ce80f8d6 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/SurfaceFactory.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/SurfaceFactory.cpp
@@ -10,7 +10,6 @@
#include <string>
#include <algorithm>
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Matrix.h"
@@ -33,7 +32,6 @@ namespace Mantid
namespace Geometry
{
-Kernel::Logger& SurfaceFactory::PLog(Kernel::Logger::get("SurfaceFactory"));
SurfaceFactory* SurfaceFactory::FOBJ(0);
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/Torus.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/Torus.cpp
index 616386f2828..967b96dc1c8 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/Torus.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/Torus.cpp
@@ -10,9 +10,9 @@
#include <stack>
#include <algorithm>
-#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include "MantidKernel/Exception.h"
+#include "MantidKernel/Logger.h"
#include "MantidKernel/Tolerance.h"
#include "MantidKernel/Matrix.h"
#include "MantidKernel/V3D.h"
@@ -28,7 +28,6 @@ namespace Geometry
using Kernel::Tolerance;
using Kernel::V3D;
- Kernel::Logger& Torus::PLog( Kernel::Logger::get("Torus"));
Torus::Torus() : Surface(),
Centre(), Normal(1,0,0),
@@ -38,7 +37,6 @@ Torus::Torus() : Surface(),
and centre on origin
*/
{
- PLog.error("The torus is not fully implemented currently supported. There are issues with the OpenCASCADE rendering.");
throw Kernel::Exception::NotImplementedError("Torus is not implemented.");
}
@@ -348,7 +346,8 @@ void Torus::getBoundingBox(double &xmax,double &ymax,double &zmax,double &xmin,d
UNUSED_ARG(ymin);
UNUSED_ARG(zmin);
///TODO:
- PLog.warning("Torus::getBoundingBox is not implemented.");
+ Kernel::Logger log("Torus");
+ log.warning("Torus::getBoundingBox is not implemented.");
}
/** Supposed to set the distance from centre of the torus to the centre of tube (i.e. tube which makes up the torus)
--
GitLab