Merge pull request #38397 from mantidproject/unread_variable_cppcheck

Some unusedVariiable cppckeck error removals.

Author: SilkeSchomann

Framework/API/src/NumericAxis.cpp

@@ -163,7 +163,7 @@ std::string NumericAxis::formatLabel(const double value) const {
     if (*it == '0') {
       it = numberLabel.erase(it);
     } else if (*it == '.') {
-      it = numberLabel.erase(it);
+      numberLabel.erase(it);
       break;
     } else {
       break;

Framework/Algorithms/src/CalculateCarpenterSampleCorrection.cpp

@@ -159,8 +159,6 @@ void CalculateCarpenterSampleCorrection::exec() {
   // Initialize progress reporting.
   Progress prog(this, 0.0, 1.0, NUM_HIST);
 
-  EventWorkspace_sptr inputWkspEvent = std::dynamic_pointer_cast<EventWorkspace>(inputWksp);
-
   // Create the new correction workspaces
   MatrixWorkspace_sptr absWksp = createOutputWorkspace(inputWksp, "Attenuation factor");
   MatrixWorkspace_sptr msWksp = createOutputWorkspace(inputWksp, "Multiple scattering factor");

Framework/Algorithms/src/GroupWorkspaces.cpp

@@ -58,7 +58,6 @@ std::map<std::string, std::string> GroupWorkspaces::validateInputs() {
   std::map<std::string, std::string> results;
   const std::vector<std::string> inputWorkspaces = getProperty("InputWorkspaces");
   std::string globExpression = getProperty("GlobExpression");
-  std::string outputWorkspace = getProperty("OutputWorkspace");
 
   for (auto it = globExpression.begin(); it < globExpression.end(); ++it) {
     if (*it == '\\') {

Framework/Algorithms/src/InterpolatingRebin.cpp

@@ -66,7 +66,7 @@ std::map<std::string, std::string> InterpolatingRebin::validateInputs() {
   MatrixWorkspace_sptr inputWS = getProperty("InputWorkspace");
   std::vector<double> rbParams = getProperty("Params");
   try {
-    std::vector<double> validParams = Rebin::rebinParamsFromInput(rbParams, *inputWS, g_log);
+    Rebin::rebinParamsFromInput(rbParams, *inputWS, g_log);
   } catch (std::exception &err) {
     helpMessages["Params"] = err.what();
   }

Framework/Algorithms/src/SmoothNeighbours.cpp

@@ -314,7 +314,6 @@ void SmoothNeighbours::findNeighboursUbiquitous() {
   m_progress->resetNumSteps(m_inWS->getNumberHistograms(), 0.2, 0.5);
   this->progress(0.2, "Building Neighbour Map");
 
-  Instrument_const_sptr inst = m_inWS->getInstrument();
   const spec2index_map spec2index = m_inWS->getSpectrumToWorkspaceIndexMap();
 
   // Resize the vector we are setting
@@ -379,7 +378,7 @@ void SmoothNeighbours::findNeighboursUbiquitous() {
     std::vector<weightedNeighbour> neighbours;
 
     // Convert from spectrum numbers to workspace indices
-    for (auto &specDistance : neighbSpectra) {
+    for (const auto &specDistance : neighbSpectra) {
       specnum_t spec = specDistance.first;
 
       // Use the weighting strategy to calculate the weight.

Framework/Algorithms/src/Stitch.cpp

@@ -26,7 +26,6 @@ using namespace Mantid::Kernel;
 namespace {
 static const std::string INPUT_WORKSPACE_PROPERTY = "InputWorkspaces";
 static const std::string REFERENCE_WORKSPACE_PROPERTY = "ReferenceWorkspace";
-static const std::string COMBINATION_BEHAVIOUR_PROPERTY = "CombinationBehaviour";
 static const std::string SCALE_FACTOR_CALCULATION_PROPERTY = "ScaleFactorCalculation";
 static const std::string MANUAL_SCALE_FACTORS_PROPERTY = "ManualScaleFactors";
 static const std::string TIE_SCALE_FACTORS_PROPERTY = "TieScaleFactors";
@@ -241,8 +240,6 @@ void Stitch::init() {
                   "that is, the one that will not be scaled. If left blank, "
                   "stitching will be performed left to right in the order of x-axes ascending, "
                   "no matter the order of workspaces names in the input.");
-  declareProperty(COMBINATION_BEHAVIOUR_PROPERTY, "Interleave",
-                  std::make_unique<ListValidator<std::string>>(std::array<std::string, 1>{"Interleave"}));
   declareProperty(SCALE_FACTOR_CALCULATION_PROPERTY, "MedianOfRatios",
                   std::make_unique<ListValidator<std::string>>(std::array<std::string, 2>{"MedianOfRatios", "Manual"}));
   declareProperty(std::make_unique<ArrayProperty<double>>(MANUAL_SCALE_FACTORS_PROPERTY),
@@ -264,7 +261,6 @@ void Stitch::init() {
  */
 void Stitch::exec() {
   const auto referenceName = getPropertyValue(REFERENCE_WORKSPACE_PROPERTY);
-  const auto combinationBehaviour = getPropertyValue(COMBINATION_BEHAVIOUR_PROPERTY);
   const auto scaleFactorCalculation = getPropertyValue(SCALE_FACTOR_CALCULATION_PROPERTY);
   const auto inputs = RunCombinationHelper::unWrapGroups(getProperty(INPUT_WORKSPACE_PROPERTY));
   MatrixWorkspace_sptr scaleFactorsWorkspace;

Framework/Algorithms/src/WeightedMeanOfWorkspace.cpp

@@ -60,10 +60,9 @@ void WeightedMeanOfWorkspace::exec() {
         continue;
     auto &y = inputWS->y(i);
     auto &e = inputWS->e(i);
-    double weight = 0.0;
     for (std::size_t j = 0; j < y.size(); ++j) {
       if (std::isfinite(y[j]) && std::isfinite(e[j])) {
-        weight = 1.0 / (e[j] * e[j]);
+        double weight = 1.0 / (e[j] * e[j]);
         averageValue += (y[j] * weight);
         weightSum += weight;
       }

Framework/Crystal/src/GoniometerAnglesFromPhiRotation.cpp

@@ -303,7 +303,6 @@ void GoniometerAnglesFromPhiRotation::exec() {
   double deg, ax1, ax2, ax3;
   Q1.getAngleAxis(deg, ax1, ax2, ax3);
   if (dphi * deg < 0) {
-    deg = -deg;
     ax1 = -ax1;
     ax2 = -ax2;
     ax3 = -ax3;

Framework/DataHandling/src/LoadANSTOHelper.cpp

@@ -432,15 +432,13 @@ bool File::append(const std::string &path, const std::string &name, const void *
     else if (targetPosition != -1)
       throw std::runtime_error("format exception"); // it has to be the last file in the archive
 
-    FileInfo fileInfo;
-    fileInfo.Offset = position;
-    fileInfo.Size = header.readFileSize();
+    auto fileSize = header.readFileSize();
 
-    auto offset = static_cast<size_t>(fileInfo.Size % 512);
+    auto offset = static_cast<size_t>(fileSize % 512);
     if (offset != 0)
       offset = 512 - offset;
 
-    fileStatus &= 0 == fseek(handle.get(), static_cast<long>(fileInfo.Size + offset), SEEK_CUR);
+    fileStatus &= 0 == fseek(handle.get(), static_cast<long>(fileSize + offset), SEEK_CUR);
   }
 
   if (targetPosition < 0)

Framework/DataHandling/src/LoadTBL.cpp

@@ -160,7 +160,7 @@ void LoadTBL::csvParse(const std::string &line, std::vector<std::string> &cols,
           firstCell = false;
         } else {
           auto colVal = line.substr(lastComma + 1, pos - (lastComma + 1));
-          cols.emplace_back(line.substr(lastComma + 1, pos - (lastComma + 1)));
+          cols.emplace_back(colVal);
         }
       }
       lastComma = pos;