Skip to content

Commit

Permalink
Refs #10223 Resolve some static analysis warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Harry Jeffery committed Sep 23, 2014
1 parent 738db45 commit bbfa4e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
Expand Up @@ -35,15 +35,9 @@ namespace Mantid
{
public:
/// Default constructor
Stitch1DMany()
{
}
;
Stitch1DMany() : m_numWorkspaces(0), m_manualScaleFactor(1.0), m_scaleRHSWorkspace(true), m_useManualScaleFactor(false) {};
/// Destructor
virtual ~Stitch1DMany()
{
}
;
virtual ~Stitch1DMany() {};
/// Algorithm's name for identification. @see Algorithm::name
virtual const std::string name() const
{
Expand Down
Expand Up @@ -184,28 +184,13 @@ namespace MantidQt
const std::string transStr = m_model->String(rowNo, COL_TRANSMISSION);
const std::string transWSName = makeTransWSName(transStr);

double dqq = 0;
double theta = 0;
double qmin = 0;
double qmax = 0;

const bool dqqGiven = !m_model->String(rowNo, COL_DQQ ).empty();
const bool thetaGiven = !m_model->String(rowNo, COL_ANGLE).empty();
const bool qminGiven = !m_model->String(rowNo, COL_QMIN ).empty();
const bool qmaxGiven = !m_model->String(rowNo, COL_QMAX ).empty();

if(dqqGiven)
Mantid::Kernel::Strings::convert<double>(m_model->String(rowNo, COL_DQQ), dqq);

if(thetaGiven)
Mantid::Kernel::Strings::convert<double>(m_model->String(rowNo, COL_ANGLE), theta);

if(qminGiven)
Mantid::Kernel::Strings::convert<double>(m_model->String(rowNo, COL_QMIN), qmin);

if(qmaxGiven)
Mantid::Kernel::Strings::convert<double>(m_model->String(rowNo, COL_QMAX), qmax);

Workspace_sptr runWS = fetchRun(run, m_view->getProcessInstrument());

//If the transmission workspace already exists, re-use it.
Expand Down

0 comments on commit bbfa4e7

Please sign in to comment.