diff --git a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryTriangulator.h b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryTriangulator.h
index cd5be3f9dc47bdd184121c164cd7ffe31352ccae..a70bb0ac536c567f2ac46240974fcde56b6c18c4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryTriangulator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Rendering/GeometryTriangulator.h
@@ -51,7 +51,7 @@ private:
public:
GeometryTriangulator(const CSGObject *obj = nullptr);
- GeometryTriangulator(std::unique_ptr<RenderingMesh> &&obj);
+ GeometryTriangulator(std::unique_ptr<RenderingMesh> obj);
GeometryTriangulator(const GeometryTriangulator &) = delete;
GeometryTriangulator &operator=(const GeometryTriangulator &) = delete;
~GeometryTriangulator();
diff --git a/Framework/Geometry/src/Rendering/GeometryHandler.cpp b/Framework/Geometry/src/Rendering/GeometryHandler.cpp
index c5fe8f0ee0a64215666089047003f4f9f3def068..311a2f488a6ac123ea2be7852e9e230e98de7441 100644
--- a/Framework/Geometry/src/Rendering/GeometryHandler.cpp
+++ b/Framework/Geometry/src/Rendering/GeometryHandler.cpp
@@ -11,8 +11,6 @@
namespace Mantid {
namespace Geometry {
-namespace {}
-
GeometryHandler::GeometryHandler(IObjComponent *comp) : m_objComp(comp) {}
GeometryHandler::GeometryHandler(boost::shared_ptr<CSGObject> obj)
diff --git a/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp b/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp
index 4d67c22d87d932d9b6bdecf69c719c7a3ffb5e87..199814f2509731c39fd953ae20a1a8f34270432e 100644
--- a/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp
+++ b/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp
@@ -63,7 +63,7 @@ GeometryTriangulator::GeometryTriangulator(const CSGObject *obj)
#endif
}
-GeometryTriangulator::GeometryTriangulator(std::unique_ptr<RenderingMesh> &&obj)
+GeometryTriangulator::GeometryTriangulator(std::unique_ptr<RenderingMesh> obj)
: m_isTriangulated(false), m_meshObj(std::move(obj)) {}
GeometryTriangulator::~GeometryTriangulator() {}
diff --git a/Framework/Geometry/test/InstrumentDefinitionParserTest.h b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
index 4b608a3b966038d54ddfe7df550468f977ba5f8c..088dc4d7962d6cb45916832d05ae0ea772faa47d 100644
--- a/Framework/Geometry/test/InstrumentDefinitionParserTest.h
+++ b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
@@ -1066,35 +1066,21 @@ public:
void test_load_wish() {
const auto definition =
m_instrumentDirectoryPath + "/WISH_Definition_10Panels.xml";
- auto start = std::chrono::high_resolution_clock::now();
std::string contents = Strings::loadFile(definition);
InstrumentDefinitionParser parser(definition, "dummy", contents);
auto wishInstrument = parser.parseXML(nullptr);
- auto stop = std::chrono::high_resolution_clock::now();
TS_ASSERT_EQUALS(extractDetectorInfo(*wishInstrument)->size(),
778245); // Sanity check
- std::cout << "Creating WISH instrument took: "
- << std::chrono::duration_cast<std::chrono::milliseconds>(stop -
- start)
- .count()
- << " ms" << std::endl;
}
void test_load_sans2d() {
const auto definition =
m_instrumentDirectoryPath + "/SANS2D_Definition_Tubes.xml";
- auto start = std::chrono::high_resolution_clock::now();
std::string contents = Strings::loadFile(definition);
InstrumentDefinitionParser parser(definition, "dummy", contents);
auto sansInstrument = parser.parseXML(nullptr);
- auto stop = std::chrono::high_resolution_clock::now();
TS_ASSERT_EQUALS(extractDetectorInfo(*sansInstrument)->size(),
122888); // Sanity check
- std::cout << "Creating SANS2D instrument took: "
- << std::chrono::duration_cast<std::chrono::milliseconds>(stop -
- start)
- .count()
- << " ms" << std::endl;
}
private:
diff --git a/Framework/Kernel/CMakeLists.txt b/Framework/Kernel/CMakeLists.txt
index 4a0c9654db791575d067f16270bac833dd8b1842..20123a0f94869668502d9a26e17c36153104e065 100644
--- a/Framework/Kernel/CMakeLists.txt
+++ b/Framework/Kernel/CMakeLists.txt
@@ -585,7 +585,6 @@ set ( CHECK_FOR_NEW_MANTID_VERSION "0" )
set ( ENABLE_USAGE_REPORTS "0" )
set ( PYTHONPLUGIN_DIRS "${MANTID_ROOT}/Framework/PythonInterface/plugins" )
set ( DATADIRS ${ExternalData_BINARY_ROOT}/Testing/Data/UnitTest;${ExternalData_BINARY_ROOT}/Testing/Data/DocTest;${MANTID_ROOT}/instrument )
-message(status "Data Directories ${DATADIRS}")
set ( COLORMAPS_FOLDER ${MANTID_ROOT}/installers/colormaps/ )
set ( MANTIDPUBLISHER "http://upload.mantidproject.org/scriptrepository?debug=1" )
set ( HTML_ROOT ${DOCS_BUILDDIR}/html )
diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index e80ffbd1109297240046c482792b401d3dbe7718..63f443f36c5c0e03dad4bacb06ffaa94366ef41a 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -14,7 +14,6 @@
#include <string>
#include <vector>
-#include <Poco/Glob.h>
#include <Poco/Notification.h>
#include <Poco/NotificationCenter.h>
@@ -253,7 +252,7 @@ public:
Kernel::ProxyInfo &getProxy(const std::string &url);
std::string getFullPath(const std::string &filename, const bool ignoreDirs,
- const Poco::Glob::Options option) const;
+ const int options) const;
private:
friend struct Mantid::Kernel::CreateUsingNew<ConfigServiceImpl>;
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 1a052718d6d1df451e99ffb743a5f533ea40bce2..f8c2487b85da404362b80f9bce9a81f43b7e5381 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -1998,7 +1998,7 @@ Kernel::ProxyInfo &ConfigServiceImpl::getProxy(const std::string &url) {
std::string ConfigServiceImpl::getFullPath(const std::string &filename,
const bool ignoreDirs,
- Poco::Glob::Options options) const {
+ const int options) const {
std::string fName = Kernel::Strings::strip(filename);
g_log.debug() << "getFullPath(" << fName << ")\n";
// If this is already a full path, nothing to do
@@ -2014,11 +2014,10 @@ std::string ConfigServiceImpl::getFullPath(const std::string &filename,
} catch (std::exception &) {
}
- const std::vector<std::string> &searchPaths =
- Kernel::ConfigService::Instance().getDataSearchDirs();
- for (const auto &searchPath : searchPaths) {
+ for (const auto &searchPath :
+ Kernel::ConfigService::Instance().getDataSearchDirs()) {
g_log.debug() << "Searching for " << fName << " in " << searchPath << "\n";
-// On windows globbing is note working properly with network drives
+// On windows globbing is not working properly with network drives
// for example a network drive containing a $
// For this reason, and since windows is case insensitive anyway
// a special case is made for windows
diff --git a/Framework/Kernel/src/DiskBuffer.cpp b/Framework/Kernel/src/DiskBuffer.cpp
index 68afebb07112e0c2eeac4525f46e60c371a71e7a..14409829b4a2ae5a2fd66d85aa41da786b2008ab 100644
--- a/Framework/Kernel/src/DiskBuffer.cpp
+++ b/Framework/Kernel/src/DiskBuffer.cpp
@@ -1,6 +1,5 @@
#include "MantidKernel/DiskBuffer.h"
#include "MantidKernel/ISaveable.h"
-#include <iterator>
#include <sstream>
#include <utility>
diff --git a/Framework/NexusGeometry/inc/MantidNexusGeometry/InstrumentBuilder.h b/Framework/NexusGeometry/inc/MantidNexusGeometry/InstrumentBuilder.h
index ab9cfc9fe68b8a6b30e9351c764f65ec17c3e43f..679191c51a87c6bf54801b56753e4de103395a9c 100644
--- a/Framework/NexusGeometry/inc/MantidNexusGeometry/InstrumentBuilder.h
+++ b/Framework/NexusGeometry/inc/MantidNexusGeometry/InstrumentBuilder.h
@@ -1,6 +1,7 @@
#ifndef MANTIDNEXUSGEOMETRY_INSTRUMENTBUILDER_H
#define MANTIDNEXUSGEOMETRY_INSTRUMENTBUILDER_H
+#include "MantidGeometry/IDTypes.h"
#include "MantidGeometry/Objects/IObject.h"
#include "MantidNexusGeometry/DllConfig.h"
#include "MantidNexusGeometry/TubeBuilder.h"
@@ -55,15 +56,16 @@ public:
boost::shared_ptr<const Mantid::Geometry::IObject> pixelShape);
/// Adds detector to the root (instrument)
void addDetectorToInstrument(
- const std::string &detName, int detId, const Eigen::Vector3d &position,
+ const std::string &detName, detid_t detId,
+ const Eigen::Vector3d &position,
boost::shared_ptr<const Mantid::Geometry::IObject> &shape);
/// Adds detector to the last registered bank
void addDetectorToLastBank(
- const std::string &detName, int detId,
+ const std::string &detName, detid_t detId,
const Eigen::Vector3d &relativeOffset,
boost::shared_ptr<const Mantid::Geometry::IObject> shape);
/// Adds detector to instrument
- void addMonitor(const std::string &detName, int detId,
+ void addMonitor(const std::string &detName, detid_t detId,
const Eigen::Vector3d &position,
boost::shared_ptr<const Mantid::Geometry::IObject> &shape);
/// Add sample
diff --git a/Framework/NexusGeometry/inc/MantidNexusGeometry/NexusShapeFactory.h b/Framework/NexusGeometry/inc/MantidNexusGeometry/NexusShapeFactory.h
index 716a85f40a343998a53cb025e0c072fdeb373961..7a2c08b40a6a7ac0752dccd3f764d7f506790cf3 100644
--- a/Framework/NexusGeometry/inc/MantidNexusGeometry/NexusShapeFactory.h
+++ b/Framework/NexusGeometry/inc/MantidNexusGeometry/NexusShapeFactory.h
@@ -53,7 +53,8 @@ DLLExport std::unique_ptr<const Geometry::IObject>
createMesh(std::vector<uint16_t> &&triangularFaces,
std::vector<Mantid::Kernel::V3D> &&vertices);
-/// Creates a triangular mesh shape based on OFF polygon inputs
+/// Creates a triangular mesh shape based on OFF (Object File Format) polygon
+/// inputs https://en.wikipedia.org/wiki/OFF_(file_format)
DLLExport std::unique_ptr<const Geometry::IObject>
createFromOFFMesh(const std::vector<uint16_t> &faceIndices,
const std::vector<uint16_t> &windingOrder,
diff --git a/Framework/NexusGeometry/src/InstrumentBuilder.cpp b/Framework/NexusGeometry/src/InstrumentBuilder.cpp
index 4b62666a0a28b026f44c9a44b82d13611dc1bbe4..156141f48ab0557e116dcef1e172f9fa7e709faa 100644
--- a/Framework/NexusGeometry/src/InstrumentBuilder.cpp
+++ b/Framework/NexusGeometry/src/InstrumentBuilder.cpp
@@ -106,7 +106,7 @@ void InstrumentBuilder::doAddTube(
}
void InstrumentBuilder::addDetectorToLastBank(
- const std::string &detName, int detId,
+ const std::string &detName, detid_t detId,
const Eigen::Vector3d &relativeOffset,
boost::shared_ptr<const Geometry::IObject> shape) {
verifyMutable();
@@ -126,7 +126,7 @@ void InstrumentBuilder::addDetectorToLastBank(
/// Adds detector to instrument
void InstrumentBuilder::addDetectorToInstrument(
- const std::string &detName, int detId, const Eigen::Vector3d &position,
+ const std::string &detName, detid_t detId, const Eigen::Vector3d &position,
boost::shared_ptr<const Geometry::IObject> &shape) {
verifyMutable();
auto *detector(new Geometry::Detector(
@@ -141,7 +141,7 @@ void InstrumentBuilder::addDetectorToInstrument(
}
void InstrumentBuilder::addMonitor(
- const std::string &detName, int detId, const Eigen::Vector3d &position,
+ const std::string &detName, detid_t detId, const Eigen::Vector3d &position,
boost::shared_ptr<const Geometry::IObject> &shape) {
verifyMutable();
auto *detector(new Geometry::Detector(