Move IDA code to use new python API.

Includes IndirectDataAnalysis.cpp & CalcCorr helper. Refs #7468
mantidproject · Jul 18, 2013 · 6d88534 · 6d88534
1 parent ae5946b
commit 6d88534
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/CalcCorr.cpp
@@ -204,7 +204,7 @@ namespace IDA
       "file = r'" + input + "'\n"
       "( dir, filename ) = op.split(file)\n"
       "( name, ext ) = op.splitext(filename)\n"
-      "LoadNexusProcessed(file, name)\n"
+      "LoadNexusProcessed(Filename=file, OutputWorkspace=name)\n"
       "inputws = name\n";
     }
     else

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IDATab.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/IDATab.cpp
@@ -114,7 +114,7 @@ namespace IDA
   {
     using Mantid::Kernel::Exception::NotFoundError;
 
-    QString pyInput = "LoadNexus(r'" + filename + "', '" + wsname + "')";
+    QString pyInput = "LoadNexus(Filename=r'" + filename + "', OutputWorkspace='" + wsname + "')";
     runPythonCode(pyInput);
 
     MatrixWorkspace_const_sptr ws;

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDataAnalysis.cpp
@@ -99,7 +99,7 @@ namespace IDA
    */
   void IndirectDataAnalysis::initLocalPython()
   {
-    QString pyInput = "from mantidsimple import *";
+    QString pyInput = "from mantid.simpleapi import *";
     QString pyOutput = runPythonCode(pyInput).trimmed();
     loadSettings();
   }