From b990e57605ff3d002a6944b05d5feb10c5483e12 Mon Sep 17 00:00:00 2001
From: Alex Buts <Alex.Buts@stfc.ac.uk>
Date: Tue, 13 Oct 2015 12:29:00 +0100
Subject: [PATCH] Re #13566 Pedantic GCC warning and typo in doctest
---
Framework/Algorithms/src/GetAllEi.cpp | 14 +++++++-------
docs/source/algorithms/GetAllEi-v1.rst | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Framework/Algorithms/src/GetAllEi.cpp b/Framework/Algorithms/src/GetAllEi.cpp
index e496d397d81..2e39f905546 100644
--- a/Framework/Algorithms/src/GetAllEi.cpp
+++ b/Framework/Algorithms/src/GetAllEi.cpp
@@ -147,7 +147,7 @@ void removeInvalidValues(const std::vector<bool> &guessValid,
}
}
new_guess.swap(guess);
-};
+}
/**Internal class to contain peak information */
struct peakKeeper {
double position;
@@ -569,7 +569,7 @@ bool GetAllEi::peakGuess(const API::MatrixWorkspace_sptr &inputWS, size_t index,
peakPos = realPeakPos;
return true;
-};
+}
/**Get energy of monitor peak if one is present
*@param inputWS -- the workspace to process
@@ -653,7 +653,7 @@ bool signChanged(double val, int &prevSign) {
bool changed = curSign != prevSign;
prevSign = curSign;
return changed;
-};
+}
}
/**Bare-bone function to calculate numerical derivative, and estimate number of
@@ -728,7 +728,7 @@ void getBinRange(const MantidVec &eBins, double eMin, double eMax,
if (index_max >= nBins)
index_max = nBins - 1; // last bin range anyway. Should not happen
}
-};
+}
// refine bin range. May need better procedure for this.
bool refineEGuess(const MantidVec &eBins, const MantidVec &signal,
@@ -749,7 +749,7 @@ bool refineEGuess(const MantidVec &eBins, const MantidVec &signal,
}
eGuess = 0.5 * (eBins[ind_Emax] + eBins[ind_Emax + 1]);
return true;
-};
+}
struct peakKeeper2 {
double left_rng;
@@ -1035,7 +1035,7 @@ bool SelectInterval(const Kernel::DateAndTime &t_beg,
}
endTime = t_end;
return false;
-};
+}
}
/**Analyze chopper logs and identify chopper speed and delay
@param inputWS -- sp to workspace with attached logs.
@@ -1184,7 +1184,7 @@ bool check_time_series_property(
return true;
}
return false;
-};
+}
}
/**Validates if input workspace contains all necessary logs and if all
diff --git a/docs/source/algorithms/GetAllEi-v1.rst b/docs/source/algorithms/GetAllEi-v1.rst
index b3d99c3e180..c0e46da75eb 100644
--- a/docs/source/algorithms/GetAllEi-v1.rst
+++ b/docs/source/algorithms/GetAllEi-v1.rst
@@ -79,7 +79,7 @@ to convert units from TOF to energy.
print "! {0: >6.1f} ! {1: >6.2f} ! {2: >6.2f} ! {3: >6.2f} !".format(allEi[ind],val[1],peakHeight[ind],peakWidth[ind])
#
# NOTE: incident energy of GetEi is calculated from distance between monitor 1 and 2, and this distance is not correct in
- # the test workspace. The important pint is that getEi can find energies from guess values and TOF for peaks is correct.
+ # the test workspace. The tested point is that getEi can find energies from guess values and TOF for peaks is correct.
Output:
@@ -88,7 +88,7 @@ Output:
! Guess Ei ! peak TOF ! peak height ! peak width !
! 67.0 ! 4188.03 ! 34.68 ! 2.35 !
- ! 124.0 ! 3079.09 ! 14.01 ! 4.35 !
+ ! 124.1 ! 3079.09 ! 14.01 ! 4.35 !
.. categories::
--
GitLab