From 575e5eb152b6d4563acb7ad706979ece26f9efbf Mon Sep 17 00:00:00 2001
From: Anton Piccardo-Selg <anton.piccardo-selg@tessella.com>
Date: Fri, 6 Mar 2015 16:48:21 +0000
Subject: [PATCH] Refs #10973 Extending splitting to 4D
---
Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp | 6 +++---
Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDTest.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
index 629bf2a9c72..3f08264ba43 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
@@ -87,8 +87,8 @@ void ConvertToMD::init() {
setPropertyGroup("MinRecursionDepth", getBoxSettingsGroupName());
declareProperty(
- new PropertyWithValue<bool>("InitialSplitting", false, Direction::Input),
- "This option causes an initial split of 50 for the first three dimensions at level 0.");
+ new PropertyWithValue<bool>("InitialSplitting", 0, Direction::Input),
+ "This option causes an initial split of 50 for the first four dimensions at level 0.");
}
//----------------------------------------------------------------------------------------------
/** Destructor
@@ -501,7 +501,7 @@ API::IMDEventWorkspace_sptr ConvertToMD::createNewMDWorkspace(
void ConvertToMD::performInitialSplitting(API::IMDEventWorkspace_sptr spws, Mantid::API::BoxController_sptr bc)
{
const size_t initialSplitSetting = 50;
- const size_t dimCutoff = 3;
+ const size_t dimCutoff = 4;
// Record the split settings of the box controller in a buffer and set the new value
std::vector<size_t> splitBuffer;
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDTest.h b/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDTest.h
index 98970729189..8a926473553 100644
--- a/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDTest.h
@@ -201,8 +201,8 @@ void testInitialSplittingEnabled()
// Check depth 0
TSM_ASSERT_EQUALS("Should have no MDBoxes at level 0", 0, numMDBoxes[0]);
- // Check depth 1. The boxController is set to split with 50, 50, 50, 5, 5, 5
- TSM_ASSERT_EQUALS("Should have 15625000 MDBoxes at level 1", 15625000, numMDBoxes[1]);
+ // Check depth 1. The boxController is set to split with 50, 50, 50, 50, 5, 5
+ TSM_ASSERT_EQUALS("Should have 15625000 MDBoxes at level 1", 156250000, numMDBoxes[1]);
auto outWS = AnalysisDataService::Instance().retrieveWS<IMDWorkspace>("WS5DQ3D");
TS_ASSERT_EQUALS(Mantid::Kernel::HKL, outWS->getSpecialCoordinateSystem());
--
GitLab