From 68cb6c96d263d7692138f7b182133540f5c6e731 Mon Sep 17 00:00:00 2001
From: Vickie Lynch <lynchve@ornl.gov>
Date: Thu, 13 Aug 2015 10:37:57 -0400
Subject: [PATCH] Refs #13350 add systemTests to cmake
---
Code/Mantid/Build/CMake/MPISetup.cmake | 2 +-
.../API/inc/MantidAPI/DataProcessorAlgorithm.h | 5 -----
.../Framework/API/src/DataProcessorAlgorithm.cpp | 14 --------------
.../MPIAlgorithms/src/GatherWorkspaces.cpp | 6 +++---
.../src/LoadEventAndCompress.cpp | 2 +-
5 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/Code/Mantid/Build/CMake/MPISetup.cmake b/Code/Mantid/Build/CMake/MPISetup.cmake
index 811bc6872b0..bcc8602360e 100644
--- a/Code/Mantid/Build/CMake/MPISetup.cmake
+++ b/Code/Mantid/Build/CMake/MPISetup.cmake
@@ -23,7 +23,7 @@ include_directories( ${Boost_INCLUDE_DIRS} )
# Add a definition that's used to guard MPI-specific parts of the main code
add_definitions ( -DMPI_BUILD )
-#add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/Testing/SystemTests/scripts )
+add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/Testing/SystemTests/scripts )
# Add the ability to build a 'mantid-mpi' rpm
set ( CPACK_PACKAGE_NAME mantid-mpi )
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h b/Code/Mantid/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h
index 64ea4074d18..00f439b611c 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/DataProcessorAlgorithm.h
@@ -92,15 +92,10 @@ protected:
/// Add a matrix workspace to another matrix workspace
MatrixWorkspace_sptr plus(const MatrixWorkspace_sptr lhs,
const MatrixWorkspace_sptr rhs);
-
/// Add a single value to a matrix workspace
MatrixWorkspace_sptr plus(const MatrixWorkspace_sptr lhs,
const double &rhsValue);
- /// Add a matrix workspace to another matrix workspace
- MatrixWorkspace_sptr plus2(MatrixWorkspace_sptr lhs,
- MatrixWorkspace_sptr rhs);
-
/// Subract a matrix workspace by another matrix workspace
MatrixWorkspace_sptr minus(const MatrixWorkspace_sptr lhs,
const MatrixWorkspace_sptr rhs);
diff --git a/Code/Mantid/Framework/API/src/DataProcessorAlgorithm.cpp b/Code/Mantid/Framework/API/src/DataProcessorAlgorithm.cpp
index 5acdb37f0a5..291202c83cd 100644
--- a/Code/Mantid/Framework/API/src/DataProcessorAlgorithm.cpp
+++ b/Code/Mantid/Framework/API/src/DataProcessorAlgorithm.cpp
@@ -477,20 +477,6 @@ DataProcessorAlgorithm::plus(const MatrixWorkspace_sptr lhs,
"Plus", lhs, rhs);
}
-/**
- * Add a matrix workspace to another matrix workspace
- * @param lhs :: the workspace on the left hand side of the addition symbol
- * @param rhs :: the workspace on the right hand side of the addition symbol
- * @return matrix workspace resulting from the operation
- */
-MatrixWorkspace_sptr
-DataProcessorAlgorithm::plus2(MatrixWorkspace_sptr lhs,
- MatrixWorkspace_sptr rhs) {
- return this->executeBinaryAlgorithm<
- MatrixWorkspace_sptr, MatrixWorkspace_sptr, MatrixWorkspace_sptr>(
- "Plus", lhs, rhs);
-}
-
/**
* Add a single value to another matrix workspace
* @param lhs :: the workspace on the left hand side of the addition symbol
diff --git a/Code/Mantid/Framework/MPIAlgorithms/src/GatherWorkspaces.cpp b/Code/Mantid/Framework/MPIAlgorithms/src/GatherWorkspaces.cpp
index abc1c580496..659535792f7 100644
--- a/Code/Mantid/Framework/MPIAlgorithms/src/GatherWorkspaces.cpp
+++ b/Code/Mantid/Framework/MPIAlgorithms/src/GatherWorkspaces.cpp
@@ -70,11 +70,11 @@ void GatherWorkspaces::init() {
// Output is optional - only the root process will output a workspace
declareProperty(new WorkspaceProperty<>(
"OutputWorkspace", "", Direction::Output, PropertyMode::Optional));
- declareProperty("PreserveEvents", true,
+ declareProperty("PreserveEvents", false,
"Keep the output workspace as an EventWorkspace, if the "
- "input has events (default).\n"
+ "input has events.\n"
"If false, then the workspace gets converted to a "
- "Workspace2D histogram.");
+ "Workspace2D histogram(default to save memory for reduced data)");
std::vector<std::string> propOptions;
propOptions.push_back("Add");
// propOptions.push_back("Replace");
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp
index 1008009d90b..c522520b79a 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/LoadEventAndCompress.cpp
@@ -213,7 +213,7 @@ void LoadEventAndCompress::exec() {
for (size_t i = 1; i < numRows; ++i) {
MatrixWorkspace_sptr temp = loadChunk(i);
temp = processChunk(temp);
- resultWS = plus2(resultWS,temp);
+ resultWS = plus(resultWS,temp);
}
Workspace_sptr total = assemble(resultWS);
--
GitLab