Skip to content
Snippets Groups Projects
Commit 253e0ded authored by Anton Piccardo-Selg's avatar Anton Piccardo-Selg
Browse files

Refs #13872 Fix clang issue

parent 525f0ed7
No related branches found
No related tags found
No related merge requests found
......@@ -35,9 +35,10 @@ namespace DataObjects {
*/
class DLLExport MDFramesToSpecialCoordinateSystem {
public:
MDFramesToSpecialCoordinateSystem ();
~MDFramesToSpecialCoordinateSystem ();
boost::optional<Mantid::Kernel::SpecialCoordinateSystem> operator()(const Mantid::API::IMDWorkspace* workspace) const;
MDFramesToSpecialCoordinateSystem();
~MDFramesToSpecialCoordinateSystem();
boost::optional<Mantid::Kernel::SpecialCoordinateSystem>
operator()(const Mantid::API::IMDWorkspace *workspace) const;
private:
Mantid::Kernel::SpecialCoordinateSystem extractCoordinateSystem(
......
......@@ -41,7 +41,8 @@ public:
virtual const Mantid::Kernel::MDUnit &getMDUnit() const = 0;
virtual bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const = 0;
virtual std::string name() const = 0;
virtual Mantid::Kernel::SpecialCoordinateSystem equivalientSpecialCoordinateSystem() const= 0;
virtual Mantid::Kernel::SpecialCoordinateSystem
equivalientSpecialCoordinateSystem() const = 0;
virtual MDFrame *clone() const = 0;
virtual ~MDFrame() {}
};
......
......@@ -108,7 +108,6 @@ public:
bool canInterpret(const MDFrameArgument &argument) const;
};
/// Make a complete factory chain
MDFrameFactory_uptr MANTID_GEOMETRY_DLL makeMDFrameFactoryChain();
......
......@@ -34,9 +34,8 @@ public:
MDHistoDimension(std::string name, std::string ID,
const Kernel::UnitLabel &units, coord_t min, coord_t max,
size_t numBins)
: m_name(name), m_dimensionId(ID),
m_frame(new UnknownFrame(units)), m_min(min),
m_max(max), m_numBins(numBins),
: m_name(name), m_dimensionId(ID), m_frame(new UnknownFrame(units)),
m_min(min), m_max(max), m_numBins(numBins),
m_binWidth((max - min) / static_cast<coord_t>(numBins)) {
if (max < min) {
throw std::invalid_argument("Error making MDHistoDimension. Cannot have "
......
......@@ -40,13 +40,15 @@ public:
UnknownFrame(const Kernel::UnitLabel &unit);
virtual ~UnknownFrame();
std::string name() const;
bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const ;
bool canConvertTo(const Mantid::Kernel::MDUnit &otherUnit) const;
Mantid::Kernel::UnitLabel getUnitLabel() const;
const Mantid::Kernel::MDUnit &getMDUnit() const;
Mantid::Kernel::SpecialCoordinateSystem equivalientSpecialCoordinateSystem() const;
Mantid::Kernel::SpecialCoordinateSystem
equivalientSpecialCoordinateSystem() const;
UnknownFrame *clone() const;
// Type name
static const std::string UnknownFrameName;
private:
/// Label unit
const std::unique_ptr<Mantid::Kernel::MDUnit> m_unit;
......
......@@ -65,8 +65,7 @@ bool HKLFrameFactory::canInterpret(const MDFrameArgument &argument) const {
return argument.frameString == HKL::HKLName && compatibleUnit;
}
UnknownFrame*
UnknownFrame *
UnknownFrameFactory::createRaw(const MDFrameArgument &argument) const {
using namespace Mantid::Kernel;
......
......@@ -215,7 +215,8 @@ makeAnyMDEWWithFrames(size_t splitInto, coord_t min, coord_t max,
auto out = createOutputWorkspace<MDE, nd>(splitInto);
// Add standard dimensions
addMDDimensionsWithFrames<MDE, nd>(out, min, max, frame, axisNameFormat, axisIdFormat);
addMDDimensionsWithFrames<MDE, nd>(out, min, max, frame, axisNameFormat,
axisIdFormat);
// Add data
addData<MDE, nd>(out, splitInto, min, max, numEventsPerBox, wsName);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment