From e3e9f49e4630b2e5054dc38e5e077e7687ef9de5 Mon Sep 17 00:00:00 2001 From: Martyn Gigg Date: Fri, 7 Feb 2014 15:19:51 +0000 Subject: [PATCH] Fix cppcheck errors in SCDPanelErrors. Refs #8940 --- Code/Mantid/Framework/Crystal/src/SCDPanelErrors.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Code/Mantid/Framework/Crystal/src/SCDPanelErrors.cpp b/Code/Mantid/Framework/Crystal/src/SCDPanelErrors.cpp index 1bfa5d648591..498501069ada 100644 --- a/Code/Mantid/Framework/Crystal/src/SCDPanelErrors.cpp +++ b/Code/Mantid/Framework/Crystal/src/SCDPanelErrors.cpp @@ -701,8 +701,6 @@ void SCDPanelErrors::functionDeriv1D(Jacobian *out, const double *xValues, const if (!m_unitCell) throw runtime_error("Cannot evaluate function without setting the lattice constants"); - size_t StartPos = 2; - size_t L0param = parameterIndex("l0"); size_t T0param = parameterIndex("t0"); @@ -900,7 +898,7 @@ void SCDPanelErrors::functionDeriv1D(Jacobian *out, const double *xValues, const Unrot_dQ[2].clear(); //-------- xyz offset parameters ---------------------- - StartPos = parameterIndex("f" + boost::lexical_cast(gr) + "_Xoffset"); + size_t StartPos = parameterIndex("f" + boost::lexical_cast(gr) + "_Xoffset"); for (size_t param = StartPos; param <= StartPos + (size_t) 2; ++param) @@ -1323,7 +1321,7 @@ DataObjects::Workspace2D_sptr SCDPanelErrors::calcWorkspace(DataObjects::PeaksWo { API::IPeak& peak = pwks->getPeak( (int)j); if (peak.getBankName().compare(bankNames[k]) == 0) - if (peak.getH() != 0 || peak.getK() != 0 || peak.getK() != 0) + if (peak.getH() != 0 || peak.getK() != 0 || peak.getL() != 0) if (peak.getH() - floor(peak.getH()) < tolerance || floor(peak.getH() + 1) - peak.getH() < tolerance) if (peak.getK() - floor(peak.getK()) < tolerance || floor(peak.getK() + 1) - peak.getK()