diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp index 629bf2a9c72662c109a7fca7c4e7f0028b7156d7..3f08264ba430a8b365a631a9716e46f1310154a0 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 98970729189326795d05fac3ad5f2e9ce824c4cc..8a92647355342c898673273735763efd146ff936 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());