From 909f1a01291e01c3706f8c070dde70d00d24ad5d Mon Sep 17 00:00:00 2001
From: Sam Jenkins <s.jenkins@stfc.ac.uk>
Date: Mon, 13 May 2019 11:46:18 +0100
Subject: [PATCH] Re 25439 fixed doxygen warnings
---
.../SystemTests/tests/analysis/ISIS_PowderPolarisTest.py | 8 ++++----
.../EnggDiffraction/EnggDiffractionPresenter.cpp | 6 +++++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
index 1481a7fff3c..d35f939a503 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
@@ -64,8 +64,8 @@ class CreateVanadiumTest(systemtesting.MantidSystemTest):
splined_ws, unsplined_ws = self.calibration_results
for ws in splined_ws+unsplined_ws:
self.assertEqual(ws.sample().getMaterial().name(), 'V')
- return (unsplined_ws.getName(), "ISIS_Powder-POLARIS00098533_unsplined.nxs",
- splined_ws.getName(), "ISIS_Powder-POLARIS00098533_splined.nxs")
+ return (unsplined_ws.name(), "ISIS_Powder-POLARIS00098533_unsplined.nxs",
+ splined_ws.name(), "ISIS_Powder-POLARIS00098533_splined.nxs")
def cleanup(self):
try:
@@ -93,7 +93,7 @@ class FocusTest(systemtesting.MantidSystemTest):
for ws in self.focus_results:
self.assertEqual(ws.sample().getMaterial().name(), 'Si')
self.tolerance = 1e-7
- return self.focus_results.getName(), "ISIS_Powder-POLARIS98533_FocusSempty.nxs"
+ return self.focus_results.name(), "ISIS_Powder-POLARIS98533_FocusSempty.nxs"
def cleanup(self):
try:
@@ -124,7 +124,7 @@ class FocusTestChopperMode(systemtesting.MantidSystemTest):
# this needs to be put in due to rounding errors between OS' for the proton_charge_by_period log
self.disableChecking.append('Sample')
self.tolerance = 1e-7
- return self.focus_results.getName(), "ISIS_Powder-POLARIS98533_Auto_chopper.nxs"
+ return self.focus_results.name(), "ISIS_Powder-POLARIS98533_Auto_chopper.nxs"
def cleanup(self):
try:
diff --git a/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionPresenter.cpp b/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionPresenter.cpp
index 3bfdcadd9c7..9154b6a909c 100644
--- a/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionPresenter.cpp
+++ b/qt/scientific_interfaces/EnggDiffraction/EnggDiffractionPresenter.cpp
@@ -231,6 +231,8 @@ void EnggDiffractionPresenter::updateNewCalib(const std::string &fname) {
* process.
*
* @param fname name of the calibration/GSAS iparm file
+ * @param vanNo output param to hold the vanadium run
+ * @param ceriaNo output param to hold the ceria run
*/
void EnggDiffractionPresenter::grabCalibParms(const std::string &fname,
std::string &vanNo,
@@ -1663,7 +1665,9 @@ void EnggDiffractionPresenter::focusingFinished() {
* @param cs user settings for calibration (this does not calibrate but
* uses calibration input files such as vanadium runs
*
- * @param runLabel run number and bank ID of the run to focus
+ * @param runLabel run number of the run to focus
+ *
+ * @param bank the Bank ID to focus
*
* @param specNos string specifying a list of spectra (for "cropped"
* focusing or "texture" focusing), only considered if not empty
--
GitLab