From 4df4fb489e1e37a0677ec95d139cd77a3c6ad147 Mon Sep 17 00:00:00 2001 From: Alex Buts <Alex.Buts@stfc.ac.uk> Date: Wed, 7 Oct 2015 14:14:50 +0100 Subject: [PATCH] Re #13566 Clang formatting applied --- .../Algorithms/inc/MantidAlgorithms/GetAllEi.h | 8 ++++---- Framework/Algorithms/src/GetAllEi.cpp | 14 +++++++------- Framework/Kernel/src/VectorHelper.cpp | 3 ++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h b/Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h index 0ea50efe50c..756521e92ac 100644 --- a/Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h +++ b/Framework/Algorithms/inc/MantidAlgorithms/GetAllEi.h @@ -64,9 +64,9 @@ private: protected: // for testing, private otherwise. // prepare working workspace with appropriate monitor spectra for fitting API::MatrixWorkspace_sptr - // prepare matrix workspace to analyze monitor signal - buildWorkspaceToFit(const API::MatrixWorkspace_sptr &inputWS, - size_t &wsIndex0); + // prepare matrix workspace to analyze monitor signal + buildWorkspaceToFit(const API::MatrixWorkspace_sptr &inputWS, + size_t &wsIndex0); /**Return average time series log value for the appropriately filtered log*/ double getAvrgLogValue(const API::MatrixWorkspace_sptr &inputWS, @@ -111,7 +111,7 @@ protected: // for testing, private otherwise. // internal pointer to access to chopper boost::shared_ptr<const Geometry::IComponent> m_chopper; // internal pointer to access log, used for filtering - Kernel::TimeSeriesProperty<double> * m_pFilterLog; + Kernel::TimeSeriesProperty<double> *m_pFilterLog; }; } // namespace Algorithms diff --git a/Framework/Algorithms/src/GetAllEi.cpp b/Framework/Algorithms/src/GetAllEi.cpp index 9f6642681ea..d4c8aada907 100644 --- a/Framework/Algorithms/src/GetAllEi.cpp +++ b/Framework/Algorithms/src/GetAllEi.cpp @@ -26,7 +26,7 @@ GetAllEi::GetAllEi() m_min_Eresolution(0.08), // half maximal resolution for LET m_max_Eresolution(0.5e-3), m_peakEnergyRatio2reject(0.1), m_phase(0), - m_chopper(),m_pFilterLog(nullptr) {} + m_chopper(), m_pFilterLog(nullptr) {} /// Initialization method. void GetAllEi::init() { @@ -213,9 +213,9 @@ void GetAllEi::exec() { } catch (std::runtime_error &) { g_log.warning() << " Can not retrieve (double) filtering log: " + filerLogName + " from current workspace\n" - " Using total experiment range to " - "find logs averages for chopper " - "parameters\n"; + " Using total experiment range to " + "find logs averages for chopper " + "parameters\n"; m_FilterWithDerivative = false; } @@ -435,8 +435,8 @@ bool GetAllEi::findMonitorPeak(const API::MatrixWorkspace_sptr &inputWS, if (std::fabs(double(ind_max - ind_min)) < 5) return false; - //double xMin = X[ind_min]; - //double xMax = X[ind_max]; + // double xMin = X[ind_min]; + // double xMax = X[ind_max]; for (size_t i = ind_min; i < ind_max; i++) { double dX = X[i + 1] - X[i]; @@ -454,7 +454,7 @@ bool GetAllEi::findMonitorPeak(const API::MatrixWorkspace_sptr &inputWS, if (sMax * dXmax <= 2) return false; // - //size_t SearchAreaSize = ind_max - ind_min; + // size_t SearchAreaSize = ind_max - ind_min; double SmoothRange = 2 * maxSigma; diff --git a/Framework/Kernel/src/VectorHelper.cpp b/Framework/Kernel/src/VectorHelper.cpp index acd3ef4a7bc..bbf43e014df 100644 --- a/Framework/Kernel/src/VectorHelper.cpp +++ b/Framework/Kernel/src/VectorHelper.cpp @@ -592,7 +592,8 @@ void smoothInRange(const std::vector<double> &input, double halfWidth = avrgInterval / 2; if (!binBndrs) { - if (std::fabs(double(static_cast<size_t>(halfWidth)) * 2 - avrgInterval) > 1.e-6) { + if (std::fabs(double(static_cast<size_t>(halfWidth)) * 2 - avrgInterval) > + 1.e-6) { halfWidth = static_cast<double>(static_cast<size_t>(halfWidth) + 1); } } -- GitLab