Refs #5021 ConvertToMD sped up 109 sec->62 sec

for a large-ish event file, by splitting more frequently. Also refs #4800 parallel binnining in SliceViewer dynamic rebinning
mantidproject · Apr 11, 2012 · 26b89c0 · 26b89c0
1 parent 917041b
commit 26b89c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/MDEvents/src/ConvertToDiffractionMDWorkspace.cpp b/Code/Mantid/Framework/MDEvents/src/ConvertToDiffractionMDWorkspace.cpp
@@ -511,7 +511,7 @@ namespace MDEvents
 
       // Keep a running total of how many events we've added
       eventsAdded += eventsAdding;
-      if (bc->shouldSplitBoxes(eventsAdded, lastNumBoxes))
+      if (bc->shouldSplitBoxes(eventsAdded, lastNumBoxes) || (eventsAdded > 1000000))
       {
         if (DODEBUG) g_log.information() << cputim << ": Added tasks worth " << eventsAdded << " events. WorkspaceIndex " << wi << std::endl;
         // Do all the adding tasks

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp b/Code/Mantid/MantidQt/SliceViewer/src/SliceViewer.cpp
@@ -1881,6 +1881,7 @@ void SliceViewer::rebinParamsChanged()
   alg->setPropertyValue("Translation", "");
   alg->setProperty("NormalizeBasisVectors", true);
   alg->setProperty("ForceOrthogonal", false);
+  alg->setProperty("Parallel", true);
   alg->setPropertyValue("OutputWorkspace", m_overlayWSName);
 
   // Start asynchronous execution