From 3972c44e7bc2ed74acbdeb487eeb59bb3c6b3e56 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Wed, 5 Nov 2014 14:41:12 -0500
Subject: [PATCH] Refs #10507. Cleanup clang warning in Mantid Algorithms.
---
.../inc/MantidAPI/IPowderDiffPeakFunction.h | 5 --
.../MantidAlgorithms/CreateCalFileByNames.h | 2 -
.../inc/MantidAlgorithms/CreateDummyCalFile.h | 2 -
.../inc/MantidAlgorithms/ExtractMaskToTable.h | 7 ---
.../inc/MantidAlgorithms/NormaliseByCurrent.h | 3 -
.../inc/MantidAlgorithms/SmoothNeighbours.h | 6 --
.../inc/MantidAlgorithms/SumNeighbours.h | 6 --
.../Algorithms/src/CheckWorkspacesMatch.cpp | 9 +--
.../Algorithms/src/CreateCalFileByNames.cpp | 2 +-
.../Algorithms/src/CreateDummyCalFile.cpp | 2 +-
.../Algorithms/src/GeneratePeaks.cpp | 41 -------------
.../Crystal/src/IntegratePeakTimeSlices.cpp | 3 +-
.../MantidCurveFitting/CalculateMSVesuvio.h | 1 -
.../inc/MantidCurveFitting/DampingMinimizer.h | 2 -
.../MantidCurveFitting/FullprofPolynomial.h | 6 --
.../inc/MantidCurveFitting/Polynomial.h | 6 --
.../inc/MantidCurveFitting/UserFunction1D.h | 4 +-
.../CurveFitting/src/CalculateMSVesuvio.cpp | 2 +-
.../CurveFitting/src/DampingMinimizer.cpp | 3 +-
.../Mantid/Framework/CurveFitting/src/Fit.cpp | 7 +--
.../Framework/CurveFitting/src/FitMW.cpp | 3 +-
.../Framework/CurveFitting/src/LeBailFit.cpp | 2 -
.../CurveFitting/src/LeBailFunction.cpp | 1 -
.../CurveFitting/src/SimplexMinimizer.cpp | 2 +-
.../inc/MantidDataHandling/LoadRaw3.h | 2 -
.../inc/MantidDataHandling/LoadRawBin0.h | 2 -
.../Framework/DataHandling/src/Load.cpp | 23 -------
.../DataHandling/src/LoadEventNexus.cpp | 9 +--
.../DataHandling/src/LoadRaw/isisraw.cpp | 6 +-
.../DataHandling/src/LoadRaw/isisraw.h | 5 --
.../DataHandling/src/LoadRawBin0.cpp | 2 +-
.../Framework/DataHandling/src/SaveAscii.cpp | 10 ++-
.../Rendering/GluGeometryRenderer.h | 2 -
.../Rendering/OCGeometryGenerator.h | 1 -
.../Rendering/vtkGeometryCacheReader.h | 1 -
.../Geometry/src/Crystal/NiggliCell.cpp | 2 -
.../Geometry/src/Surfaces/General.cpp | 2 -
.../src/Math/Optimization/SLSQPMinimizer.cpp | 61 -------------------
.../Kernel/src/TimeSeriesProperty.cpp | 18 +++---
.../Quantification/Models/MullerAnsatz.cpp | 8 +--
.../Quantification/Models/Strontium122.cpp | 3 -
.../inc/MantidMDEvents/MDHistoWorkspace.h | 2 -
.../Framework/Nexus/src/NexusClasses.cpp | 2 +-
43 files changed, 38 insertions(+), 250 deletions(-)
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h b/Code/Mantid/Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h
index 9d93f5e24f7..9ce2968053e 100644
--- a/Code/Mantid/Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h
+++ b/Code/Mantid/Framework/API/inc/MantidAPI/IPowderDiffPeakFunction.h
@@ -151,11 +151,6 @@ protected:
size_t LATTICEINDEX;
size_t HEIGHTINDEX;
-
-private:
- /// Peak intensity
- double m_intensity;
-
};
typedef boost::shared_ptr<IPowderDiffPeakFunction> IPowderDiffPeakFunction_sptr;
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h
index 173b82956d7..eb731c79621 100644
--- a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateCalFileByNames.h
@@ -91,8 +91,6 @@ private:
std::string groups;
/// Calibration map used if the *.cal file exist. All entries in the *.cal file are registered with the udet number as the key and the <Number,Offset,Select,Group> as the tuple value.
instrcalmap instrcalib;
- /// Number of groups
- int group_no;
};
} // namespace Algorithms
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h
index e44ded0a112..24817de1a99 100644
--- a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/CreateDummyCalFile.h
@@ -87,8 +87,6 @@ private:
std::string groups;
/// Calibration map used if the *.cal file exist. All entries in the *.cal file are registered with the udet number as the key and the <Number,Offset,Select,Group> as the tuple value.
instrcalmap instrcalib;
- /// Number of groups
- int group_no;
};
} // namespace Algorithms
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h
index 548baf63a55..9a74ac59f0a 100644
--- a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/ExtractMaskToTable.h
@@ -87,13 +87,6 @@ namespace Algorithms
/// Input workspace type
bool m_inputIsMask;
-
- /// Minimum X range
- double m_XMin;
-
- /// Maximum X range
- double m_XMax;
-
};
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByCurrent.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByCurrent.h
index 8f218b96b8a..c9e9102d8ae 100644
--- a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByCurrent.h
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/NormaliseByCurrent.h
@@ -71,9 +71,6 @@ private:
void exec();
// Extract the charge value from the logs.
double extractCharge(boost::shared_ptr<Mantid::API::MatrixWorkspace> inputWs) const;
- /// Progress reporting
- API::Progress* m_progress;
-
};
} // namespace Algorithm
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SmoothNeighbours.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SmoothNeighbours.h
index 8f83f4aabb0..eadd791a7a0 100644
--- a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SmoothNeighbours.h
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SmoothNeighbours.h
@@ -128,12 +128,6 @@ private:
static const std::string RECTANGULAR_GROUP;
/// Input workspace name
static const std::string INPUT_WORKSPACE;
-
- /// Pixels in the detector
- int XPixels;
- /// Pixels in the detector
- int YPixels;
-
/// Number to sum
int AdjX;
/// Number to sum
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SumNeighbours.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SumNeighbours.h
index cae1c8631b5..76dbdf18776 100644
--- a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SumNeighbours.h
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/SumNeighbours.h
@@ -62,12 +62,6 @@ private:
// Overridden Algorithm methods
void init();
void exec();
-
- /// Pixels in the detector
- int XPixels;
- /// Pixels in the detector
- int YPixels;
-
/// Number to sum
int SumX;
/// Number to sum
diff --git a/Code/Mantid/Framework/Algorithms/src/CheckWorkspacesMatch.cpp b/Code/Mantid/Framework/Algorithms/src/CheckWorkspacesMatch.cpp
index f61a11c9641..5865b5a5dee 100644
--- a/Code/Mantid/Framework/Algorithms/src/CheckWorkspacesMatch.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CheckWorkspacesMatch.cpp
@@ -390,11 +390,9 @@ bool CheckWorkspacesMatch::compareEventWorkspaces(DataObjects::EventWorkspace_co
size_t numUnequalBothEvents = 0;
std::vector<int> vec_mismatchedwsindex;
- bool condition = m_ParallelComparison && ews1->threadSafe() && ews2->threadSafe() ;
- PARALLEL_FOR_IF(condition)
+ PARALLEL_FOR_IF(m_ParallelComparison && ews1->threadSafe() && ews2->threadSafe())
for (int i=0; i<static_cast<int>(ews1->getNumberHistograms()); ++i)
- for (int i=0; i<static_cast<int>(ews1->getNumberHistograms()); i++)
- {
+ {
PARALLEL_START_INTERUPT_REGION
prog->report("EventLists");
if (!mismatchedEvent || checkallspectra) // This guard will avoid checking unnecessarily
@@ -527,8 +525,7 @@ bool CheckWorkspacesMatch::checkData(API::MatrixWorkspace_const_sptr ws1, API::M
bool resultBool = true;
// Now check the data itself
- bool condition = m_ParallelComparison && ws1->threadSafe() && ws2->threadSafe() ;
- PARALLEL_FOR_IF(condition)
+ PARALLEL_FOR_IF(m_ParallelComparison && ws1->threadSafe() && ws2->threadSafe())
for ( long i = 0; i < static_cast<long>(numHists); ++i )
{
PARALLEL_START_INTERUPT_REGION
diff --git a/Code/Mantid/Framework/Algorithms/src/CreateCalFileByNames.cpp b/Code/Mantid/Framework/Algorithms/src/CreateCalFileByNames.cpp
index 576e138f382..7d8abf2d403 100644
--- a/Code/Mantid/Framework/Algorithms/src/CreateCalFileByNames.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CreateCalFileByNames.cpp
@@ -32,7 +32,7 @@ namespace Mantid
using API::FileProperty;
using Geometry::Instrument_const_sptr;
- CreateCalFileByNames::CreateCalFileByNames():API::Algorithm(),group_no(0)
+ CreateCalFileByNames::CreateCalFileByNames():API::Algorithm()
{
}
diff --git a/Code/Mantid/Framework/Algorithms/src/CreateDummyCalFile.cpp b/Code/Mantid/Framework/Algorithms/src/CreateDummyCalFile.cpp
index 48dd491f398..3415f9089f3 100644
--- a/Code/Mantid/Framework/Algorithms/src/CreateDummyCalFile.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/CreateDummyCalFile.cpp
@@ -45,7 +45,7 @@ namespace Mantid
using namespace Geometry;
using namespace DataObjects;
- CreateDummyCalFile::CreateDummyCalFile():API::Algorithm(),group_no(0)
+ CreateDummyCalFile::CreateDummyCalFile():API::Algorithm()
{
}
diff --git a/Code/Mantid/Framework/Algorithms/src/GeneratePeaks.cpp b/Code/Mantid/Framework/Algorithms/src/GeneratePeaks.cpp
index f8206c48449..2aebdfcfa55 100644
--- a/Code/Mantid/Framework/Algorithms/src/GeneratePeaks.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/GeneratePeaks.cpp
@@ -28,47 +28,6 @@ namespace Mantid
{
namespace Algorithms
{
- namespace
- { // anonymous name space
- /**
- * Determine if the table contains raw parameters.
- */
- bool isRawTable(const std::vector<std::string> & colNames)
- {
- if (colNames.size() != 6)
- return true;
- if (colNames[0].compare("centre") != 0)
- return true;
- if (colNames[1].compare("width") != 0)
- return true;
- if (colNames[2].compare("height") != 0)
- return true;
- if (colNames[3].compare("backgroundintercept") != 0)
- return true;
- if (colNames[4].compare("backgroundslope") != 0)
- return true;
- if (colNames[5].compare("A2") != 0)
- return true;
- return false;
- }
-
- /**
- * Determine how many parameters are in the peak function.
- */
- std::size_t getBkgOffset(const std::vector<std::string> & colNames, const bool isRaw)
- {
- if (!isRaw)
- return 3;
-
- for (std::size_t i = 0; i < colNames.size(); i++)
- {
- if (colNames[i].substr(0,3).compare("f1.") == 0)
- return i;
- }
- return colNames.size(); // shouldn't get here
- }
- }
-
DECLARE_ALGORITHM(GeneratePeaks)
//----------------------------------------------------------------------------------------------
diff --git a/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp b/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
index 0b84eb9ca9e..166849c8c82 100644
--- a/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
+++ b/Code/Mantid/Framework/Crystal/src/IntegratePeakTimeSlices.cpp
@@ -1678,8 +1678,7 @@ namespace Mantid
workspaceIndex= wi_to_detid_map.find(DetID)->second;
else
{
- g_log.error("No workspaceIndex for detID="+DetID);
- throw std::runtime_error("No workspaceIndex for detID="+DetID);
+ throw std::runtime_error("No workspaceIndex for detID="+boost::lexical_cast<std::string>(DetID));
}
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
index 0938057d47f..5a4c27d5599 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/CalculateMSVesuvio.h
@@ -127,7 +127,6 @@ namespace Mantid
Kernel::V3D m_beamDir; // Directional vector for beam
double m_srcR2; // beam penumbra radius (m)
double m_halfSampleHeight, m_halfSampleWidth, m_halfSampleThick; // (m)
- double m_maxWidthSampleFrame; // Maximum width in sample frame (m)
Geometry::Object const *m_sampleShape; // sample shape
SampleComptonProperties *m_sampleProps; // description of sample properties
double m_detHeight, m_detWidth, m_detThick; // (m)
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DampingMinimizer.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DampingMinimizer.h
index 76e49b15314..cb18b043c8f 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DampingMinimizer.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/DampingMinimizer.h
@@ -58,8 +58,6 @@ public:
private:
/// Pointer to the cost function. Must be the least squares.
boost::shared_ptr<CostFuncLeastSquares> m_leastSquares;
- /// Relative tolerance.
- double m_relTol;
/// The damping mu parameter in the Levenberg-Marquardt method.
//double m_damping;
};
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/FullprofPolynomial.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/FullprofPolynomial.h
index ade3e5d8d8f..a41442cce08 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/FullprofPolynomial.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/FullprofPolynomial.h
@@ -70,12 +70,6 @@ namespace CurveFitting
/// Background origin position
double m_bkpos;
-
- /// Lower x boundary.
- double m_StartX;
-
- /// Upper x boundary
- double m_EndX;
};
typedef boost::shared_ptr<FullprofPolynomial> FullprofPolynomial_sptr;
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Polynomial.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Polynomial.h
index c15c9034c37..c6116cc326a 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Polynomial.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/Polynomial.h
@@ -69,12 +69,6 @@ namespace CurveFitting
/// Polynomial order
int m_n;
-
- /// Lower x boundary.
- double m_StartX;
-
- /// Upper x boundary
- double m_EndX;
};
typedef boost::shared_ptr<Polynomial> Polynomial_sptr;
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction1D.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction1D.h
index b22a528d06b..ec559593b3c 100644
--- a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction1D.h
+++ b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/UserFunction1D.h
@@ -67,7 +67,7 @@ namespace Mantid
{
public:
/// Constructor
- UserFunction1D():m_x_set(false),m_parameters(new double[100]),m_buffSize(100),m_nPars(0) {};
+ UserFunction1D():m_x_set(false),m_parameters(new double[100]),m_nPars(0) {};
/// Destructor
virtual ~UserFunction1D() {};
/// Algorithm's name for identification overriding a virtual method
@@ -99,8 +99,6 @@ namespace Mantid
bool m_x_set;
/// Pointer to muParser variables' buffer
boost::shared_array<double> m_parameters;
- /// Size of the variables' buffer
- const int m_buffSize;
/// Number of actual parameters
int m_nPars;
/// Temporary data storage
diff --git a/Code/Mantid/Framework/CurveFitting/src/CalculateMSVesuvio.cpp b/Code/Mantid/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
index 532e4dab4e5..1a9c29a6936 100644
--- a/Code/Mantid/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/CalculateMSVesuvio.cpp
@@ -51,7 +51,7 @@ namespace Mantid
m_randgen(NULL),
m_acrossIdx(0), m_upIdx(1), m_beamIdx(3), m_beamDir(), m_srcR2(0.0),
m_halfSampleHeight(0.0), m_halfSampleWidth(0.0), m_halfSampleThick(0.0),
- m_maxWidthSampleFrame(0.0), m_sampleShape(NULL), m_sampleProps(NULL),
+ m_sampleShape(NULL), m_sampleProps(NULL),
m_detHeight(-1.0), m_detWidth(-1.0), m_detThick(-1.0),
m_tmin(-1.0), m_tmax(-1.0), m_delt(-1.0), m_foilRes(-1.0),
m_nscatters(0), m_nruns(0), m_nevents(0),
diff --git a/Code/Mantid/Framework/CurveFitting/src/DampingMinimizer.cpp b/Code/Mantid/Framework/CurveFitting/src/DampingMinimizer.cpp
index 73b38d9f2fa..50181447375 100644
--- a/Code/Mantid/Framework/CurveFitting/src/DampingMinimizer.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/DampingMinimizer.cpp
@@ -30,8 +30,7 @@ DECLARE_FUNCMINIMIZER(DampingMinimizer,Damping)
/// Constructor
DampingMinimizer::DampingMinimizer():
-IFuncMinimizer(),
-m_relTol(1e-6)
+IFuncMinimizer()
{
declareProperty("Damping",0.0,"The damping parameter.");
}
diff --git a/Code/Mantid/Framework/CurveFitting/src/Fit.cpp b/Code/Mantid/Framework/CurveFitting/src/Fit.cpp
index 19634cb1f99..51982c9a663 100644
--- a/Code/Mantid/Framework/CurveFitting/src/Fit.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/Fit.cpp
@@ -45,12 +45,7 @@ namespace CurveFitting
// Register the class into the algorithm factory
DECLARE_ALGORITHM(Fit)
- using API::IDomainCreator;
-
- namespace
- {
- bool isStringEmpty(const std::string& str){return str.empty();}
- }
+ using API::IDomainCreator;
/**
* Examine "Function" and "InputWorkspace" properties to decide which domain creator to use.
diff --git a/Code/Mantid/Framework/CurveFitting/src/FitMW.cpp b/Code/Mantid/Framework/CurveFitting/src/FitMW.cpp
index 3a4fb90c001..0f2619dc59b 100644
--- a/Code/Mantid/Framework/CurveFitting/src/FitMW.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/FitMW.cpp
@@ -35,7 +35,7 @@ namespace
{
public:
/// Constructor
- SimpleJacobian(size_t nData,size_t nParams):m_nData(nData),m_nParams(nParams),m_data(nData*nParams){}
+ SimpleJacobian(size_t nData,size_t nParams):m_nParams(nParams),m_data(nData*nParams){}
/// Setter
virtual void set(size_t iY, size_t iP, double value)
{
@@ -47,7 +47,6 @@ namespace
return m_data[iY * m_nParams + iP];
}
private:
- size_t m_nData; ///< size of the data / first dimension
size_t m_nParams; ///< number of parameters / second dimension
std::vector<double> m_data; ///< data storage
};
diff --git a/Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp b/Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp
index a8eace0fb8d..28e94f51a0d 100644
--- a/Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/LeBailFit.cpp
@@ -26,12 +26,10 @@ const int CALDATAINDEX(1);
const int DATADIFFINDEX(2);
const int CALPUREPEAKINDEX(3);
const int CALBKGDINDEX(4); // Output workspace background at ws index 4
-const int INPUTCALDATAINDEX(5);
const int INPUTBKGDINDEX(6); // Input background
const int INPUTPUREPEAKINDEX(7); // Output workspace: pure peak (data with background removed)
const int SMOOTHEDBKGDINDEX(8); // Smoothed background
-const double NEG_DBL_MAX(-1.*DBL_MAX);
const double NOBOUNDARYLIMIT(1.0E10);
const double EPSILON(1.0E-10);
diff --git a/Code/Mantid/Framework/CurveFitting/src/LeBailFunction.cpp b/Code/Mantid/Framework/CurveFitting/src/LeBailFunction.cpp
index 1aa29d6b927..f4e8d0d7f7d 100644
--- a/Code/Mantid/Framework/CurveFitting/src/LeBailFunction.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/LeBailFunction.cpp
@@ -22,7 +22,6 @@ namespace CurveFitting
{
namespace
{
- const int PEAKRADIUS = 8;
const double PEAKRANGECONSTANT = 5.0;
const string CHEBYSHEV_BACKGROUND("Chebyshev");
diff --git a/Code/Mantid/Framework/CurveFitting/src/SimplexMinimizer.cpp b/Code/Mantid/Framework/CurveFitting/src/SimplexMinimizer.cpp
index 377d3527c9a..8f1d420c5d3 100644
--- a/Code/Mantid/Framework/CurveFitting/src/SimplexMinimizer.cpp
+++ b/Code/Mantid/Framework/CurveFitting/src/SimplexMinimizer.cpp
@@ -99,7 +99,7 @@ bool SimplexMinimizer::iterate(size_t)
return false;
}
double size = gsl_multimin_fminimizer_size(m_gslSolver);
- status = gsl_multimin_test_size(size, 1e-6);
+ status = gsl_multimin_test_size(size,m_epsabs);
if (status != GSL_CONTINUE)
{
m_errorString = gsl_strerror(status);
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
index 326f4830d43..45fd06236c9 100644
--- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
+++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRaw3.h
@@ -121,8 +121,6 @@ namespace Mantid
/// Read in the time bin boundaries
int64_t m_lengthIn;
- /// boolean for list spectra options
- bool m_bmspeclist;
/// time channels vector
std::vector<boost::shared_ptr<MantidVec> > m_timeChannelsVec;
/// total number of specs
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
index ee97585b3e1..868a4f2a8f4 100644
--- a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
+++ b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadRawBin0.h
@@ -108,8 +108,6 @@ namespace Mantid
/// Read in the time bin boundaries
int64_t m_lengthIn;
- /// boolean for list spectra options
- bool m_bmspeclist;
/// TimeSeriesProperty<int> containing data periods.
boost::shared_ptr<Kernel::Property> m_perioids;
diff --git a/Code/Mantid/Framework/DataHandling/src/Load.cpp b/Code/Mantid/Framework/DataHandling/src/Load.cpp
index e9702b44c91..25cd07b599f 100644
--- a/Code/Mantid/Framework/DataHandling/src/Load.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/Load.cpp
@@ -42,29 +42,6 @@ namespace
return false;
}
- /**
- * Helper function that takes a vector of runs, and generates a suggested workspace name.
- * This will likely need to be improved and may have to include instrument name, etc.
- *
- * @param runs :: a vector of run numbers.
- *
- * @returns a string containing a suggested ws name based on the given run numbers.
- */
- std::string generateWsNameFromRuns(std::vector<unsigned int> runs)
- {
- std::string wsName("");
-
- for(size_t i = 0; i < runs.size(); ++i)
- {
- if(!wsName.empty())
- wsName += "_";
-
- wsName += boost::lexical_cast<std::string>(runs[i]);
- }
-
- return wsName;
- }
-
/**
* Helper function that takes a vector of filenames, and generates a suggested workspace name.
*
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp b/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp
index 7007ce0de17..fa52b19f3f2 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -139,7 +139,7 @@ namespace Mantid
detid_t min_event_id, detid_t max_event_id)
: Task(), alg(alg), entry_name(entry_name), pixelID_to_wi_vector(alg->pixelID_to_wi_vector),
pixelID_to_wi_offset(alg->pixelID_to_wi_offset),
- prog(prog), scheduler(scheduler),
+ prog(prog),
event_id(event_id), event_time_of_flight(event_time_of_flight), numEvents(numEvents), startAt(startAt),
event_index(event_index),
thisBankPulseTimes(thisBankPulseTimes), have_weight(have_weight),
@@ -391,8 +391,6 @@ namespace Mantid
detid_t pixelID_to_wi_offset;
/// Progress reporting
Progress * prog;
- /// ThreadScheduler running this task
- ThreadScheduler * scheduler;
/// event pixel ID array
boost::shared_array<uint32_t> event_id;
/// event TOF array
@@ -444,7 +442,6 @@ namespace Mantid
Progress * prog, boost::shared_ptr<Mutex> ioMutex, ThreadScheduler * scheduler)
: Task(),
alg(alg), entry_name(entry_name), entry_type(entry_type),
- pixelID_to_wi_vector(alg->pixelID_to_wi_vector), pixelID_to_wi_offset(alg->pixelID_to_wi_offset),
// prog(prog), scheduler(scheduler), thisBankPulseTimes(NULL), m_loadError(false),
prog(prog), scheduler(scheduler), m_loadError(false),
m_oldNexusFileNames(oldNeXusFileNames), m_loadStart(), m_loadSize(), m_event_id(NULL),
@@ -919,10 +916,6 @@ namespace Mantid
std::string entry_name;
/// NXS type
std::string entry_type;
- /// Vector where (index = pixel ID+pixelID_to_wi_offset), value = workspace index)
- const std::vector<size_t> & pixelID_to_wi_vector;
- /// Offset in the pixelID_to_wi_vector to use.
- detid_t pixelID_to_wi_offset;
/// Progress reporting
Progress * prog;
/// ThreadScheduler running this task
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRaw/isisraw.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRaw/isisraw.cpp
index 959a2116028..a4ae3eced4c 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRaw/isisraw.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRaw/isisraw.cpp
@@ -8,7 +8,7 @@
#define FAILURE 1
/// stuff
-ISISRAW::ISISRAW() : m_crpt(0), m_ntc1(0), m_nsp1(0), m_nper(0),dat1(0)
+ISISRAW::ISISRAW() : m_crpt(0),dat1(0)
{
int i, j;
// section 1
@@ -139,7 +139,7 @@ int ISISRAW::addItems()
// create one bound to a CRPT
/// stuff
-ISISRAW::ISISRAW(ISISCRPT_STRUCT* crpt) : m_crpt(crpt),m_ntc1(0),m_nsp1(0), m_nper(0),
+ISISRAW::ISISRAW(ISISCRPT_STRUCT* crpt) : m_crpt(crpt),
frmt_ver_no(0),data_format(0),ver2(0),r_number(0),ver3(0),
i_det(0),i_mon(0),i_use(0),mdet(0),monp(0),spec(0),delt(0),len2(0),code(0),tthe(0),ut(0),
ver4(0),ver5(0),crat(0),modn(0),mpos(0),timr(0),udet(0),ver6(0),t_ntrg(0),t_nfpp(0),t_nper(0),
@@ -164,7 +164,7 @@ ISISRAW::ISISRAW(ISISCRPT_STRUCT* crpt) : m_crpt(crpt),m_ntc1(0),m_nsp1(0), m_np
// create one bound to a CRPT
/// stuff
-ISISRAW::ISISRAW(ISISCRPT_STRUCT* crpt, bool doUpdateFromCRPT) : m_crpt(crpt),m_ntc1(0),m_nsp1(0), m_nper(0),
+ISISRAW::ISISRAW(ISISCRPT_STRUCT* crpt, bool doUpdateFromCRPT) : m_crpt(crpt),
frmt_ver_no(0),data_format(0),ver2(0),r_number(0),ver3(0),
i_det(0),i_mon(0),i_use(0),mdet(0),monp(0),spec(0),delt(0),len2(0),code(0),tthe(0),ut(0),
ver4(0),ver5(0),crat(0),modn(0),mpos(0),timr(0),udet(0),ver6(0),t_ntrg(0),t_nfpp(0),t_nper(0),
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRaw/isisraw.h b/Code/Mantid/Framework/DataHandling/src/LoadRaw/isisraw.h
index e4aa26d664b..0e79201de6d 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRaw/isisraw.h
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRaw/isisraw.h
@@ -275,11 +275,6 @@ class ISISRAW
{
private:
ISISCRPT_STRUCT* m_crpt; ///< CRPT from ICP
-// these are used for caching on updates
- int m_ntc1; ///< dunno
- int m_nsp1; ///< dunno
- int m_nper; ///< dunno
-
item_struct<char> m_char_items; ///< dunno
item_struct<float> m_real_items; ///< dunno
item_struct<int> m_int_items; ///< dunno
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadRawBin0.cpp b/Code/Mantid/Framework/DataHandling/src/LoadRawBin0.cpp
index 5c5d402850c..e11343e639f 100644
--- a/Code/Mantid/Framework/DataHandling/src/LoadRawBin0.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/LoadRawBin0.cpp
@@ -33,7 +33,7 @@ using namespace API;
/// Constructor
LoadRawBin0::LoadRawBin0() :
m_filename(), m_numberOfSpectra(0),
- m_specTimeRegimes(), m_prog(0.0), m_bmspeclist(false)
+ m_specTimeRegimes(), m_prog(0.0)
{
}
diff --git a/Code/Mantid/Framework/DataHandling/src/SaveAscii.cpp b/Code/Mantid/Framework/DataHandling/src/SaveAscii.cpp
index de426569fb8..3cf119beff6 100644
--- a/Code/Mantid/Framework/DataHandling/src/SaveAscii.cpp
+++ b/Code/Mantid/Framework/DataHandling/src/SaveAscii.cpp
@@ -145,11 +145,15 @@ namespace Mantid
// Add spectra list into the index list
if (!spec_list.empty())
+ {
for(size_t i=0;i<spec_list.size();i++)
- if (spec_list[i] >= nSpectra) throw std::invalid_argument("Inconsistent spectra list");
+ {
+ if (spec_list[i] >= nSpectra)
+ throw std::invalid_argument("Inconsistent spectra list");
else
- idx.insert(spec_list[i]);
-
+ idx.insert(spec_list[i]);
+ }
+ }
if (!idx.empty()) nSpectra = static_cast<int>(idx.size());
if (nBins == 0 || nSpectra == 0) throw std::runtime_error("Trying to save an empty workspace");
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryRenderer.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryRenderer.h
index 3368ad8bce0..ad95560ce72 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryRenderer.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/GluGeometryRenderer.h
@@ -42,8 +42,6 @@ namespace Mantid
*/
class MANTID_GEOMETRY_DLL GluGeometryRenderer
{
- private:
- int mErrorCode; ///< The lastest error code
public:
GluGeometryRenderer(); ///< Constructor
~GluGeometryRenderer(); ///< Destructor
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
index 839d24e223e..252aafd4382 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/OCGeometryGenerator.h
@@ -57,7 +57,6 @@ namespace Mantid
private:
const Object *Obj; ///< Input Object
TopoDS_Shape* ObjSurface; ///< Storage for the output surface
- int iGridSize; ///< Grid size for sampling the object
///Analyze the object
void AnalyzeObject();
///Analyze a geometry rule for n object rule
diff --git a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
index d4ee748b33a..514f6b5f665 100644
--- a/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
+++ b/Code/Mantid/Framework/Geometry/inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
@@ -50,7 +50,6 @@ namespace Mantid
private:
Poco::XML::Document* mDoc; ///< The XML document
- Poco::XML::Element* mRoot; ///< The root XML element
Poco::XML::DOMParser* pParser; ///< The XML parser
std::string mFileName; ///< The file name
//Private Methods
diff --git a/Code/Mantid/Framework/Geometry/src/Crystal/NiggliCell.cpp b/Code/Mantid/Framework/Geometry/src/Crystal/NiggliCell.cpp
index c8177515abe..070c687c25d 100644
--- a/Code/Mantid/Framework/Geometry/src/Crystal/NiggliCell.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Crystal/NiggliCell.cpp
@@ -16,8 +16,6 @@ namespace Geometry
using Mantid::Kernel::Matrix;
namespace {
- const double TWO_PI = 2.*M_PI;
- const double DEG_TO_RAD = M_PI / 180.;
const double RAD_TO_DEG = 180. / M_PI;
}
/**
diff --git a/Code/Mantid/Framework/Geometry/src/Surfaces/General.cpp b/Code/Mantid/Framework/Geometry/src/Surfaces/General.cpp
index efa04f7d809..96135b82fb7 100644
--- a/Code/Mantid/Framework/Geometry/src/Surfaces/General.cpp
+++ b/Code/Mantid/Framework/Geometry/src/Surfaces/General.cpp
@@ -8,8 +8,6 @@ namespace Mantid
namespace Geometry
{
-const double GTolerance(1e-6); ///< Tolerance
-
General::General() : Quadratic()
/**
Standard Constructor
diff --git a/Code/Mantid/Framework/Kernel/src/Math/Optimization/SLSQPMinimizer.cpp b/Code/Mantid/Framework/Kernel/src/Math/Optimization/SLSQPMinimizer.cpp
index f7f4042c646..4d88be05b6c 100644
--- a/Code/Mantid/Framework/Kernel/src/Math/Optimization/SLSQPMinimizer.cpp
+++ b/Code/Mantid/Framework/Kernel/src/Math/Optimization/SLSQPMinimizer.cpp
@@ -2717,67 +2717,6 @@ namespace
return ret_val;
} /* ddot_sl__ */
- double dnrm1_(int *, double *x, int *i__, int *j)
- {
- /* Initialized data */
-
- static double zero = 0.;
- static double one = 1.;
-
- /* System generated locals */
- int i__1;
- double ret_val, d__1, d__2, d__3;
-
- /* Local variables */
- static int k;
- static double sum, temp, scale, snormx;
-
- /* Parameter adjustments */
- --x;
-
- /* Function Body */
- /* DNRM1 - COMPUTES THE I-NORM OF A VECTOR */
- /* BETWEEN THE ITH AND THE JTH ELEMENTS */
- /* INPUT - */
- /* N LENGTH OF VECTOR */
- /* X VECTOR OF LENGTH N */
- /* I INITIAL ELEMENT OF VECTOR TO BE USED */
- /* J FINAL ELEMENT TO USE */
- /* OUTPUT - */
- /* DNRM1 NORM */
- snormx = zero;
- i__1 = *j;
- for (k = *i__; k <= i__1; ++k) {
- /* L10: */
- /* Computing MAX */
- d__2 = snormx, d__3 = (d__1 = x[k], std::abs(d__1));
- snormx = std::max(d__2,d__3);
- }
- ret_val = snormx;
- if (snormx == zero) {
- return ret_val;
- }
- scale = snormx;
- if (snormx >= one) {
- scale = sqrt(snormx);
- }
- sum = zero;
- i__1 = *j;
- for (k = *i__; k <= i__1; ++k) {
- temp = zero;
- if ((d__1 = x[k], std::abs(d__1)) + scale != scale) {
- temp = x[k] / snormx;
- }
- if (one + temp != one) {
- sum += temp * temp;
- }
- /* L20: */
- }
- sum = sqrt(sum);
- ret_val = snormx * sum;
- return ret_val;
- } /* dnrm1_ */
-
double dnrm2___(int *n, double *dx, int *incx)
{
/* Initialized data */
diff --git a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
index 355b450bccb..3239ead28d9 100644
--- a/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
+++ b/Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
@@ -1388,8 +1388,8 @@ namespace Mantid
else
{
// 3. Regular
- DateAndTime startT = m_values[n].time();
- DateAndTime endT = m_values[n+1].time();
+ DateAndTime startT = m_values[static_cast<std::size_t>(n)].time();
+ DateAndTime endT = m_values[static_cast<std::size_t>(n)+1].time();
TimeInterval dt(startT, endT);
deltaT = dt;
}
@@ -1408,8 +1408,8 @@ namespace Mantid
else if (static_cast<size_t>(n) == m_filterQuickRef.back().second+1)
{
// 2. n = size of the allowed region, duplicate the last one
- size_t ind_t1 = m_filterQuickRef.back().first;
- size_t ind_t2 = ind_t1-1;
+ long ind_t1 = static_cast<long>(m_filterQuickRef.back().first);
+ long ind_t2 = ind_t1-1;
Kernel::DateAndTime t1 = (m_values.begin()+ind_t1)->time();
Kernel::DateAndTime t2 = (m_values.begin()+ind_t2)->time();
time_duration d = t1-t2;
@@ -1505,12 +1505,12 @@ namespace Mantid
// 3. Situation 1: No filter
if (static_cast<size_t>(n) < m_values.size())
{
- TimeValueUnit<TYPE> entry = m_values[n];
+ TimeValueUnit<TYPE> entry = m_values[static_cast<std::size_t>(n)];
value = entry.value();
}
else
{
- TimeValueUnit<TYPE> entry = m_values[m_size-1];
+ TimeValueUnit<TYPE> entry = m_values[static_cast<std::size_t>(m_size)-1];
value = entry.value();
}
}
@@ -1536,7 +1536,7 @@ namespace Mantid
{
throw std::logic_error("Not consider out of boundary case here. ");
}
- size_t ilog = m_filterQuickRef[refindex+1].first + (n-m_filterQuickRef[refindex].second);
+ size_t ilog = m_filterQuickRef[refindex+1].first + (static_cast<std::size_t>(n)-m_filterQuickRef[refindex].second);
value = m_values[ilog].value();
} // END-IF-ELSE Cases
}
@@ -1564,7 +1564,7 @@ namespace Mantid
if (n < 0 || n >= static_cast<int>(m_values.size()))
n = static_cast<int>(m_values.size())-1;
- return m_values[n].time();
+ return m_values[static_cast<size_t>(n)].time();
}
/* Divide the property into allowed and disallowed time intervals according to \a filter.
@@ -2015,7 +2015,7 @@ namespace Mantid
{
numintervals = m_filterQuickRef.back().second;
}
- if (m_filter[ift].first < m_values[icurlog].time())
+ if (m_filter[ift].first < m_values[static_cast<std::size_t>(icurlog)].time())
{
if (icurlog == 0)
{
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/MullerAnsatz.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/MullerAnsatz.cpp
index a38fa676570..b74d18fb5ab 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/MullerAnsatz.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/MullerAnsatz.cpp
@@ -33,18 +33,18 @@ namespace Mantid
/// Parameter names, same order as above
- static char * PAR_NAMES[NPARAMS];
+ static const char * PAR_NAMES[NPARAMS];
/// N attrs
enum {NATTS = 3};
/// Attribute names
- static char * ATTR_NAMES[NATTS];
+ static const char * ATTR_NAMES[NATTS];
};
MullerAnsatz::MullerAnsatz():
m_ChainDirection(Along_c),m_FFDirection(Isotropic)
{}
- char* AnsatzParameters::PAR_NAMES[AnsatzParameters::NPARAMS] = {"Amplitude","J_coupling"};
- char* AnsatzParameters::ATTR_NAMES[AnsatzParameters::NATTS] = {"IonName","ChainDirection","MagneticFFDirection"};
+ const char* AnsatzParameters::PAR_NAMES[AnsatzParameters::NPARAMS] = {"Amplitude","J_coupling"};
+ const char* AnsatzParameters::ATTR_NAMES[AnsatzParameters::NATTS] = {"IonName","ChainDirection","MagneticFFDirection"};
//static
/**
* Initialize the model
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/Strontium122.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/Strontium122.cpp
index d6d60125dca..f9607196894 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/Strontium122.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/Quantification/Models/Strontium122.cpp
@@ -25,9 +25,6 @@ namespace Mantid
const unsigned int NATTS = 2;
/// Attribute names
const char * ATTR_NAMES[NATTS] = { "MultEps", "TwinType" };
-
- /// 2 \pi
- const double TWO_PI = 2.*M_PI;
}
Strontium122::Strontium122():
m_twinType(1),m_multEps(true)
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDHistoWorkspace.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDHistoWorkspace.h
index 201e6b4a5bd..c6644e177d3 100644
--- a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDHistoWorkspace.h
+++ b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDHistoWorkspace.h
@@ -443,8 +443,6 @@ namespace MDEvents
coord_t * m_origin;
/// the number of events, contributed into the workspace;
mutable uint64_t m_nEventsContributed;
- /// The special coordinate system of the workspace.
- Mantid::API::SpecialCoordinateSystem m_coordinateSystem;
protected:
/// Linear array of masks for each bin
diff --git a/Code/Mantid/Framework/Nexus/src/NexusClasses.cpp b/Code/Mantid/Framework/Nexus/src/NexusClasses.cpp
index 03d067c3684..636b5bd2880 100644
--- a/Code/Mantid/Framework/Nexus/src/NexusClasses.cpp
+++ b/Code/Mantid/Framework/Nexus/src/NexusClasses.cpp
@@ -169,7 +169,7 @@ void NXClass::readAllInfo()
{
clear();
NXClassInfo info;
- while(info = getNextEntry())
+ while((info = getNextEntry()))
{
if (info.nxclass == "SDS")
{
--
GitLab