From 2c6d62762e1fdc3c1c2341edb395170387be399a Mon Sep 17 00:00:00 2001 From: Andrei Savici <saviciat@ornl.gov> Date: Wed, 22 Aug 2018 11:51:27 -0400 Subject: [PATCH] Clang format --- .../MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h | 2 +- Framework/MDAlgorithms/src/MDNormSCD.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h index 919c64e2f0c..e488b30f7f5 100644 --- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h +++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h @@ -56,7 +56,7 @@ private: void createNormalizationWS(const DataObjects::MDHistoWorkspace &dataWS); std::vector<coord_t> getValuesFromOtherDimensions(bool &skipNormalization, - uint16_t expInfoIndex=0) const; + uint16_t expInfoIndex = 0) const; Kernel::Matrix<coord_t> findIntergratedDimensions(const std::vector<coord_t> &otherDimValues, bool &skipNormalization); diff --git a/Framework/MDAlgorithms/src/MDNormSCD.cpp b/Framework/MDAlgorithms/src/MDNormSCD.cpp index b67426128ea..151cd171ac8 100644 --- a/Framework/MDAlgorithms/src/MDNormSCD.cpp +++ b/Framework/MDAlgorithms/src/MDNormSCD.cpp @@ -161,7 +161,7 @@ void MDNormSCD::exec() { calculateNormalization(otherValues, affineTrans, expInfoIndex); } else { g_log.warning("Binning limits are outside the limits of the MDWorkspace. " - "Not applying normalization."); + "Not applying normalization."); } m_accumulate = true; } @@ -413,8 +413,8 @@ void MDNormSCD::calculateNormalization( const auto ¤tExptInfo = *(m_inputWS->getExperimentInfo(expInfoIndex)); using VectorDoubleProperty = Kernel::PropertyWithValue<std::vector<double>>; - auto *rubwLog = - dynamic_cast<VectorDoubleProperty *>(currentExptInfo.getLog("RUBW_MATRIX")); + auto *rubwLog = dynamic_cast<VectorDoubleProperty *>( + currentExptInfo.getLog("RUBW_MATRIX")); if (!rubwLog) { throw std::runtime_error( "Wokspace does not contain a log entry for the RUBW matrix." @@ -442,8 +442,9 @@ void MDNormSCD::calculateNormalization( std::vector<double> xValues, yValues; std::vector<coord_t> pos, posNew; double progStep = 0.7 / m_numExptInfos; - auto prog = make_unique<API::Progress>(this, 0.3 + progStep * expInfoIndex, - 0.3 + progStep * (expInfoIndex + 1.), ndets); + auto prog = + make_unique<API::Progress>(this, 0.3 + progStep * expInfoIndex, + 0.3 + progStep * (expInfoIndex + 1.), ndets); // cppcheck-suppress syntaxError PRAGMA_OMP(parallel for private(intersections, xValues, yValues, pos, posNew) if (Kernel::threadSafe(*integrFlux))) for (int64_t i = 0; i < ndets; i++) { -- GitLab