Skip to content

Commit

Permalink
Tidy up Fury and Conv fit
Browse files Browse the repository at this point in the history
Refs #10626
  • Loading branch information
DanNixon committed Nov 28, 2014
1 parent fd7615b commit c9f9757
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
21 changes: 1 addition & 20 deletions Code/Mantid/MantidQt/CustomInterfaces/src/ConvFit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -690,25 +690,6 @@ namespace IDA
uiForm().confit_ckPlotGuess->setChecked(false);

int specNo = uiForm().confit_spPlotSpectrum->text().toInt();
// Set spectra max value
int specMin = 0;
int specMax = static_cast<int>(m_cfInputWS->getNumberHistograms()) - 1;

m_valInt->setRange(specMin, specMax);
/* uiForm().confit_spSpectraMin->setText(QString::number(specMin)); */
/* uiForm().confit_spSpectraMax->setText(QString::number(specMax)); */

if ( specNo < 0 || specNo > specMax )
{
/* uiForm().confit_spPlotSpectrum->setText("0"); */
specNo = 0;
}

int smCurrent = uiForm().confit_spSpectraMax->text().toInt();
if ( smCurrent < 0 || smCurrent > specMax )
{
/* uiForm().confit_spSpectraMax->setText(QString::number(specMax)); */
}

plotMiniPlot(m_cfInputWS, specNo, "ConvFitPlot", "CFDataCurve");
try
Expand Down Expand Up @@ -818,7 +799,7 @@ namespace IDA
}

QString outputNm = runPythonCode(QString("from IndirectCommon import getWSprefix\nprint getWSprefix('") + m_cfInputWSName + QString("')\n")).trimmed();
outputNm += QString("conv_") + fitType + bgType + uiForm().confit_spPlotSpectrum->text();
outputNm += QString("conv_") + fitType + bgType + uiForm().confit_spPlotSpectrum->text();
std::string output = outputNm.toStdString();

Mantid::API::IAlgorithm_sptr alg = Mantid::API::AlgorithmManager::Instance().create("Fit");
Expand Down
1 change: 1 addition & 0 deletions Code/Mantid/MantidQt/CustomInterfaces/src/FuryFit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,7 @@ namespace IDA
delete proplbl;
delete prop;
}

} // namespace IDA
} // namespace CustomInterfaces
} // namespace MantidQt

0 comments on commit c9f9757

Please sign in to comment.