Skip to content

Commit

Permalink
Port reset of IndirectDiffractionReduction to new API.
Browse files Browse the repository at this point in the history
Refs #7468
  • Loading branch information
martyngigg committed Jul 22, 2013
1 parent 418dd11 commit fee3d2a
Showing 1 changed file with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ void IndirectDiffractionReduction::demonRun()
}

QString pyInput =
"from MantidFramework import *\n"
"from mantidsimple import *\n"
"from mantid.simpleapi import *\n"
"OSIRISDiffractionReduction("
"Sample=r'" + m_uiForm.dem_rawFiles->getFilenames().join(", ") + "', "
"Vanadium=r'" + m_uiForm.dem_vanadiumFile->getFilenames().join(", ") + "', "
Expand All @@ -137,14 +136,14 @@ void IndirectDiffractionReduction::demonRun()

if ( m_uiForm.ckGSS->isChecked() )
{
pyInput += "SaveGSS(" + tofWsName + ", " + tofWsName + " + '.gss')\n";
pyInput += "SaveGSS(InputWorkspace=" + tofWsName + ", Filename=" + tofWsName + " + '.gss')\n";
}

if ( m_uiForm.ckNexus->isChecked() )
pyInput += "SaveNexusProcessed(" + drangeWsName + ", " + drangeWsName + "+'.nxs')\n";
pyInput += "SaveNexusProcessed(InputWorkspace=" + drangeWsName + ", Filename=" + drangeWsName + "+'.nxs')\n";

if ( m_uiForm.ckAscii->isChecked() )
pyInput += "SaveAscii(" + drangeWsName + ", " + drangeWsName + " +'.dat')\n";
pyInput += "SaveAscii(InputWorkspace=" + drangeWsName + ", Filename=" + drangeWsName + " +'.dat')\n";

if ( m_uiForm.cbPlotType->currentText() == "Spectra" )
{
Expand Down

0 comments on commit fee3d2a

Please sign in to comment.