From 29bee706faa6f7459f3739f310fa56c07db3bb78 Mon Sep 17 00:00:00 2001
From: Anton Piccardo-Selg <anton.piccardo-selg@tessella.com>
Date: Fri, 16 Oct 2015 15:21:12 +0100
Subject: [PATCH] Refs #13872 Fix clang format
---
.../Crystal/test/ClusterIntegrationBaseTest.h | 1 -
.../Crystal/test/PeakClusterProjectionTest.h | 3 +-
.../src/MDFramesToSpecialCoordinateSystem.cpp | 1 -
.../DataObjects/test/MDHistoWorkspaceTest.h | 12 ++++---
.../MantidGeometry/MDGeometry/GeneralFrame.h | 2 +-
.../inc/MantidGeometry/MDGeometry/HKL.h | 2 +-
.../inc/MantidGeometry/MDGeometry/MDFrame.h | 2 +-
.../inc/MantidGeometry/MDGeometry/QLab.h | 2 +-
.../inc/MantidGeometry/MDGeometry/QSample.h | 2 +-
.../MantidGeometry/MDGeometry/UnknownFrame.h | 2 +-
.../Geometry/src/MDGeometry/GeneralFrame.cpp | 2 +-
Framework/Geometry/src/MDGeometry/QLab.cpp | 10 +++---
.../Geometry/src/MDGeometry/UnknownFrame.cpp | 5 +--
Framework/Kernel/src/MDUnitFactory.cpp | 2 +-
Framework/Kernel/test/MDUnitTest.h | 3 +-
.../MantidMDAlgorithms/CreateMDWorkspace.h | 7 +++--
.../inc/MantidMDAlgorithms/SlicingAlgorithm.h | 26 ++++++++--------
.../src/ConvertSpiceDataToRealSpace.cpp | 2 +-
.../src/ConvertToDiffractionMDWorkspace.cpp | 8 ++---
.../MDAlgorithms/src/SlicingAlgorithm.cpp | 4 +--
Framework/MDAlgorithms/test/BinMDTest.h | 3 +-
.../MDAlgorithms/test/CentroidPeaksMDTest.h | 1 -
.../test/ConvertCWSDMDtoHKLTest.h | 7 ++---
.../ConvertToDiffractionMDWorkspaceTest.h | 2 +-
.../test/CreateMDHistoWorkspaceTest.h | 17 +++++-----
.../test/ImportMDHistoWorkspaceTest.h | 6 ++--
.../MDAlgorithms/test/IntegratePeaksMDTest.h | 2 +-
Framework/MDAlgorithms/test/LoadSQWTest.h | 9 +++---
Framework/MDAlgorithms/test/SliceMDTest.h | 3 +-
.../MDAlgorithms/test/SlicingAlgorithmTest.h | 19 +++++-------
Framework/SINQ/src/SliceMDHisto.cpp | 2 +-
Framework/SINQ/test/InvertMDDimTest.h | 18 +++++------
Framework/SINQ/test/LoadFlexiNexusTest.h | 2 --
.../SINQ/test/MDHistoToWorkspace2DTest.h | 18 +++++------
Framework/SINQ/test/ProjectMDTest.h | 21 +++++++------
Framework/SINQ/test/SliceMDHistoTest.h | 18 +++++------
.../MantidTestHelpers/MDEventsTestHelper.h | 31 +++++++++----------
.../TestHelpers/src/MDEventsTestHelper.cpp | 3 +-
38 files changed, 141 insertions(+), 139 deletions(-)
diff --git a/Framework/Crystal/test/ClusterIntegrationBaseTest.h b/Framework/Crystal/test/ClusterIntegrationBaseTest.h
index 280eee5e9f9..d10eadb3f53 100644
--- a/Framework/Crystal/test/ClusterIntegrationBaseTest.h
+++ b/Framework/Crystal/test/ClusterIntegrationBaseTest.h
@@ -19,7 +19,6 @@
#include "MantidDataObjects/PeaksWorkspace.h"
#include "MantidGeometry/MDGeometry/HKL.h"
-
#include <boost/assign/list_of.hpp>
#include <boost/tuple/tuple.hpp>
#include <set>
diff --git a/Framework/Crystal/test/PeakClusterProjectionTest.h b/Framework/Crystal/test/PeakClusterProjectionTest.h
index 27143bd5779..83250c9ae16 100644
--- a/Framework/Crystal/test/PeakClusterProjectionTest.h
+++ b/Framework/Crystal/test/PeakClusterProjectionTest.h
@@ -115,7 +115,8 @@ public:
Mantid::Geometry::HKL::HKLName, Mantid::Kernel::Units::Symbol::RLU);
auto frame = frameFactory->create(frameArg);
IMDHistoWorkspace_sptr inWS =
- MDEventsTestHelper::makeFakeMDHistoWorkspaceWithMDFrame(1, 2, *frame, 1);
+ MDEventsTestHelper::makeFakeMDHistoWorkspaceWithMDFrame(1, 2, *frame,
+ 1);
inWS->setCoordinateSystem(Mantid::Kernel::HKL);
TSM_ASSERT_THROWS("Must be +3 dimensional",
diff --git a/Framework/DataObjects/src/MDFramesToSpecialCoordinateSystem.cpp b/Framework/DataObjects/src/MDFramesToSpecialCoordinateSystem.cpp
index 14ab183ff3d..e597689320e 100644
--- a/Framework/DataObjects/src/MDFramesToSpecialCoordinateSystem.cpp
+++ b/Framework/DataObjects/src/MDFramesToSpecialCoordinateSystem.cpp
@@ -88,6 +88,5 @@ bool MDFramesToSpecialCoordinateSystem::isUnknownFrame(
}
return isUnknown;
}
-
}
}
\ No newline at end of file
diff --git a/Framework/DataObjects/test/MDHistoWorkspaceTest.h b/Framework/DataObjects/test/MDHistoWorkspaceTest.h
index 321a0e5e1b1..5d3b2fffe5e 100644
--- a/Framework/DataObjects/test/MDHistoWorkspaceTest.h
+++ b/Framework/DataObjects/test/MDHistoWorkspaceTest.h
@@ -422,20 +422,24 @@ public:
// outputs like this.
std::string expectedXML =
std::string("<DimensionSet>") + "<Dimension ID=\"x\">" +
- "<Name>X</Name>" + "<Units>m</Units>" + "<Frame>My General Frame</Frame>" +
+ "<Name>X</Name>" + "<Units>m</Units>" +
+ "<Frame>My General Frame</Frame>" +
"<UpperBounds>10.0000</UpperBounds>" +
"<LowerBounds>-10.0000</LowerBounds>" +
"<NumberOfBins>5</NumberOfBins>" + "</Dimension>" +
"<Dimension ID=\"y\">" + "<Name>Y</Name>" + "<Units>m</Units>" +
- "<Frame>My General Frame</Frame>" + "<UpperBounds>10.0000</UpperBounds>" +
+ "<Frame>My General Frame</Frame>" +
+ "<UpperBounds>10.0000</UpperBounds>" +
"<LowerBounds>-10.0000</LowerBounds>" +
"<NumberOfBins>5</NumberOfBins>" + "</Dimension>" +
"<Dimension ID=\"z\">" + "<Name>Z</Name>" + "<Units>m</Units>" +
- "<Frame>My General Frame</Frame>" + "<UpperBounds>10.0000</UpperBounds>" +
+ "<Frame>My General Frame</Frame>" +
+ "<UpperBounds>10.0000</UpperBounds>" +
"<LowerBounds>-10.0000</LowerBounds>" +
"<NumberOfBins>5</NumberOfBins>" + "</Dimension>" +
"<Dimension ID=\"t\">" + "<Name>T</Name>" + "<Units>m</Units>" +
- "<Frame>My General Frame</Frame>" + "<UpperBounds>10.0000</UpperBounds>" +
+ "<Frame>My General Frame</Frame>" +
+ "<UpperBounds>10.0000</UpperBounds>" +
"<LowerBounds>-10.0000</LowerBounds>" +
"<NumberOfBins>5</NumberOfBins>" + "</Dimension>" + "<XDimension>" +
"<RefDimensionId>x</RefDimensionId>" + "</XDimension>" +
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h
index f4098803b32..524988a3bf3 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/GeneralFrame.h
@@ -47,7 +47,7 @@ public:
const Kernel::MDUnit &getMDUnit() const;
bool canConvertTo(const Kernel::MDUnit &otherUnit) const;
bool isQ() const;
- bool isSameType(const MDFrame& frame) const;
+ bool isSameType(const MDFrame &frame) const;
std::string name() const;
virtual GeneralFrame *clone() const;
Mantid::Kernel::SpecialCoordinateSystem
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
index a0d6d91668f..38eb4bf26c4 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/HKL.h
@@ -48,7 +48,7 @@ public:
const Kernel::MDUnit &getMDUnit() const;
bool canConvertTo(const Kernel::MDUnit &otherUnit) const;
bool isQ() const;
- bool isSameType(const MDFrame& frame) const;
+ bool isSameType(const MDFrame &frame) const;
std::string name() const;
HKL *clone() const;
Mantid::Kernel::SpecialCoordinateSystem
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
index 4c5a59f1b0e..51b9daf745a 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/MDFrame.h
@@ -41,7 +41,7 @@ public:
virtual const Mantid::Kernel::MDUnit &getMDUnit() const = 0;
virtual bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const = 0;
virtual bool isQ() const = 0;
- virtual bool isSameType(const MDFrame& frame) const = 0;
+ virtual bool isSameType(const MDFrame &frame) const = 0;
virtual std::string name() const = 0;
virtual Mantid::Kernel::SpecialCoordinateSystem
equivalientSpecialCoordinateSystem() const = 0;
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
index 8de9491dc9e..c21b349d84d 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QLab.h
@@ -42,7 +42,7 @@ public:
const Mantid::Kernel::MDUnit &getMDUnit() const;
bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const;
bool isQ() const;
- bool isSameType(const MDFrame& frame) const;
+ bool isSameType(const MDFrame &frame) const;
virtual std::string name() const;
QLab *clone() const;
Mantid::Kernel::SpecialCoordinateSystem
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
index 24f2b0f0803..5f932b3eb2e 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/QSample.h
@@ -43,7 +43,7 @@ public:
const Kernel::MDUnit &getMDUnit() const;
bool canConvertTo(const Kernel::MDUnit &otherUnit) const;
bool isQ() const;
- bool isSameType(const MDFrame& frame) const;
+ bool isSameType(const MDFrame &frame) const;
std::string name() const;
QSample *clone() const;
Mantid::Kernel::SpecialCoordinateSystem
diff --git a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
index 9e593e23872..691537e4f07 100644
--- a/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
+++ b/Framework/Geometry/inc/MantidGeometry/MDGeometry/UnknownFrame.h
@@ -42,7 +42,7 @@ public:
std::string name() const;
bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const;
bool isQ() const;
- bool isSameType(const MDFrame& frame) const;
+ bool isSameType(const MDFrame &frame) const;
Mantid::Kernel::UnitLabel getUnitLabel() const;
const Mantid::Kernel::MDUnit &getMDUnit() const;
Mantid::Kernel::SpecialCoordinateSystem
diff --git a/Framework/Geometry/src/MDGeometry/GeneralFrame.cpp b/Framework/Geometry/src/MDGeometry/GeneralFrame.cpp
index 502f4ebbdc3..643ccf8e694 100644
--- a/Framework/Geometry/src/MDGeometry/GeneralFrame.cpp
+++ b/Framework/Geometry/src/MDGeometry/GeneralFrame.cpp
@@ -5,7 +5,7 @@ namespace Geometry {
const std::string GeneralFrame::GeneralFrameDistance = "Distance";
const std::string GeneralFrame::GeneralFrameTOF = "Time of Flight";
-const std::string GeneralFrame::GeneralFrameName = "General Frame";
+const std::string GeneralFrame::GeneralFrameName = "General Frame";
GeneralFrame::GeneralFrame(const std::string &frameName,
std::unique_ptr<Kernel::MDUnit> unit)
diff --git a/Framework/Geometry/src/MDGeometry/QLab.cpp b/Framework/Geometry/src/MDGeometry/QLab.cpp
index 28f50d7dce6..5aa39501ce7 100644
--- a/Framework/Geometry/src/MDGeometry/QLab.cpp
+++ b/Framework/Geometry/src/MDGeometry/QLab.cpp
@@ -40,15 +40,13 @@ QLab::equivalientSpecialCoordinateSystem() const {
return Mantid::Kernel::SpecialCoordinateSystem::QLab;
}
-bool QLab::isQ() const {
- return true;
-}
+bool QLab::isQ() const { return true; }
-bool QLab::isSameType(const MDFrame& frame) const {
+bool QLab::isSameType(const MDFrame &frame) const {
auto isSameType = true;
try {
- dynamic_cast<const QLab&>(frame);
- } catch (std::bad_cast&) {
+ dynamic_cast<const QLab &>(frame);
+ } catch (std::bad_cast &) {
isSameType = false;
}
return isSameType;
diff --git a/Framework/Geometry/src/MDGeometry/UnknownFrame.cpp b/Framework/Geometry/src/MDGeometry/UnknownFrame.cpp
index 6978a0fae51..20baef37de6 100644
--- a/Framework/Geometry/src/MDGeometry/UnknownFrame.cpp
+++ b/Framework/Geometry/src/MDGeometry/UnknownFrame.cpp
@@ -36,9 +36,7 @@ UnknownFrame *UnknownFrame::clone() const {
return new UnknownFrame(std::unique_ptr<Kernel::MDUnit>(m_unit->clone()));
}
-bool UnknownFrame::isQ() const{
- return false;
-}
+bool UnknownFrame::isQ() const { return false; }
bool UnknownFrame::isSameType(const MDFrame &frame) const {
auto isSameType = true;
@@ -49,6 +47,5 @@ bool UnknownFrame::isSameType(const MDFrame &frame) const {
}
return isSameType;
}
-
}
}
diff --git a/Framework/Kernel/src/MDUnitFactory.cpp b/Framework/Kernel/src/MDUnitFactory.cpp
index 3b0371d9161..396cbd9ff29 100644
--- a/Framework/Kernel/src/MDUnitFactory.cpp
+++ b/Framework/Kernel/src/MDUnitFactory.cpp
@@ -34,7 +34,7 @@ bool InverseAngstromsUnitFactory::canInterpret(
}
ReciprocalLatticeUnit *
-ReciprocalLatticeUnitFactory::createRaw(const std::string & unitString) const {
+ReciprocalLatticeUnitFactory::createRaw(const std::string &unitString) const {
return new ReciprocalLatticeUnit(UnitLabel(unitString));
}
diff --git a/Framework/Kernel/test/MDUnitTest.h b/Framework/Kernel/test/MDUnitTest.h
index 757fe99edf6..5cdf680425e 100644
--- a/Framework/Kernel/test/MDUnitTest.h
+++ b/Framework/Kernel/test/MDUnitTest.h
@@ -21,7 +21,8 @@ public:
TS_ASSERT_EQUALS(unitLabel.ascii(), unit.getUnitLabel().ascii());
}
- void test_RLU_Constructor_with_invalid_special_unit_label_does_not_accept_the_label() {
+ void
+ test_RLU_Constructor_with_invalid_special_unit_label_does_not_accept_the_label() {
auto unitLabel = UnitLabel("in invalidLabel A-1");
ReciprocalLatticeUnit unit(unitLabel);
TS_ASSERT_EQUALS(Units::Symbol::RLU, unit.getUnitLabel());
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
index cbd7db39716..3dcd52e01b2 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
@@ -38,14 +38,17 @@ public:
/// Algorithm's category for identification
virtual const std::string category() const { return "MDAlgorithms"; }
virtual std::map<std::string, std::string> validateInputs();
+
private:
void init();
void exec();
template <typename MDE, size_t nd>
void finish(typename DataObjects::MDEventWorkspace<MDE, nd>::sptr ws);
- Mantid::Geometry::MDFrame_uptr createMDFrame(std::string frame, std::string unit);
- bool checkIfFrameValid(const std::string& frame, const std::vector<std::string>& targetFrames);
+ Mantid::Geometry::MDFrame_uptr createMDFrame(std::string frame,
+ std::string unit);
+ bool checkIfFrameValid(const std::string &frame,
+ const std::vector<std::string> &targetFrames);
};
} // namespace Mantid
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SlicingAlgorithm.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SlicingAlgorithm.h
index 6f824da3cfa..0d6b86fd8fd 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SlicingAlgorithm.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SlicingAlgorithm.h
@@ -151,19 +151,19 @@ protected:
/// The NormalizeBasisVectors option
bool m_NormalizeBasisVectors;
- private:
- Mantid::Geometry::MDFrame_uptr
- createMDFrameForNonAxisAligned(std::string units,
- Mantid::Kernel::VMD basisVector) const;
- std::vector<Mantid::Kernel::VMD> getOldBasis(size_t dimension) const;
- bool isProjectingOnFrame(const Mantid::Kernel::VMD &oldVector,
- const Mantid::Kernel::VMD &basisVector) const;
- std::vector<size_t> getIndicesWithProjection(
- const Mantid::Kernel::VMD &basisVector,
- const std::vector<Mantid::Kernel::VMD> &oldBasis) const;
- Mantid::Geometry::MDFrame_uptr
- extractMDFrameForNonAxisAligned(std::vector<size_t> indicesWithProjection,
- std::string units) const;
+private:
+ Mantid::Geometry::MDFrame_uptr
+ createMDFrameForNonAxisAligned(std::string units,
+ Mantid::Kernel::VMD basisVector) const;
+ std::vector<Mantid::Kernel::VMD> getOldBasis(size_t dimension) const;
+ bool isProjectingOnFrame(const Mantid::Kernel::VMD &oldVector,
+ const Mantid::Kernel::VMD &basisVector) const;
+ std::vector<size_t> getIndicesWithProjection(
+ const Mantid::Kernel::VMD &basisVector,
+ const std::vector<Mantid::Kernel::VMD> &oldBasis) const;
+ Mantid::Geometry::MDFrame_uptr
+ extractMDFrameForNonAxisAligned(std::vector<size_t> indicesWithProjection,
+ std::string units) const;
};
} // namespace DataObjects
diff --git a/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp b/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp
index d012bc02fb9..aadb3d48503 100644
--- a/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp
+++ b/Framework/MDAlgorithms/src/ConvertSpiceDataToRealSpace.cpp
@@ -605,7 +605,7 @@ IMDEventWorkspace_sptr ConvertSpiceDataToRealSpace::createDataMDWorkspace(
// Create MDFrame of General Frame type
Mantid::Geometry::GeneralFrame frame(
- Mantid::Geometry::GeneralFrame::GeneralFrameDistance, "m");
+ Mantid::Geometry::GeneralFrame::GeneralFrameDistance, "m");
// Add dimensions
for (size_t i = 0; i < m_nDimensions; ++i) {
diff --git a/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp b/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
index e5babed5499..3135b45ca53 100644
--- a/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
+++ b/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace.cpp
@@ -443,10 +443,10 @@ void ConvertToDiffractionMDWorkspace::exec() {
// Give all the dimensions
for (size_t d = 0; d < nd; d++) {
- MDHistoDimension *dim = new MDHistoDimension(
- dimensionNames[d], dimensionNames[d], *frame,
- static_cast<coord_t>(extents[d * 2]),
- static_cast<coord_t>(extents[d * 2 + 1]), 10);
+ MDHistoDimension *dim =
+ new MDHistoDimension(dimensionNames[d], dimensionNames[d], *frame,
+ static_cast<coord_t>(extents[d * 2]),
+ static_cast<coord_t>(extents[d * 2 + 1]), 10);
ws->addDimension(MDHistoDimension_sptr(dim));
}
ws->initialize();
diff --git a/Framework/MDAlgorithms/src/SlicingAlgorithm.cpp b/Framework/MDAlgorithms/src/SlicingAlgorithm.cpp
index 123a988f178..296d2eee102 100644
--- a/Framework/MDAlgorithms/src/SlicingAlgorithm.cpp
+++ b/Framework/MDAlgorithms/src/SlicingAlgorithm.cpp
@@ -1082,12 +1082,12 @@ SlicingAlgorithm::extractMDFrameForNonAxisAligned(
"project on any vector of the old basis.");
}
// Get a reference frame to perform pairwise comparison
- const auto& referenceMDFrame =
+ const auto &referenceMDFrame =
m_inWS->getDimension(indicesWithProjection[0])->getMDFrame();
for (auto it = indicesWithProjection.begin();
it != indicesWithProjection.end(); ++it) {
- const auto& toCheckMDFrame = m_inWS->getDimension(*it)->getMDFrame();
+ const auto &toCheckMDFrame = m_inWS->getDimension(*it)->getMDFrame();
if (!referenceMDFrame.isSameType(toCheckMDFrame)) {
throw std::runtime_error("Slicing Algorithm: New basis yvector tries to "
"mix un-mixable MDFrame types.");
diff --git a/Framework/MDAlgorithms/test/BinMDTest.h b/Framework/MDAlgorithms/test/BinMDTest.h
index 623bdc51509..24f1e322801 100644
--- a/Framework/MDAlgorithms/test/BinMDTest.h
+++ b/Framework/MDAlgorithms/test/BinMDTest.h
@@ -117,7 +117,8 @@ public:
Mantid::Geometry::QSample frame;
IMDEventWorkspace_sptr in_ws =
- MDEventsTestHelper::makeAnyMDEWWithFrames<MDLeanEvent<3>, 3>(10, 0.0, 10.0, frame, numEventsPerBox);
+ MDEventsTestHelper::makeAnyMDEWWithFrames<MDLeanEvent<3>, 3>(
+ 10, 0.0, 10.0, frame, numEventsPerBox);
Mantid::Kernel::SpecialCoordinateSystem appliedCoord =
Mantid::Kernel::QSample;
diff --git a/Framework/MDAlgorithms/test/CentroidPeaksMDTest.h b/Framework/MDAlgorithms/test/CentroidPeaksMDTest.h
index 28819fc8675..119083d1179 100644
--- a/Framework/MDAlgorithms/test/CentroidPeaksMDTest.h
+++ b/Framework/MDAlgorithms/test/CentroidPeaksMDTest.h
@@ -34,7 +34,6 @@ using namespace Mantid::Geometry;
using namespace Mantid::MDAlgorithms;
using Mantid::Kernel::V3D;
-
class CentroidPeaksMDTest : public CxxTest::TestSuite {
public:
void test_Init() {
diff --git a/Framework/MDAlgorithms/test/ConvertCWSDMDtoHKLTest.h b/Framework/MDAlgorithms/test/ConvertCWSDMDtoHKLTest.h
index 79d16730c8a..d7478d3f889 100644
--- a/Framework/MDAlgorithms/test/ConvertCWSDMDtoHKLTest.h
+++ b/Framework/MDAlgorithms/test/ConvertCWSDMDtoHKLTest.h
@@ -79,10 +79,9 @@ private:
"CreateMDWorkspace", 20, "Dimensions", "3", "EventType", "MDEvent",
"Extents", "-10,10,-10,10,-10,10", "Names",
"Q_sample_x,Q_sample_y,Q_sample_z", "Units",
- "Q_Sample_X,Q_Sample_Y,Q_Sample_Z",
- "Frames", "QSample,QSample,QSample",
- "SplitInto", "5", "SplitThreshold",
- "20", "MaxRecursionDepth", "15", "OutputWorkspace", "MDEWS");
+ "Q_Sample_X,Q_Sample_Y,Q_Sample_Z", "Frames", "QSample,QSample,QSample",
+ "SplitInto", "5", "SplitThreshold", "20", "MaxRecursionDepth", "15",
+ "OutputWorkspace", "MDEWS");
// Give it an instrument
Instrument_sptr inst =
diff --git a/Framework/MDAlgorithms/test/ConvertToDiffractionMDWorkspaceTest.h b/Framework/MDAlgorithms/test/ConvertToDiffractionMDWorkspaceTest.h
index f29e2d50d36..60ebf9d1017 100644
--- a/Framework/MDAlgorithms/test/ConvertToDiffractionMDWorkspaceTest.h
+++ b/Framework/MDAlgorithms/test/ConvertToDiffractionMDWorkspaceTest.h
@@ -50,7 +50,7 @@ public:
return;
TS_ASSERT_EQUALS(ws->getDimension(0)->getName(), "Q_lab_x");
TS_ASSERT_EQUALS(ws->getSpecialCoordinateSystem(), Mantid::Kernel::QLab);
- // Test the frame type
+ // Test the frame type
for (size_t dim = 0; dim < ws->getNumDims(); ++dim) {
const auto &frame = ws->getDimension(dim)->getMDFrame();
TSM_ASSERT_THROWS_NOTHING(
diff --git a/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h b/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
index 91a31c184ba..419b9e5f898 100644
--- a/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
+++ b/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
@@ -124,10 +124,11 @@ public:
TS_ASSERT_EQUALS("A", dim1->getName());
TS_ASSERT_EQUALS("A", dim1->getDimensionId());
- TSM_ASSERT("Should not be set to U any longer", "U" != dim1->getUnits().ascii());
+ TSM_ASSERT("Should not be set to U any longer",
+ "U" != dim1->getUnits().ascii());
TSM_ASSERT_THROWS_NOTHING(
- "Should be convertible to a QSample frame",
- dynamic_cast<const Mantid::Geometry::QSample &>(dim1->getMDFrame()));
+ "Should be convertible to a QSample frame",
+ dynamic_cast<const Mantid::Geometry::QSample &>(dim1->getMDFrame()));
TS_ASSERT_EQUALS(1, dim1->getMaximum());
TS_ASSERT_EQUALS(-1, dim1->getMinimum());
TS_ASSERT_EQUALS(5, dim1->getNBins());
@@ -185,11 +186,13 @@ public:
// Check frame and label
TSM_ASSERT("Should be set to U", "U" == dim1->getUnits().ascii());
TSM_ASSERT_THROWS_NOTHING(
- "Should be convertible to a General Frame",
- dynamic_cast<const Mantid::Geometry::GeneralFrame &>(dim1->getMDFrame()));
+ "Should be convertible to a General Frame",
+ dynamic_cast<const Mantid::Geometry::GeneralFrame &>(
+ dim1->getMDFrame()));
TSM_ASSERT_THROWS_NOTHING(
- "Should be convertible to a General Frame",
- dynamic_cast<const Mantid::Geometry::GeneralFrame &>(dim2->getMDFrame()));
+ "Should be convertible to a General Frame",
+ dynamic_cast<const Mantid::Geometry::GeneralFrame &>(
+ dim2->getMDFrame()));
// Check the data
double *signals = outWs->getSignalArray();
diff --git a/Framework/MDAlgorithms/test/ImportMDHistoWorkspaceTest.h b/Framework/MDAlgorithms/test/ImportMDHistoWorkspaceTest.h
index 8091c8b9006..c940011f514 100644
--- a/Framework/MDAlgorithms/test/ImportMDHistoWorkspaceTest.h
+++ b/Framework/MDAlgorithms/test/ImportMDHistoWorkspaceTest.h
@@ -278,7 +278,8 @@ public:
alg->setPropertyValue("NumberOfBins", "2,2,2");
alg->setPropertyValue("Names", "A,B,C");
alg->setPropertyValue("Units", "U,U,U");
- TS_ASSERT_THROWS_NOTHING(alg->setPropertyValue("Frames", "QSample, QSample, QSample"));
+ TS_ASSERT_THROWS_NOTHING(
+ alg->setPropertyValue("Frames", "QSample, QSample, QSample"));
alg->setPropertyValue("OutputWorkspace", "test_workspace");
alg->setRethrows(true);
alg->execute();
@@ -304,7 +305,8 @@ public:
TSM_ASSERT_THROWS_NOTHING(
"Should be convertible to a QSample frame",
dynamic_cast<const Mantid::Geometry::QSample &>(frame));
- TSM_ASSERT("Should not be set to U any longer", "U" != dimension->getUnits().ascii());
+ TSM_ASSERT("Should not be set to U any longer",
+ "U" != dimension->getUnits().ascii());
}
ADS.remove("test_workspace");
diff --git a/Framework/MDAlgorithms/test/IntegratePeaksMDTest.h b/Framework/MDAlgorithms/test/IntegratePeaksMDTest.h
index b21c19441bf..8dae71650dc 100644
--- a/Framework/MDAlgorithms/test/IntegratePeaksMDTest.h
+++ b/Framework/MDAlgorithms/test/IntegratePeaksMDTest.h
@@ -133,7 +133,7 @@ public:
AnalysisDataService::Instance().retrieveWS<MDEventWorkspace3Lean>(
"IntegratePeaksMDTest_MDEWS");
mdews->setCoordinateSystem(Mantid::Kernel::HKL);
- auto& frame = mdews->getDimension(0)->getMDFrame();
+ auto &frame = mdews->getDimension(0)->getMDFrame();
TS_ASSERT_EQUALS(mdews->getNPoints(), 3000);
TS_ASSERT_DELTA(mdews->getBox()->getSignal(), 3000.0, 1e-2);
diff --git a/Framework/MDAlgorithms/test/LoadSQWTest.h b/Framework/MDAlgorithms/test/LoadSQWTest.h
index a71aebaf1cc..a192b4001cf 100644
--- a/Framework/MDAlgorithms/test/LoadSQWTest.h
+++ b/Framework/MDAlgorithms/test/LoadSQWTest.h
@@ -159,10 +159,11 @@ public:
TS_ASSERT_EQUALS("en", d->getDimensionId());
// Check Units
- auto expectedUnit = Mantid::Kernel::InverseAngstromsUnit().getUnitLabel().ascii();
- TS_ASSERT_EQUALS(expectedUnit , a->getUnits().ascii());
- TS_ASSERT_EQUALS(expectedUnit , b->getUnits().ascii());
- TS_ASSERT_EQUALS(expectedUnit , c->getUnits().ascii());
+ auto expectedUnit =
+ Mantid::Kernel::InverseAngstromsUnit().getUnitLabel().ascii();
+ TS_ASSERT_EQUALS(expectedUnit, a->getUnits().ascii());
+ TS_ASSERT_EQUALS(expectedUnit, b->getUnits().ascii());
+ TS_ASSERT_EQUALS(expectedUnit, c->getUnits().ascii());
TS_ASSERT_EQUALS("meV", d->getUnits().ascii());
// Check Nbins
diff --git a/Framework/MDAlgorithms/test/SliceMDTest.h b/Framework/MDAlgorithms/test/SliceMDTest.h
index 7a043a5a790..f6089251263 100644
--- a/Framework/MDAlgorithms/test/SliceMDTest.h
+++ b/Framework/MDAlgorithms/test/SliceMDTest.h
@@ -148,7 +148,8 @@ public:
TS_ASSERT(alg.isInitialized())
Mantid::Geometry::QSample frame;
IMDEventWorkspace_sptr in_ws =
- MDEventsTestHelper::makeAnyMDEWWithFrames<MDE, nd>(10, 0.0, 10.0, frame, 1);
+ MDEventsTestHelper::makeAnyMDEWWithFrames<MDE, nd>(10, 0.0, 10.0, frame,
+ 1);
Mantid::Kernel::SpecialCoordinateSystem appliedCoord =
Mantid::Kernel::QSample;
in_ws->setCoordinateSystem(appliedCoord);
diff --git a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
index f1677226372..a33b6405eb1 100644
--- a/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
+++ b/Framework/MDAlgorithms/test/SlicingAlgorithmTest.h
@@ -112,7 +112,7 @@ public:
alg.makeAlignedDimensionFromString("Axis0, 11.0, 9.0"));
}
- void test_makeAlignedDimensionFromString() {
+ void test_makeAlignedDimensionFromString() {
SlicingAlgorithmImpl alg;
alg.m_inWS = ws;
TSM_ASSERT_THROWS_NOTHING(
@@ -437,7 +437,6 @@ public:
}
}
-
void test_makeBasisVectorFromString_WithPureQSampleInput() {
// Test WITH and WITHOUT basis vector normalization
for (int normalize = 0; normalize < 2; normalize++) {
@@ -495,7 +494,8 @@ public:
}
}
- void test_makeBasisVectorFromString_WithMixedMDFrames_AndBasisVectorNotMixed() {
+ void
+ test_makeBasisVectorFromString_WithMixedMDFrames_AndBasisVectorNotMixed() {
// Test WITH and WITHOUT basis vector normalization
for (int normalize = 0; normalize < 2; normalize++) {
SlicingAlgorithmImpl alg;
@@ -506,7 +506,7 @@ public:
alg.m_maxExtents.push_back(+5.0);
alg.m_numBins.push_back(20);
alg.m_NormalizeBasisVectors = (normalize > 0);
-
+
TS_ASSERT_EQUALS(alg.m_bases.size(), 0);
TSM_ASSERT_THROWS_NOTHING(
"", alg.makeBasisVectorFromString(
@@ -555,8 +555,7 @@ public:
}
}
- void
- test_makeBasisVectorFromString_WithMixedMDFrames_AndBasisVectorMixed() {
+ void test_makeBasisVectorFromString_WithMixedMDFrames_AndBasisVectorMixed() {
// Test WITH and WITHOUT basis vector normalization
for (int normalize = 0; normalize < 2; normalize++) {
SlicingAlgorithmImpl alg;
@@ -569,10 +568,9 @@ public:
alg.m_NormalizeBasisVectors = (normalize > 0);
TS_ASSERT_EQUALS(alg.m_bases.size(), 0);
- TSM_ASSERT_THROWS(
- "BASIS vector is NOT IN QSample sub-space",
- alg.makeBasisVectorFromString(" name, units , 1,2,3,1"),
- std::runtime_error);
+ TSM_ASSERT_THROWS("BASIS vector is NOT IN QSample sub-space",
+ alg.makeBasisVectorFromString(" name, units , 1,2,3,1"),
+ std::runtime_error);
}
}
@@ -807,7 +805,6 @@ public:
TS_ASSERT(!func->isPointContained(VMD(1.5, 1.5, 1.5, 11.5)));
}
-
/** 4D "left-handed" coordinate system
* obtained by flipping the Y basis vector. */
void test_createGeneralTransform_4D_to_4D_LeftHanded() {
diff --git a/Framework/SINQ/src/SliceMDHisto.cpp b/Framework/SINQ/src/SliceMDHisto.cpp
index b415a4afd50..433918f5ffa 100644
--- a/Framework/SINQ/src/SliceMDHisto.cpp
+++ b/Framework/SINQ/src/SliceMDHisto.cpp
@@ -75,7 +75,7 @@ void SliceMDHisto::exec() {
for (unsigned int k = 0; k < m_rank; ++k) {
boost::shared_ptr<const IMDDimension> arDim = inWS->getDimension(k);
dimensions.push_back(MDHistoDimension_sptr(new MDHistoDimension(
- arDim->getName(), arDim->getName(), arDim->getMDFrame(),
+ arDim->getName(), arDim->getName(), arDim->getMDFrame(),
arDim->getX(start[k]), arDim->getX(end[k]), end[k] - start[k])));
}
MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
diff --git a/Framework/SINQ/test/InvertMDDimTest.h b/Framework/SINQ/test/InvertMDDimTest.h
index ff52f734473..50420567929 100644
--- a/Framework/SINQ/test/InvertMDDimTest.h
+++ b/Framework/SINQ/test/InvertMDDimTest.h
@@ -113,17 +113,17 @@ private:
Mantid::Geometry::GeneralFrame frame(
Mantid::Geometry::GeneralFrame::GeneralFrameDistance, "mm");
std::vector<IMDDimension_sptr> dimensions;
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("x"), std::string("ID0"), frame, coord_t(-5),
- coord_t(5), size_t(10)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("x"), std::string("ID0"), frame,
+ coord_t(-5), coord_t(5), size_t(10)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("y"), std::string("ID1"), frame, coord_t(-6),
- coord_t(6), size_t(12)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("y"), std::string("ID1"), frame,
+ coord_t(-6), coord_t(6), size_t(12)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("z"), std::string("ID2"), frame, coord_t(-10),
- coord_t(10), size_t(20)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("z"), std::string("ID2"), frame,
+ coord_t(-10), coord_t(10), size_t(20)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
diff --git a/Framework/SINQ/test/LoadFlexiNexusTest.h b/Framework/SINQ/test/LoadFlexiNexusTest.h
index 418b57ab0ad..ad43fde6f3a 100644
--- a/Framework/SINQ/test/LoadFlexiNexusTest.h
+++ b/Framework/SINQ/test/LoadFlexiNexusTest.h
@@ -65,8 +65,6 @@ public:
TS_ASSERT_DELTA(dimi->getMinimum(), -86, .1);
TS_ASSERT_DELTA(dimi->getMaximum(), 84.65, .1);
-
-
// test some meta data
std::string title = data->getTitle();
size_t found = title.find("Selene");
diff --git a/Framework/SINQ/test/MDHistoToWorkspace2DTest.h b/Framework/SINQ/test/MDHistoToWorkspace2DTest.h
index 03bc6664002..f20d7f8c147 100644
--- a/Framework/SINQ/test/MDHistoToWorkspace2DTest.h
+++ b/Framework/SINQ/test/MDHistoToWorkspace2DTest.h
@@ -77,17 +77,17 @@ private:
Mantid::Geometry::GeneralFrame frame(
Mantid::Geometry::GeneralFrame::GeneralFrameDistance, "mm");
std::vector<IMDDimension_sptr> dimensions;
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("x"), std::string("ID0"), frame, coord_t(-50),
- coord_t(50), size_t(100)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("x"), std::string("ID0"), frame,
+ coord_t(-50), coord_t(50), size_t(100)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("y"), std::string("ID1"), frame, coord_t(-60),
- coord_t(60), size_t(120)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("y"), std::string("ID1"), frame,
+ coord_t(-60), coord_t(60), size_t(120)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("z"), std::string("ID2"), frame, coord_t(-100),
- coord_t(100), size_t(200)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("z"), std::string("ID2"), frame,
+ coord_t(-100), coord_t(100), size_t(200)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
diff --git a/Framework/SINQ/test/ProjectMDTest.h b/Framework/SINQ/test/ProjectMDTest.h
index 47c4343bba7..f3fd48f35b7 100644
--- a/Framework/SINQ/test/ProjectMDTest.h
+++ b/Framework/SINQ/test/ProjectMDTest.h
@@ -228,19 +228,20 @@ public:
private:
MDHistoWorkspace_sptr makeTestMD() {
IMDDimension_sptr dim;
- Mantid::Geometry::GeneralFrame frame(Mantid::Geometry::GeneralFrame::GeneralFrameDistance, "mm");
+ Mantid::Geometry::GeneralFrame frame(
+ Mantid::Geometry::GeneralFrame::GeneralFrameDistance, "mm");
std::vector<IMDDimension_sptr> dimensions;
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("x"), std::string("ID0"), frame, coord_t(-5),
- coord_t(5), size_t(10)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("x"), std::string("ID0"), frame,
+ coord_t(-5), coord_t(5), size_t(10)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("y"), std::string("ID1"), frame, coord_t(-6),
- coord_t(6), size_t(12)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("y"), std::string("ID1"), frame,
+ coord_t(-6), coord_t(6), size_t(12)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("z"), std::string("ID2"), frame, coord_t(-10),
- coord_t(10), size_t(20)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("z"), std::string("ID2"), frame,
+ coord_t(-10), coord_t(10), size_t(20)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
diff --git a/Framework/SINQ/test/SliceMDHistoTest.h b/Framework/SINQ/test/SliceMDHistoTest.h
index 00cf3d72d1e..cb5e44d7b04 100644
--- a/Framework/SINQ/test/SliceMDHistoTest.h
+++ b/Framework/SINQ/test/SliceMDHistoTest.h
@@ -92,17 +92,17 @@ private:
std::vector<IMDDimension_sptr> dimensions;
Mantid::Geometry::GeneralFrame frame(
Mantid::Geometry::GeneralFrame::GeneralFrameDistance, "mm");
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("x"), std::string("ID0"), frame, coord_t(-50),
- coord_t(50), size_t(100)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("x"), std::string("ID0"), frame,
+ coord_t(-50), coord_t(50), size_t(100)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("y"), std::string("ID1"), frame, coord_t(-60),
- coord_t(60), size_t(120)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("y"), std::string("ID1"), frame,
+ coord_t(-60), coord_t(60), size_t(120)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
- dim = MDHistoDimension_sptr(new MDHistoDimension(
- std::string("z"), std::string("ID2"), frame, coord_t(-100),
- coord_t(100), size_t(200)));
+ dim = MDHistoDimension_sptr(
+ new MDHistoDimension(std::string("z"), std::string("ID2"), frame,
+ coord_t(-100), coord_t(100), size_t(200)));
dimensions.push_back(boost::const_pointer_cast<IMDDimension>(dim));
MDHistoWorkspace_sptr outWS(new MDHistoWorkspace(dimensions));
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
index ab7872e02a2..d4c1a04d915 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/MDEventsTestHelper.h
@@ -79,7 +79,7 @@ template <typename MDE, size_t nd>
void addMDDimensionsWithIndividualFrames(
boost::shared_ptr<Mantid::DataObjects::MDEventWorkspace<MDE, nd>> out,
Mantid::coord_t min, Mantid::coord_t max,
- const std::vector<Mantid::Geometry::MDFrame_sptr>& frame,
+ const std::vector<Mantid::Geometry::MDFrame_sptr> &frame,
std::string axisNameFormat, std::string axisIdFormat) {
for (size_t d = 0; d < nd; d++) {
char name[200];
@@ -217,7 +217,6 @@ makeAnyMDEW(size_t splitInto, coord_t min, coord_t max,
return out;
}
-
/** Create a test MDEventWorkspace<nd> . Dimensions are names Axis0, Axis1, etc.
* But you can set an MDFrame. The frames can be set individually.
*
@@ -236,17 +235,18 @@ makeAnyMDEW(size_t splitInto, coord_t min, coord_t max,
*/
template <typename MDE, size_t nd>
boost::shared_ptr<Mantid::DataObjects::MDEventWorkspace<MDE, nd>>
-makeAnyMDEWWithIndividualFrames(size_t splitInto, coord_t min, coord_t max,
- std::vector<Mantid::Geometry::MDFrame_sptr>frames,
- size_t numEventsPerBox = 0, std::string wsName = "",
- std::string axisNameFormat = "Axis%d",
- std::string axisIdFormat = "Axis%d") {
+makeAnyMDEWWithIndividualFrames(
+ size_t splitInto, coord_t min, coord_t max,
+ std::vector<Mantid::Geometry::MDFrame_sptr> frames,
+ size_t numEventsPerBox = 0, std::string wsName = "",
+ std::string axisNameFormat = "Axis%d",
+ std::string axisIdFormat = "Axis%d") {
// Create bare workspace
auto out = createOutputWorkspace<MDE, nd>(splitInto);
// Add standard dimensions
- addMDDimensionsWithIndividualFrames<MDE, nd>(out, min, max, frames, axisNameFormat,
- axisIdFormat);
+ addMDDimensionsWithIndividualFrames<MDE, nd>(out, min, max, frames,
+ axisNameFormat, axisIdFormat);
// Add data
addData<MDE, nd>(out, splitInto, min, max, numEventsPerBox);
@@ -320,15 +320,14 @@ makeMDEWWithFrames(size_t splitInto, coord_t min, coord_t max,
/** Make a MDEventWorkspace with MDLeanEvents and individual MDFrames*/
template <size_t nd>
boost::shared_ptr<MDEventWorkspace<MDLeanEvent<nd>, nd>>
-makeMDEWWithIndividualFrames(size_t splitInto, coord_t min, coord_t max,
- const std::vector<Mantid::Geometry::MDFrame_sptr>& frame,
- size_t numEventsPerBox = 0) {
- return makeAnyMDEWWithIndividualFrames<MDLeanEvent<nd>, nd>(splitInto, min, max, frame,
- numEventsPerBox);
+makeMDEWWithIndividualFrames(
+ size_t splitInto, coord_t min, coord_t max,
+ const std::vector<Mantid::Geometry::MDFrame_sptr> &frame,
+ size_t numEventsPerBox = 0) {
+ return makeAnyMDEWWithIndividualFrames<MDLeanEvent<nd>, nd>(
+ splitInto, min, max, frame, numEventsPerBox);
}
-
-
/** Make a MDEventWorkspace with MDEvents - updated to split dims by splitInto,
* not 10 */
template <size_t nd>
diff --git a/Framework/TestHelpers/src/MDEventsTestHelper.cpp b/Framework/TestHelpers/src/MDEventsTestHelper.cpp
index 7981087129f..5bf97f422fe 100644
--- a/Framework/TestHelpers/src/MDEventsTestHelper.cpp
+++ b/Framework/TestHelpers/src/MDEventsTestHelper.cpp
@@ -301,13 +301,13 @@ MDHistoWorkspace_sptr makeFakeMDHistoWorkspaceGeneral(
return ws_sptr;
}
-
//-------------------------------------------------------------------------------------
/** Creates a fake MDHistoWorkspace with MDFrame selection
*
* @param signal :: signal in every point
* @param numDims :: number of dimensions to create. They will range from 0 to
*max
+ * @param frame :: the selected frame
* @param numBins :: bins in each dimensions
* @param max :: max position in each dimension
* @param errorSquared :: error squared in every point
@@ -359,7 +359,6 @@ Mantid::DataObjects::MDHistoWorkspace_sptr makeFakeMDHistoWorkspaceWithMDFrame(
return ws_sptr;
}
-
/**
* Delete a file from disk
* @param filename : File name to check and delete
--
GitLab