Re #10705 Fixed initial run script from GUI

main runner is not yet enabled
mantidproject · Dec 11, 2014 · 7f40b8c · 7f40b8c
1 parent 917989c
commit 7f40b8c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Homer.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Homer.cpp
@@ -771,18 +771,18 @@ void Homer::setIDFValues(const QString &)
 
   // Fill in default values for tab
   QString param_defs = 
-    "import DirectEnergyConversion as direct\n"
-    "mono = direct.DirectEnergyConversion('%1')\n";
+    "from DirectPropertyManager import DirectPropertyManager\n"
+    "prop_man = DirectPropertyManager('%1')\n"
+    "prop_man.incident_energy = 1\n"
+    "int_range = prop_man.monovan_integr_range\n"
+    "bkg_rane = prop_man.bkgd_range\n";
   param_defs = param_defs.arg(prefix);
 
   param_defs += 
-    "print mono.monovan_integr_range[0]\n"
-    "print mono.monovan_integr_range[1]\n"
-    "print mono.van_mass\n"
-    "print mono.bkgd_range[0]\n"
-    "print mono.bkgd_range[1]\n"
-    "print str(mono.check_background)\n";
-
+    "print '{0}\\n{1}\\n{2}\\n{3}\\n{4}\\n{5}\\n'"
+    ".format(int_range[0],int_range[1],prop_man.van_mass,"
+    "bkg_rane[0],bkg_rane[1],str(prop_man.check_background))\n";
+
   QString pyOutput = runPythonCode(param_defs).trimmed();
   QStringList values = pyOutput.split("\n", QString::SkipEmptyParts);
   if( values.count() != 6 )

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/deltaECalc.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/deltaECalc.cpp
@@ -41,25 +41,25 @@ void deltaECalc::createProcessingScript(const QStringList &runFiles, const QStri
   QString pyCode = "import DirectEnergyConversion as direct\n";
   pyCode += QString("mono_sample = direct.DirectEnergyConversion('%1')\n").arg(m_sets.cbInst->currentText());
   //Turn off printing to stdout
-  pyCode += QString("mono_sample._to_stdout = False\n");
+  pyCode += QString("mono_sample.prop_man.log_to_mantid = True\n");
 
   addAnalysisOptions(pyCode);
   addMaskingCommands(pyCode);
   // Check save formats
   QStringList fileExts;
   if( m_sets.save_ckSPE->isChecked() )
   {
-    fileExts.append("'.spe'");
+    fileExts.append("'spe'");
   }
   if( m_sets.save_ckNexus->isChecked() )
   {
-    fileExts.append("'.nxs'");
+    fileExts.append("'nxs'");
   }
   if( m_sets.save_ckNxSPE->isChecked() )
   {
-    fileExts.append("'.nxspe'");
+    fileExts.append("'nxspe'");
   }
-  pyCode += "mono_sample.save_format = [" + fileExts.join(",") + "]\n\n";
+  pyCode += "mono_sample.prop_man.mono_sample.save_format = " + fileExts.join(",") + "\n\n";
 
   // Create the python variables. The strings are wrapped with r'' for slash safety
   QString pyRunFiles = createPyListAsString(runFiles);