refs #6449 got rid of BoxCtrlChangesList&MDBoxToChange

for the time being
mantidproject · Apr 5, 2013 · 40a1099 · 40a1099
1 parent 6d17f5c
commit 40a1099
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/SliceMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/SliceMD.cpp
@@ -193,9 +193,8 @@ namespace MDAlgorithms
     int tempDepth =  getProperty("MaxRecursionDepth");
     size_t maxDepth = bTakeDepthFromInputWorkspace? bc->getMaxDepth() : size_t(tempDepth);
     obc->setMaxDepth(maxDepth);
-    // the buffer size for resulting workspace; reasonable size is at least 10 data chunk sizes (nice to verify)
+
     size_t outputSize = writeBufSize;
-    if(outputSize<10*obc->getDataChunk())outputSize=10*obc->getDataChunk();
     obc->setCacheParameters(sizeof(OMDE),outputSize);
 
     obc->resetNumBoxes();
@@ -206,7 +205,14 @@ namespace MDAlgorithms
     std::string filename = getProperty("OutputFilename");
     if (!filename.empty())
     {
-      // First save to the NXS file
+      // the buffer size for resulting workspace; reasonable size is at least 10 data chunk sizes (nice to verify)
+      //if(outputSize<10*obc->getDataChunk())
+      //  {
+      //      outputSize=10*obc->getDataChunk();
+      //      obc->setCacheParameters(sizeof(OMDE),outputSize);
+      //  }
+
+        // First save to the NXS file
       g_log.notice() << "Running SaveMD" << std::endl;
       IAlgorithm_sptr alg = createChildAlgorithm("SaveMD");
       alg->setPropertyValue("Filename", filename);

diff --git a/Code/Mantid/Framework/MDEvents/CMakeLists.txt b/Code/Mantid/Framework/MDEvents/CMakeLists.txt
@@ -25,7 +25,7 @@ set ( SRC_FILES
 	src/MDBoxBase.cpp
 	src/MDBoxIterator.cpp
     src/MDBoxFlatTree.cpp    
-	src/MDBoxToChange.cpp
+#	src/MDBoxToChange.cpp
 	src/MDBoxNXSaveable.cpp    
 	src/MDEventFactory.cpp
 	src/MDEventWSWrapper.cpp
@@ -69,7 +69,7 @@ set ( INC_FILES
 	inc/MantidMDEvents/AffineMatrixParameter.h
 	inc/MantidMDEvents/AffineMatrixParameterParser.h
 	inc/MantidMDEvents/BoxControllerSettingsAlgorithm.h
-	inc/MantidMDEvents/BoxCtrlChangesList.h 
+#	inc/MantidMDEvents/BoxCtrlChangesList.h 
 	inc/MantidMDEvents/ConvToMDBase.h
 	inc/MantidMDEvents/ConvToMDEventsWS.h
 	inc/MantidMDEvents/ConvToMDHistoWS.h
@@ -91,7 +91,7 @@ set ( INC_FILES
 	inc/MantidMDEvents/MDBoxBase.h
 	inc/MantidMDEvents/MDBoxIterator.h
     inc/MantidMDEvents/MDBoxFlatTree.h
-	inc/MantidMDEvents/MDBoxToChange.h
+#	inc/MantidMDEvents/MDBoxToChange.h
 	inc/MantidMDEvents/MDBoxNXSaveable.h
 	inc/MantidMDEvents/MDDimensionStats.h
 	inc/MantidMDEvents/MDEvent.h
@@ -146,7 +146,7 @@ set ( TEST_FILES
 	MDBoxIteratorTest.h
 	MDBoxTest.h
 	MDBoxNXSaveableTest.h    
-	MDBoxToChangeTest.h
+#	MDBoxToChangeTest.h
 	MDDimensionStatsTest.h
 	MDEventFactoryTest.h
 	MDEventInserterTest.h

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEventWorkspace.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEventWorkspace.h
@@ -4,8 +4,8 @@
 #include "MantidAPI/IMDEventWorkspace.h"
 #include "MantidKernel/ProgressBase.h"
 #include "MantidKernel/System.h"
-//#include "MantidAPI/BoxController.h"
-#include "MantidMDEvents/BoxCtrlChangesList.h"
+#include "MantidAPI/BoxController.h"
+//#include "MantidMDEvents/BoxCtrlChangesList.h"
 #include "MantidAPI/CoordTransform.h"
 #include "MantidMDEvents/MDBoxBase.h"
 #include "MantidMDEvents/MDLeanEvent.h"

diff --git a/Code/Mantid/Framework/MDEvents/test/MDEventTest.h b/Code/Mantid/Framework/MDEvents/test/MDEventTest.h
@@ -265,7 +265,7 @@ class MDEventTestPerformance :  public CxxTest::TestSuite
 
   void test_serialize_deserializeLean()
   {
-      size_t nPoints=num; // the number should not be nPoints%4=0 to hold test TS_ASSERT_THROWS below
+      size_t nPoints=num;
       std::vector<MDLeanEvent<3> > events(nPoints);
       double sumGuess(0),errGuess(0);
       for(size_t i=0;i<nPoints;i++)
@@ -297,7 +297,7 @@ class MDEventTestPerformance :  public CxxTest::TestSuite
   }
   void test_serialize_deserializeFat()
   {
-      size_t nPoints=num; // the number should not be nPoints%3=0 to hold test TS_ASSERT_THROWS below
+      size_t nPoints=num; 
       std::vector<MDEvent<4> > events(nPoints);
       double sumGuess(0),errGuess(0);
       for(size_t i=0;i<nPoints;i++)