From 939401a7c7306c9e11dc5cb2785f4956c9658305 Mon Sep 17 00:00:00 2001 From: Vickie Lynch <lynchve@ornl.gov> Date: Mon, 26 Oct 2015 11:13:10 -0400 Subject: [PATCH] Refs #14072 apply clang-format patch --- .../Crystal/src/OptimizeLatticeForCellType.cpp | 14 ++++++-------- .../Crystal/test/OptimizeLatticeForCellTypeTest.h | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Framework/Crystal/src/OptimizeLatticeForCellType.cpp b/Framework/Crystal/src/OptimizeLatticeForCellType.cpp index bacb41f1149..4d942ca27b9 100644 --- a/Framework/Crystal/src/OptimizeLatticeForCellType.cpp +++ b/Framework/Crystal/src/OptimizeLatticeForCellType.cpp @@ -92,7 +92,7 @@ void OptimizeLatticeForCellType::exec() { runWS.push_back(ws); if (perRun) { - std::vector<std::pair<std::string, bool> > criteria; + std::vector<std::pair<std::string, bool>> criteria; // Sort by run number criteria.push_back(std::pair<std::string, bool>("runnumber", true)); ws->sort(criteria); @@ -129,8 +129,7 @@ void OptimizeLatticeForCellType::exec() { IAlgorithm_sptr fit_alg; try { fit_alg = createChildAlgorithm("Fit", -1, -1, false); - } - catch (Exception::NotFoundError &) { + } catch (Exception::NotFoundError &) { g_log.error("Can't locate Fit algorithm"); throw; } @@ -153,8 +152,7 @@ void OptimizeLatticeForCellType::exec() { try { ub_alg = createChildAlgorithm("FindUBUsingLatticeParameters", -1, -1, false); - } - catch (Exception::NotFoundError &) { + } catch (Exception::NotFoundError &) { g_log.error("Can't locate FindUBUsingLatticeParameters algorithm"); throw; } @@ -204,9 +202,9 @@ void OptimizeLatticeForCellType::exec() { runWS[i_run]->getName() + ".integrate"); savePks_alg->executeAsChildAlg(); - g_log.notice() << "See output file: " << outputdir + "ls" + - runWS[i_run]->getName() + - ".integrate" + g_log.notice() << "See output file: " + << outputdir + "ls" + runWS[i_run]->getName() + + ".integrate" << "\n"; // Save UB Mantid::API::IAlgorithm_sptr saveUB_alg = diff --git a/Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h b/Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h index 50f78c4a121..7a324d54a23 100644 --- a/Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h +++ b/Framework/Crystal/test/OptimizeLatticeForCellTypeTest.h @@ -68,8 +68,8 @@ public: // Check that the UB matrix is the same as in TOPAZ_3007.mat OrientedLattice latt = ws->mutableSample().getOrientedLattice(); - double correct_UB[] = { 0.0454, 0.0406, 0.0122, -0.0014, -0.0031, - -0.1165, -0.0574, 0.0322, -0.0273 }; + double correct_UB[] = {0.0454, 0.0406, 0.0122, -0.0014, -0.0031, + -0.1165, -0.0574, 0.0322, -0.0273}; std::vector<double> UB_calculated = latt.getUB().getVector(); -- GitLab