Merge remote-tracking branch 'origin/feature/7838_c2e_output_options'

Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp

@@ -606,6 +606,12 @@ void Indirect::createRESfile(const QString& file)
   if ( m_uiForm.cal_ckPlotResult->isChecked() ) { pyInput +=	"plot = True\n"; }
   else { pyInput += "plot = False\n"; }
 
+  if ( m_uiForm.cal_ckVerbose->isChecked() ) { pyInput +=  "verbose = True\n"; }
+  else { pyInput += "verbose = False\n"; }
+
+  if ( m_uiForm.cal_ckSave->isChecked() ) { pyInput +=  "save = True\n"; }
+  else { pyInput += "save = False\n"; }
+
   QString rebinParam = QString::number(m_calDblMng->value(m_calResProp["ELow"])) + "," +
     QString::number(m_calDblMng->value(m_calResProp["EWidth"])) + "," +
     QString::number(m_calDblMng->value(m_calResProp["EHigh"]));
@@ -617,7 +623,7 @@ void Indirect::createRESfile(const QString& file)
     "background = " + background + "\n"
     "rebinParam = '" + rebinParam + "'\n"
     "file = " + file + "\n"
-    "ws = resolution(file, iconOpt, rebinParam, background, instrument, analyser, reflection, plotOpt = plot, factor="+scaleFactor+")\n"
+    "ws = resolution(file, iconOpt, rebinParam, background, instrument, analyser, reflection, Verbose=verbose, Plot=plot, Save=save, factor="+scaleFactor+")\n"
     "scaled = "+ scaled +"\n"
     "scaleFactor = "+m_uiForm.cal_leIntensityScaleMultiplier->text()+"\n"
     "backStart = "+QString::number(m_calDblMng->value(m_calCalProp["BackMin"]))+"\n"
@@ -1545,8 +1551,13 @@ void Indirect::calibCreate()
 
     reducer += "calib.execute(None, None)\n"
       "result = calib.result_workspace()\n"
-      "print result\n"
-      "SaveNexus(InputWorkspace=result, Filename=result+'.nxs')\n";
+      "print result\n";
+
+    if( m_uiForm.cal_ckSave->isChecked() )
+    {
+      reducer +=
+        "SaveNexus(InputWorkspace=result, Filename=result+'.nxs')\n";
+    }
 
     if ( m_uiForm.cal_ckPlotResult->isChecked() )
     {
@@ -1817,6 +1828,11 @@ void Indirect::sOfQwClicked()
     if ( m_uiForm.sqw_ckSave->isChecked() )
     {
       pyInput += "SaveNexus(InputWorkspace=sqwOutput, Filename=sqwOutput+'.nxs')\n";
+
+      if (m_uiForm.sqw_ckVerbose->isChecked())
+      {
+        pyInput += "logger.notice(\"Resolution file saved to default save directory.\")\n";
+      }
     }
 
     if ( m_uiForm.sqw_cbPlotType->currentText() == "Contour" )

Code/Mantid/scripts/Inelastic/IndirectEnergyConversion.py

@@ -52,7 +52,7 @@ def createMappingFile(groupFile, ngroup, nspec, first):
 
 def resolution(files, iconOpt, rebinParam, bground, 
         instrument, analyser, reflection,
-        plotOpt=False, Res=True, factor=None):
+        Res=True, factor=None, Plot=False, Verbose=False, Save=False):
     reducer = inelastic_indirect_reducer.IndirectReducer()
     reducer.set_instrument_name(instrument)
     reducer.set_detector_range(iconOpt['first']-1,iconOpt['last']-1)
@@ -80,14 +80,17 @@ def resolution(files, iconOpt, rebinParam, bground,
         CalculateFlatBackground(InputWorkspace=iconWS, OutputWorkspace=name, StartX=bground[0], EndX=bground[1], 
             Mode='Mean', OutputMode='Subtract Background')
         Rebin(InputWorkspace=name, OutputWorkspace=name, Params=rebinParam)
+        
+        if Save:
+            if Verbose:
+                logger.notice("Resolution file saved to default save directory.")
+            SaveNexusProcessed(InputWorkspace=name, Filename=name+'.nxs')
             
-        SaveNexusProcessed(InputWorkspace=name, Filename=name+'.nxs')
-            
-        if plotOpt:
+        if Plot:
             graph = mp.plotSpectrum(name, 0)
         return name
     else:
-        if plotOpt:
+        if Plot:
             graph = mp.plotSpectrum(iconWS, 0)
         return iconWS
 
@@ -194,7 +197,7 @@ def sliceProcessRawFile(rawFile, calibWsName, useCalib, xRange, useTwoRanges, sp
 
     return sfile
 
-def slice(inputfiles, calib, xRange, spec, suffix, Save=False, Verbose=True, Plot=False):
+def slice(inputfiles, calib, xRange, spec, suffix, Save=False, Verbose=False, Plot=False):
 
     StartTime('Slice')