From c20eca57a8ec642042e9cb0b868ab7a30ff7305f Mon Sep 17 00:00:00 2001
From: Anton Piccardo-Selg <anton.piccardo-selg@tessella.com>
Date: Mon, 12 Oct 2015 13:58:07 +0100
Subject: [PATCH] Refs #13872 Use framename where possible
---
Framework/MDAlgorithms/src/FitMD.cpp | 1 +
Framework/MDAlgorithms/src/LoadSQW.cpp | 3 +++
.../src/Quantification/SimulateResolutionConvolvedModel.cpp | 1 +
3 files changed, 5 insertions(+)
diff --git a/Framework/MDAlgorithms/src/FitMD.cpp b/Framework/MDAlgorithms/src/FitMD.cpp
index c326e268381..3f411bbc0d6 100644
--- a/Framework/MDAlgorithms/src/FitMD.cpp
+++ b/Framework/MDAlgorithms/src/FitMD.cpp
@@ -206,6 +206,7 @@ boost::shared_ptr<API::Workspace> FitMD::createEventOutputWorkspace(
builder.setNumBins(inputDim->getNBins());
builder.setMin(inputDim->getMinimum());
builder.setMax(inputDim->getMaximum());
+ builder.setFrameName(inputDim->getMDFrame().name());
outputWS->addDimension(builder.create());
}
diff --git a/Framework/MDAlgorithms/src/LoadSQW.cpp b/Framework/MDAlgorithms/src/LoadSQW.cpp
index 9df49767131..aa5e7fa66a4 100644
--- a/Framework/MDAlgorithms/src/LoadSQW.cpp
+++ b/Framework/MDAlgorithms/src/LoadSQW.cpp
@@ -409,15 +409,18 @@ void LoadSQW::buildMDDimsBase(
std::vector<Mantid::Geometry::MDHistoDimensionBuilder> &DimVector) {
std::vector<std::string> dimID(4, "qx");
std::vector<std::string> dimUnit(4, "A^-1");
+ std::vector<std::string> dimFrameName(4, "HKL");
dimID[1] = "qy";
dimID[2] = "qz";
dimID[3] = "en";
dimUnit[3] = "meV";
+ dimFrameName[3] = "meV";
DimVector.resize(4);
for (size_t i = 0; i < 4; i++) {
DimVector[i].setId(dimID[i]);
DimVector[i].setUnits(dimUnit[i]);
DimVector[i].setName(dimID[i]);
+ DimVector[i].setFrameName(dimID[i]);
}
}
diff --git a/Framework/MDAlgorithms/src/Quantification/SimulateResolutionConvolvedModel.cpp b/Framework/MDAlgorithms/src/Quantification/SimulateResolutionConvolvedModel.cpp
index f26b4faa128..842e8edf4ef 100644
--- a/Framework/MDAlgorithms/src/Quantification/SimulateResolutionConvolvedModel.cpp
+++ b/Framework/MDAlgorithms/src/Quantification/SimulateResolutionConvolvedModel.cpp
@@ -168,6 +168,7 @@ void SimulateResolutionConvolvedModel::createOutputWorkspace() {
bc->setSplitInto(i, inputDim->getNBins());
builder.setMin(inputDim->getMinimum());
builder.setMax(inputDim->getMaximum());
+ builder.setFrameName(inputDim->getMDFrame().name());
m_outputWS->addDimension(builder.create());
}
--
GitLab