Skip to content

Commit

Permalink
Re-add SQw, get efixed using getInstrumentDetails()
Browse files Browse the repository at this point in the history
Refs #10266
  • Loading branch information
DanNixon committed Nov 4, 2014
1 parent 53fa628 commit a5a92d1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Expand Up @@ -130,7 +130,7 @@ void IndirectDataReduction::initLayout()
/* m_tabs["Diagnostics"] = new IndirectDiagnostics(m_uiForm, this); */
m_tabs["Transmission"] = new IndirectTransmission(m_uiForm, this);
m_tabs["Symmetrise"] = new IndirectSymmetrise(m_uiForm, this);
/* m_tabs["S(Q, w)"] = new IndirectSqw(m_uiForm, this); */
m_tabs["S(Q, w)"] = new IndirectSqw(m_uiForm, this);
m_tabs["Moments"] = new IndirectMoments(m_uiForm, this);

// Handle the instrument being changed
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/MantidQt/CustomInterfaces/src/IndirectSqw.cpp
Expand Up @@ -175,7 +175,7 @@ namespace CustomInterfaces
}

// Get correct S(Q, w) algorithm
QString efixed = m_uiForm.leEfixed->text();
QString eFixed = getInstrumentDetails()["efixed-val"];

IAlgorithm_sptr sqwAlg;
QString rebinType = m_uiForm.sqw_cbRebinType->currentText();
Expand All @@ -199,7 +199,7 @@ namespace CustomInterfaces
sqwAlg->setProperty("OutputWorkspace", sqwWsName.toStdString());
sqwAlg->setProperty("QAxisBinning", rebinString.toStdString());
sqwAlg->setProperty("EMode", "Indirect");
sqwAlg->setProperty("EFixed", efixed.toStdString());
sqwAlg->setProperty("EFixed", eFixed.toStdString());

m_batchAlgoRunner->addAlgorithm(sqwAlg, sqwInputProps);

Expand Down

0 comments on commit a5a92d1

Please sign in to comment.