From 40dedbf4cff0ac3a7119bd1c28fcf9d8dd2bc5e0 Mon Sep 17 00:00:00 2001
From: Federico Montesino Pouzols <federico.montesino-pouzols@stfc.ac.uk>
Date: Thu, 11 Feb 2016 16:01:25 +0000
Subject: [PATCH] WrkFlow algs, tests: updates for changes in MatrixWorkspace,
re #15246
---
.../src/ComputeSensitivity.cpp | 8 ++++----
.../src/ConvolutionFitSequential.cpp | 1 +
.../src/DgsAbsoluteUnitsReduction.cpp | 3 ++-
.../src/DgsConvertToEnergyTransfer.cpp | 1 +
.../src/DgsPreprocessData.cpp | 1 +
.../src/DgsProcessDetectorVanadium.cpp | 1 +
.../WorkflowAlgorithms/src/EQSANSLoad.cpp | 20 +++++++++++--------
.../src/EQSANSPatchSensitivity.cpp | 3 +++
.../src/HFIRSANSNormalise.cpp | 6 +++++-
.../src/ProcessIndirectFitParameters.cpp | 1 +
Framework/WorkflowAlgorithms/src/RefRoi.cpp | 1 +
.../src/SANSBeamFluxCorrection.cpp | 2 +-
.../test/ConvolutionFitSequentialTest.h | 1 +
.../test/ProcessIndirectFitParametersTest.h | 2 ++
.../test/SANSSolidAngleCorrectionTest.h | 1 +
.../WorkflowAlgorithms/test/StepScanTest.h | 1 +
16 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp b/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
index 6268cd25d70..82e3ebe2a4f 100644
--- a/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
+++ b/Framework/WorkflowAlgorithms/src/ComputeSensitivity.cpp
@@ -2,12 +2,13 @@
// Includes
//----------------------------------------------------------------------
#include "MantidWorkflowAlgorithms/ComputeSensitivity.h"
-#include "MantidAPI/FileProperty.h"
-#include "MantidDataObjects/TableWorkspace.h"
-#include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
#include "MantidAPI/AlgorithmProperty.h"
+#include "MantidAPI/FileProperty.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidDataObjects/TableWorkspace.h"
#include "MantidKernel/PropertyManager.h"
+#include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
namespace Mantid {
namespace WorkflowAlgorithms {
@@ -17,7 +18,6 @@ DECLARE_ALGORITHM(ComputeSensitivity)
using namespace Kernel;
using namespace API;
-using namespace Geometry;
using namespace DataObjects;
void ComputeSensitivity::init() {
diff --git a/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp b/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
index ca93f043d7c..0c048e14023 100644
--- a/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
+++ b/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
@@ -1,6 +1,7 @@
#include "MantidWorkflowAlgorithms/ConvolutionFitSequential.h"
#include "MantidAPI/AlgorithmManager.h"
+#include "MantidAPI/Axis.h"
#include "MantidAPI/FunctionDomain1D.h"
#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/IFunction.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp b/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
index 7f146efc89a..4f2a9ffc1b3 100644
--- a/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsAbsoluteUnitsReduction.cpp
@@ -1,10 +1,11 @@
#include "MantidWorkflowAlgorithms/DgsAbsoluteUnitsReduction.h"
+#include "MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h"
#include "MantidAPI/PropertyManagerDataService.h"
#include "MantidKernel/Atom.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/NeutronAtom.h"
#include "MantidKernel/PropertyManager.h"
#include "MantidKernel/PropertyWithValue.h"
-#include "MantidWorkflowAlgorithms/WorkflowAlgorithmHelpers.h"
using namespace Mantid::API;
using namespace Mantid::Kernel;
diff --git a/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp b/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
index 1660c7cc148..0ee8e9a2a5c 100644
--- a/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsConvertToEnergyTransfer.cpp
@@ -1,4 +1,5 @@
#include "MantidWorkflowAlgorithms/DgsConvertToEnergyTransfer.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/PropertyManagerDataService.h"
#include "MantidAPI/WorkspaceHistory.h"
#include "MantidGeometry/IDetector.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp b/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
index 56258b060d0..a22880f4ab2 100644
--- a/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsPreprocessData.cpp
@@ -4,6 +4,7 @@
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FileFinder.h"
#include "MantidAPI/FileProperty.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/PropertyManagerDataService.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/FacilityInfo.h"
diff --git a/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp b/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
index 408d66a7a4c..14692230f08 100644
--- a/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
+++ b/Framework/WorkflowAlgorithms/src/DgsProcessDetectorVanadium.cpp
@@ -1,4 +1,5 @@
#include "MantidWorkflowAlgorithms/DgsProcessDetectorVanadium.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/PropertyManagerDataService.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/FacilityInfo.h"
diff --git a/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp b/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
index 93ae31ef193..68b16f28afd 100644
--- a/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
+++ b/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
@@ -2,26 +2,30 @@
// Includes
//----------------------------------------------------------------------
#include "MantidWorkflowAlgorithms/EQSANSLoad.h"
+#include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
#include "MantidAPI/WorkspaceUnitValidator.h"
#include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/AlgorithmManager.h"
+#include "MantidAPI/AlgorithmProperty.h"
+#include <MantidAPI/Axis.h>
#include <MantidAPI/FileFinder.h>
#include <MantidAPI/FileProperty.h>
+#include "MantidAPI/PropertyManagerDataService.h"
+#include "MantidKernel/PropertyManager.h"
#include "MantidKernel/TimeSeriesProperty.h"
+
+#include <boost/algorithm/string.hpp>
+#include <boost/tokenizer.hpp>
+#include <boost/regex.hpp>
+
#include "Poco/DirectoryIterator.h"
#include "Poco/NumberParser.h"
#include "Poco/NumberFormatter.h"
#include "Poco/String.h"
+
#include <iostream>
#include <fstream>
#include <istream>
-#include <boost/algorithm/string.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/regex.hpp>
-#include "MantidWorkflowAlgorithms/EQSANSInstrument.h"
-#include "MantidAPI/AlgorithmManager.h"
-#include "MantidAPI/AlgorithmProperty.h"
-#include "MantidAPI/PropertyManagerDataService.h"
-#include "MantidKernel/PropertyManager.h"
namespace Mantid {
namespace WorkflowAlgorithms {
diff --git a/Framework/WorkflowAlgorithms/src/EQSANSPatchSensitivity.cpp b/Framework/WorkflowAlgorithms/src/EQSANSPatchSensitivity.cpp
index 6d01fd628af..80ad2616b32 100644
--- a/Framework/WorkflowAlgorithms/src/EQSANSPatchSensitivity.cpp
+++ b/Framework/WorkflowAlgorithms/src/EQSANSPatchSensitivity.cpp
@@ -2,6 +2,9 @@
// Includes
//----------------------------------------------------------------------
#include "MantidWorkflowAlgorithms/EQSANSPatchSensitivity.h"
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidGeometry/Instrument/ParameterMap.h"
+#include "MantidKernel/cow_ptr.h"
namespace Mantid {
namespace WorkflowAlgorithms {
diff --git a/Framework/WorkflowAlgorithms/src/HFIRSANSNormalise.cpp b/Framework/WorkflowAlgorithms/src/HFIRSANSNormalise.cpp
index fe2c68f1dca..f0c0e7a0d45 100644
--- a/Framework/WorkflowAlgorithms/src/HFIRSANSNormalise.cpp
+++ b/Framework/WorkflowAlgorithms/src/HFIRSANSNormalise.cpp
@@ -2,9 +2,13 @@
// Includes
//----------------------------------------------------------------------
#include "MantidWorkflowAlgorithms/HFIRSANSNormalise.h"
+#include "MantidAPI/MatrixWorkspace.h"
+#include "MantidKernel/ListValidator.h"
+
#include <boost/algorithm/string.hpp>
+
#include "Poco/NumberFormatter.h"
-#include "MantidKernel/ListValidator.h"
+
namespace Mantid {
namespace WorkflowAlgorithms {
diff --git a/Framework/WorkflowAlgorithms/src/ProcessIndirectFitParameters.cpp b/Framework/WorkflowAlgorithms/src/ProcessIndirectFitParameters.cpp
index 7d7dd90d78a..214c498e420 100644
--- a/Framework/WorkflowAlgorithms/src/ProcessIndirectFitParameters.cpp
+++ b/Framework/WorkflowAlgorithms/src/ProcessIndirectFitParameters.cpp
@@ -1,6 +1,7 @@
#include "MantidWorkflowAlgorithms/ProcessIndirectFitParameters.h"
#include "MantidAPI/ITableWorkspace.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/TextAxis.h"
#include "MantidKernel/MandatoryValidator.h"
diff --git a/Framework/WorkflowAlgorithms/src/RefRoi.cpp b/Framework/WorkflowAlgorithms/src/RefRoi.cpp
index 075e69641f0..5c6e0982ec2 100644
--- a/Framework/WorkflowAlgorithms/src/RefRoi.cpp
+++ b/Framework/WorkflowAlgorithms/src/RefRoi.cpp
@@ -2,6 +2,7 @@
// Includes
//----------------------------------------------------------------------
#include "MantidWorkflowAlgorithms/RefRoi.h"
+#include "MantidAPI/Axis.h"
#include "MantidAPI/CommonBinsValidator.h"
#include "MantidDataObjects/EventWorkspace.h"
#include "MantidKernel/UnitFactory.h"
diff --git a/Framework/WorkflowAlgorithms/src/SANSBeamFluxCorrection.cpp b/Framework/WorkflowAlgorithms/src/SANSBeamFluxCorrection.cpp
index 496bd565e19..4783f0d5744 100644
--- a/Framework/WorkflowAlgorithms/src/SANSBeamFluxCorrection.cpp
+++ b/Framework/WorkflowAlgorithms/src/SANSBeamFluxCorrection.cpp
@@ -4,6 +4,7 @@
#include "MantidWorkflowAlgorithms/SANSBeamFluxCorrection.h"
#include "MantidAPI/AlgorithmProperty.h"
#include "MantidAPI/FileProperty.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/PropertyManager.h"
#include "Poco/Path.h"
@@ -12,7 +13,6 @@ namespace WorkflowAlgorithms {
using namespace Kernel;
using namespace API;
-using namespace Geometry;
// Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(SANSBeamFluxCorrection)
diff --git a/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h b/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h
index d52c76f4ecb..f1b84d2202d 100644
--- a/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h
+++ b/Framework/WorkflowAlgorithms/test/ConvolutionFitSequentialTest.h
@@ -3,6 +3,7 @@
#include <cxxtest/TestSuite.h>
+#include "MantidAPI/Axis.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/WorkspaceFactory.h"
diff --git a/Framework/WorkflowAlgorithms/test/ProcessIndirectFitParametersTest.h b/Framework/WorkflowAlgorithms/test/ProcessIndirectFitParametersTest.h
index 11f16b8e4c5..335f6c152cb 100644
--- a/Framework/WorkflowAlgorithms/test/ProcessIndirectFitParametersTest.h
+++ b/Framework/WorkflowAlgorithms/test/ProcessIndirectFitParametersTest.h
@@ -4,7 +4,9 @@
#include <cxxtest/TestSuite.h>
#include "MantidWorkflowAlgorithms/ProcessIndirectFitParameters.h"
+#include "MantidAPI/Axis.h"
#include "MantidAPI/ITableWorkspace.h"
+#include "MantidAPI/MatrixWorkspace.h"
#include "MantidAPI/TableRow.h"
using Mantid::Algorithms::ProcessIndirectFitParameters;
diff --git a/Framework/WorkflowAlgorithms/test/SANSSolidAngleCorrectionTest.h b/Framework/WorkflowAlgorithms/test/SANSSolidAngleCorrectionTest.h
index 7eb23751294..b8f325eaa13 100644
--- a/Framework/WorkflowAlgorithms/test/SANSSolidAngleCorrectionTest.h
+++ b/Framework/WorkflowAlgorithms/test/SANSSolidAngleCorrectionTest.h
@@ -3,6 +3,7 @@
#include <cxxtest/TestSuite.h>
#include "MantidWorkflowAlgorithms/SANSSolidAngleCorrection.h"
+#include "MantidAPI/Axis.h"
#include "MantidDataHandling/LoadSpice2D.h"
#include "MantidDataHandling/MoveInstrumentComponent.h"
diff --git a/Framework/WorkflowAlgorithms/test/StepScanTest.h b/Framework/WorkflowAlgorithms/test/StepScanTest.h
index bfca74ece5d..cb5ac0519e6 100644
--- a/Framework/WorkflowAlgorithms/test/StepScanTest.h
+++ b/Framework/WorkflowAlgorithms/test/StepScanTest.h
@@ -5,6 +5,7 @@
#include "MantidWorkflowAlgorithms/StepScan.h"
#include "MantidAlgorithms/FilterByXValue.h"
+#include "MantidAPI/Axis.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/UnitFactory.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
--
GitLab