refs #6362 Redefined nexus writer and enabled couple of tests

, failing earlier
mantidproject · Jan 22, 2013 · c6c5ce2 · c6c5ce2
1 parent 14b545d
commit c6c5ce2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/SaveMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/SaveMD.cpp
@@ -328,11 +328,11 @@ namespace MDAlgorithms
           MDBox<MDE,nd> * mdBox = dynamic_cast<MDBox<MDE,nd> *>(Box);
           if(!mdBox) throw std::runtime_error("found unfamiliar type of box");
           // Store the index
-          uint64_t nEvents        = mdBox->getNPoints();
+
           box_event_index[id*2]   = mdBox->getFilePosition();
-          box_event_index[id*2+1] = nEvents;
+          box_event_index[id*2+1] = mdBox->getNPoints();
           // save for the first time
-          if(!update && nEvents>0)mdBox->saveNexus(file);
+          if(!update && (box_event_index[id*2] != std::numeric_limits<uint64_t>::max()))mdBox->saveNexus(file);
           // set that it is on disk and clear the actual events to free up memory, saving occured earlier
           if (MakeFileBacked) mdBox->clearDataFromMemory();
 

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
@@ -178,9 +178,9 @@ class CreateMDWorkspaceTest : public CxxTest::TestSuite
     do_test_exec("", true);
   }
 
-  void xest_exec_MDLeanEvent_fileBacked()
+  void test_exec_MDLeanEvent_fileBacked()
   {
-    //do_test_exec("CreateMDWorkspaceTest.nxs", true);
+    do_test_exec("CreateMDWorkspaceTest.nxs", true);
   }
 
 

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/SaveMDTest.h b/Code/Mantid/Framework/MDAlgorithms/test/SaveMDTest.h
@@ -51,9 +51,9 @@ class SaveMDTest : public CxxTest::TestSuite
     do_test_exec(23, "SaveMDTest.nxs");
   }
 
-  void xest_exec_noEvents()
+  void test_exec_noEvents()
   {
-  //  do_test_exec(0, "SaveMDTest_noEvents.nxs");
+    do_test_exec(0, "SaveMDTest_noEvents.nxs");
   }
 
   void test_MakeFileBacked()

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEvent.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEvent.h
@@ -237,6 +237,7 @@ namespace MDEvents
         signal_t & totalSignal, signal_t & totalErrorSquared)
     {
       size_t numEvents = events.size();
+      if(numEvemts==0)return;
       size_t numColumns = nd+4;
       coord_t * data = new coord_t[numEvents*numColumns];
 

diff --git a/Code/Mantid/Framework/MDEvents/test/MDGridBoxTest.h b/Code/Mantid/Framework/MDEvents/test/MDGridBoxTest.h
@@ -1026,7 +1026,7 @@ class MDGridBoxTest :    public CxxTest::TestSuite
 
     // Split those boxes in parallel.
     ThreadSchedulerFIFO * ts = new ThreadSchedulerFIFO();
-    ThreadPool tp(ts);
+    ThreadPool tp(ts,2);
     b->splitAllIfNeeded(ts);
     tp.joinAll();