diff --git a/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto2.h b/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto2.h
index 9f96c771a81d5e03f4db8b803aac191b7e4dc49b..f35a79b529eb8e8004805227ed7aedfc60f831fb 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto2.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/ReflectometryReductionOneAuto2.h
@@ -77,7 +77,8 @@ private:
Mantid::API::IAlgorithm_sptr alg,
Mantid::Geometry::Instrument_const_sptr instrument);
/// Get a polarization efficiencies workspace.
- std::tuple<API::MatrixWorkspace_sptr, std::string, std::string> getPolarizationEfficiencies();
+ std::tuple<API::MatrixWorkspace_sptr, std::string, std::string>
+ getPolarizationEfficiencies();
void applyPolarizationCorrection(std::string const &outputIvsLam);
};
diff --git a/Framework/Algorithms/src/ReflectometryReductionOne2.cpp b/Framework/Algorithms/src/ReflectometryReductionOne2.cpp
index 6cb04c6ea01be6c5fe4a60d6b6062f39e413ce1c..3275dfb0627cff7f0e953e833dbded6bd99d8642 100644
--- a/Framework/Algorithms/src/ReflectometryReductionOne2.cpp
+++ b/Framework/Algorithms/src/ReflectometryReductionOne2.cpp
@@ -651,7 +651,8 @@ ReflectometryReductionOne2::monitorCorrection(MatrixWorkspace_sptr detectorWS) {
getProperty("NormalizeByIntegratedMonitors");
int index = getProperty("I0MonitorIndex");
if (!m_spectrumInfo->isMonitor(index)) {
- throw std::invalid_argument("A monitor is expected at spectrum index " + std::to_string(index));
+ throw std::invalid_argument("A monitor is expected at spectrum index " +
+ std::to_string(index));
}
const auto monitorWS = makeMonitorWS(m_runWS, integratedMonitors);
if (!integratedMonitors)
diff --git a/Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp b/Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp
index 058f9f65072b6b6235be09def67eb901a1468b85..97aad7afd9846ed3ce082ebd044c93617175e755 100644
--- a/Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp
+++ b/Framework/Algorithms/src/ReflectometryReductionOneAuto2.cpp
@@ -821,14 +821,15 @@ ReflectometryReductionOneAuto2::getPolarizationEfficiencies() {
* Apply a polarization correction to workspaces in lambda.
* @param outputIvsLam :: Name of a workspace group to apply the correction to.
*/
-void ReflectometryReductionOneAuto2::applyPolarizationCorrection(std::string const &outputIvsLam) {
+void ReflectometryReductionOneAuto2::applyPolarizationCorrection(
+ std::string const &outputIvsLam) {
MatrixWorkspace_sptr efficiencies;
std::string correctionMethod;
std::string correctionOption;
- std::tie(efficiencies, correctionMethod, correctionOption) = getPolarizationEfficiencies();
-
- Algorithm_sptr polAlg =
- createChildAlgorithm("PolarizationEfficiencyCor");
+ std::tie(efficiencies, correctionMethod, correctionOption) =
+ getPolarizationEfficiencies();
+
+ Algorithm_sptr polAlg = createChildAlgorithm("PolarizationEfficiencyCor");
polAlg->setChild(false);
polAlg->setRethrows(true);
polAlg->setProperty("OutputWorkspace", outputIvsLam);
@@ -839,7 +840,8 @@ void ReflectometryReductionOneAuto2::applyPolarizationCorrection(std::string con
polAlg->setProperty("InputWorkspaceGroup", outputIvsLam);
polAlg->setProperty("PolarizationAnalysis", correctionOption);
} else {
- throw std::invalid_argument("Unsupported polarization correction method: " + correctionMethod);
+ throw std::invalid_argument("Unsupported polarization correction method: " +
+ correctionMethod);
}
polAlg->execute();
}
diff --git a/Framework/Algorithms/test/ReflectometryReductionOneAuto2Test.h b/Framework/Algorithms/test/ReflectometryReductionOneAuto2Test.h
index 1ac86e709afa41579106605d8f4e7638c977dc47..1d3fcb8673507394cc14d4c16ac7c88d11ccecc3 100644
--- a/Framework/Algorithms/test/ReflectometryReductionOneAuto2Test.h
+++ b/Framework/Algorithms/test/ReflectometryReductionOneAuto2Test.h
@@ -773,11 +773,10 @@ public:
alg.setPropertyValue("OutputWorkspace", "IvsQ");
alg.setPropertyValue("OutputWorkspaceBinned", "IvsQ_binned");
alg.setPropertyValue("OutputWorkspaceWavelength", "IvsLam");
- TS_ASSERT_THROWS_EQUALS(
- alg.execute(), std::invalid_argument & e, std::string(e.what()),
- "A monitor is expected at spectrum index 1");
+ TS_ASSERT_THROWS_EQUALS(alg.execute(), std::invalid_argument & e,
+ std::string(e.what()),
+ "A monitor is expected at spectrum index 1");
}
-
};
#endif /* MANTID_ALGORITHMS_REFLECTOMETRYREDUCTIONONEAUTO2TEST_H_ */
diff --git a/Framework/DataHandling/src/ExtractPolarizationEfficiencies.cpp b/Framework/DataHandling/src/ExtractPolarizationEfficiencies.cpp
index 2dde63029aeb9d0fa2d4a0dd4ecc857e9a2d1e08..fcd463eefe1cbb773f1307102e89309efd851899 100644
--- a/Framework/DataHandling/src/ExtractPolarizationEfficiencies.cpp
+++ b/Framework/DataHandling/src/ExtractPolarizationEfficiencies.cpp
@@ -87,10 +87,9 @@ void ExtractPolarizationEfficiencies::init() {
declareProperty(make_unique<WorkspaceProperty<>>("OutputWorkspace", "",
Direction::Output),
"The workspace with extracted eficiencies.");
- declareProperty<std::string>(
- "CorrectionMethod", "",
- "Correction method: Fredrikze or Wildes.",
- Kernel::Direction::Output);
+ declareProperty<std::string>("CorrectionMethod", "",
+ "Correction method: Fredrikze or Wildes.",
+ Kernel::Direction::Output);
declareProperty<std::string>(
"CorrectionOption", "",
"Correction option, eg \"PA\" or \"PNR\" for Fredrikze method.",
@@ -134,10 +133,11 @@ void ExtractPolarizationEfficiencies::exec() {
}
auto const prop = parseVector(name, propValue);
if (lambda.size() != prop.size()) {
- throw std::runtime_error(
- "Instrument vector parameter \"" + name +
- "\" is expeced to be the same size as \"" + LAMBDA_PARAMETER + "\" but " +
- std::to_string(prop.size()) + " != " + std::to_string(lambda.size()));
+ throw std::runtime_error("Instrument vector parameter \"" + name +
+ "\" is expeced to be the same size as \"" +
+ LAMBDA_PARAMETER + "\" but " +
+ std::to_string(prop.size()) + " != " +
+ std::to_string(lambda.size()));
}
auto ws = createWorkspace(lambda, prop);
alg->setProperty(name, ws);
diff --git a/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h b/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
index 32a374e4cbec7f24b1e3c5106bf96ee0bcfb55db..b2666930a36c5725ec08ebd50c35bd98a92a2ac1 100644
--- a/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
+++ b/Framework/DataHandling/test/ExtractPolarizationEfficienciesTest.h
@@ -288,8 +288,8 @@ public:
loader.execute();
LoadParameterFile paramLoader;
paramLoader.initialize();
- paramLoader.setPropertyValue("Filename",
- "IDFs_for_UNIT_TESTING/REFL_Parameters_Fredrikze.xml");
+ paramLoader.setPropertyValue(
+ "Filename", "IDFs_for_UNIT_TESTING/REFL_Parameters_Fredrikze.xml");
paramLoader.setProperty("Workspace", workspace);
paramLoader.execute();
@@ -426,7 +426,8 @@ private:
pmap->addString(instrument.get(), "Rho", "0.971 0.972 0.973 0.974");
pmap->addString(instrument.get(), "Alpha", "0.961 0.962 0.963 0.964");
} else {
- pmap->addString(instrument.get(), "polarization_correction_option", "00,01,10,11");
+ pmap->addString(instrument.get(), "polarization_correction_option",
+ "00,01,10,11");
if (!skipP1) {
pmap->addString(instrument.get(), "P1", "0.991 0.992 0.993 0.994");
}
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/ReflectometryHelper.h b/Framework/TestHelpers/inc/MantidTestHelpers/ReflectometryHelper.h
index 418e8798ebb4c9194d587f5e3f02451eb984edb0..3411489d03932878f952f8dbcb650bc7663a7b7c 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/ReflectometryHelper.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/ReflectometryHelper.h
@@ -12,19 +12,23 @@ using namespace API;
namespace TestHelpers {
-// Create a workspace equipped with fake instrument from IDFs_for_UNIT_TESTING/REFL_Definition.xml IDF.
+// Create a workspace equipped with fake instrument from
+// IDFs_for_UNIT_TESTING/REFL_Definition.xml IDF.
// @param nBins :: Number of bins in each spectrum.
// @param startX :: Start value of the x-axis in TOF
// @param endX :: End value of the x-axis in TOF
-// @param values :: Y-values. The created workspace will have as many spectra as there are values -
+// @param values :: Y-values. The created workspace will have as many spectra as
+// there are values -
// one value per spectrum.
-// @param paramsType :: Defines which instrument parameters file to load. paramsType is appended to
+// @param paramsType :: Defines which instrument parameters file to load.
+// paramsType is appended to
// "REFL_Parameters_" to form the name for the file to load.
MatrixWorkspace_sptr createREFL_WS(size_t nBins, double startX, double endX,
- std::vector<double> const & values,
+ std::vector<double> const &values,
std::string const ¶msType = "");
-// Create a group of workspaces created with createREFL_WS(...) function and store it in the ADS.
+// Create a group of workspaces created with createREFL_WS(...) function and
+// store it in the ADS.
// Ys get some hard-coded values.
// @param name :: Group's name in the ADS.
// @param size :: Size of the group.
@@ -37,8 +41,10 @@ void prepareInputGroup(std::string const &name,
// and return a vector of those.
std::vector<MatrixWorkspace_sptr> retrieveOutWS(std::string const &name);
-// Apply some polarization efficiencies (Fredrikze) to a workspace such that when it's run
-// through the polarization correction algorithm it gets restored to the original.
+// Apply some polarization efficiencies (Fredrikze) to a workspace such that
+// when it's run
+// through the polarization correction algorithm it gets restored to the
+// original.
void applyPolarizationEfficiencies(std::string const &name);
} // namespace TestHelpers
diff --git a/Framework/TestHelpers/src/ReflectometryHelper.cpp b/Framework/TestHelpers/src/ReflectometryHelper.cpp
index 9bc5079fe604397d602a279182d30251c132fbc0..4dc37a027a56186d8398a8e61373549679bb0110 100644
--- a/Framework/TestHelpers/src/ReflectometryHelper.cpp
+++ b/Framework/TestHelpers/src/ReflectometryHelper.cpp
@@ -23,7 +23,8 @@ using namespace Kernel;
namespace TestHelpers {
MatrixWorkspace_sptr createHistoWS(size_t nBins, double startX, double endX,
- std::vector<double> const & values, std::string const &unitX = "TOF") {
+ std::vector<double> const &values,
+ std::string const &unitX = "TOF") {
double const dX = (endX - startX) / double(nBins);
BinEdges xVals(nBins + 1, LinearGenerator(startX, dX));
size_t nSpec = values.size();
@@ -72,10 +73,8 @@ MatrixWorkspace_sptr createREFL_WS(size_t nBins, double startX, double endX,
return workspace;
}
-void prepareInputGroup(std::string const &name,
- std::string const ¶msType, size_t size,
- double const startX,
- double const endX) {
+void prepareInputGroup(std::string const &name, std::string const ¶msType,
+ size_t size, double const startX, double const endX) {
double monitorValue = 99.0;
double detectorValue = 0.9;
std::string names;
@@ -113,12 +112,11 @@ std::vector<MatrixWorkspace_sptr> groupToVector(WorkspaceGroup_sptr group) {
}
std::vector<MatrixWorkspace_sptr> retrieveOutWS(std::string const &name) {
- auto group =
- AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>(name);
+ auto group = AnalysisDataService::Instance().retrieveWS<WorkspaceGroup>(name);
return groupToVector(group);
}
-void applyPolarizationEfficiencies(WorkspaceGroup_sptr ws) {
+void applyPolarizationEfficiencies(WorkspaceGroup_sptr ws) {
auto wss = groupToVector(ws);
auto Rpp = wss[0];
diff --git a/MantidPlot/src/Graph.cpp b/MantidPlot/src/Graph.cpp
index b473abc1575cb77de0194b5f6804ce5380162107..87d333cb4b7330b5765be8584cbe071953e5bc13 100644
--- a/MantidPlot/src/Graph.cpp
+++ b/MantidPlot/src/Graph.cpp
@@ -5626,7 +5626,8 @@ void Graph::checkValuesInAxisRange(MantidMatrixCurve *mc) {
if (dataSize == 0) {
throw std::runtime_error("Cannot draw the curve: no plottable values.");
}
- double xMax(data->x(dataSize - 1)); // Needs to be max of current graph (x-axis)
+ double xMax(
+ data->x(dataSize - 1)); // Needs to be max of current graph (x-axis)
if (xMin > xMax) {
std::swap(xMin, xMax);
}