Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/bugfix/10234_convfit_save_compon…
Browse files Browse the repository at this point in the history
…ents'
  • Loading branch information
Michael Reuter committed Sep 26, 2014
2 parents c253429 + 41b3460 commit bba50d3
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ namespace IDA
m_cfPlot(NULL), m_cfProp(), m_fixedProps(), m_cfRangeS(NULL), m_cfBackgS(NULL),
m_cfHwhmRange(NULL), m_cfGrpMng(NULL), m_cfDblMng(NULL), m_cfBlnMng(NULL), m_cfDataCurve(NULL),
m_cfCalcCurve(NULL), m_cfInputWS(), m_cfInputWSName(), m_confitResFileType()
{}
{
}

void ConvFit::setup()
{
Expand Down Expand Up @@ -803,7 +804,10 @@ namespace IDA
alg->setProperty<int>("WorkspaceIndex", uiForm().confit_lePlotSpectrum->text().toInt());
alg->setProperty<double>("StartX", m_cfDblMng->value(m_cfProp["StartX"]));
alg->setProperty<double>("EndX", m_cfDblMng->value(m_cfProp["EndX"]));
alg->setPropertyValue("Output", output);
alg->setProperty("Output", output);
alg->setProperty("CreateOutput", true);
alg->setProperty("OutputCompositeMembers", true);
alg->setProperty("ConvolveMembers", true);
alg->execute();

if ( ! alg->isExecuted() )
Expand Down

0 comments on commit bba50d3

Please sign in to comment.