diff --git a/Framework/API/inc/MantidAPI/AnalysisDataService.h b/Framework/API/inc/MantidAPI/AnalysisDataService.h
index 8078f0a156c263c1d5b1d3886d12d12f91812757..83bd3fa9730bc654ae75381f32d6f58868156842 100644
--- a/Framework/API/inc/MantidAPI/AnalysisDataService.h
+++ b/Framework/API/inc/MantidAPI/AnalysisDataService.h
@@ -196,26 +196,26 @@ typedef const Poco::AutoPtr<Mantid::Kernel::DataService<
typedef Mantid::Kernel::DataService<Mantid::API::Workspace>::
BeforeReplaceNotification WorkspaceBeforeReplaceNotification;
typedef const Poco::AutoPtr<Mantid::Kernel::DataService<
- Mantid::API::Workspace>::BeforeReplaceNotification>
- &WorkspaceBeforeReplaceNotification_ptr;
+ Mantid::API::Workspace>::BeforeReplaceNotification> &
+ WorkspaceBeforeReplaceNotification_ptr;
typedef Mantid::Kernel::DataService<Mantid::API::Workspace>::
AfterReplaceNotification WorkspaceAfterReplaceNotification;
typedef const Poco::AutoPtr<Mantid::Kernel::DataService<
- Mantid::API::Workspace>::AfterReplaceNotification>
- &WorkspaceAfterReplaceNotification_ptr;
+ Mantid::API::Workspace>::AfterReplaceNotification> &
+ WorkspaceAfterReplaceNotification_ptr;
typedef Mantid::Kernel::DataService<Mantid::API::Workspace>::
PreDeleteNotification WorkspacePreDeleteNotification;
-typedef const Poco::AutoPtr<
- Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification>
- &WorkspacePreDeleteNotification_ptr;
+typedef const Poco::AutoPtr<Mantid::Kernel::DataService<
+ Mantid::API::Workspace>::PreDeleteNotification> &
+ WorkspacePreDeleteNotification_ptr;
typedef Mantid::Kernel::DataService<Mantid::API::Workspace>::
PostDeleteNotification WorkspacePostDeleteNotification;
-typedef const Poco::AutoPtr<
- Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification>
- &WorkspacePostDeleteNotification_ptr;
+typedef const Poco::AutoPtr<Mantid::Kernel::DataService<
+ Mantid::API::Workspace>::PostDeleteNotification> &
+ WorkspacePostDeleteNotification_ptr;
typedef Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification
ClearADSNotification;
@@ -225,25 +225,25 @@ typedef const Poco::AutoPtr<Mantid::Kernel::DataService<
typedef Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification
WorkspaceRenameNotification;
typedef const Poco::AutoPtr<
- Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification>
- &WorkspaceRenameNotification_ptr;
+ Mantid::Kernel::DataService<Mantid::API::Workspace>::RenameNotification> &
+ WorkspaceRenameNotification_ptr;
typedef AnalysisDataServiceImpl::GroupWorkspacesNotification
WorkspacesGroupedNotification;
typedef const Poco::AutoPtr<
- AnalysisDataServiceImpl::GroupWorkspacesNotification>
- &WorkspacesGroupedNotification_ptr;
+ AnalysisDataServiceImpl::GroupWorkspacesNotification> &
+ WorkspacesGroupedNotification_ptr;
typedef AnalysisDataServiceImpl::UnGroupingWorkspaceNotification
WorkspaceUnGroupingNotification;
typedef const Poco::AutoPtr<
- AnalysisDataServiceImpl::UnGroupingWorkspaceNotification>
- &WorkspaceUnGroupingNotification_ptr;
+ AnalysisDataServiceImpl::UnGroupingWorkspaceNotification> &
+ WorkspaceUnGroupingNotification_ptr;
typedef AnalysisDataServiceImpl::GroupUpdatedNotification
GroupUpdatedNotification;
-typedef const Poco::AutoPtr<AnalysisDataServiceImpl::GroupUpdatedNotification>
- &GroupUpdatedNotification_ptr;
+typedef const Poco::AutoPtr<AnalysisDataServiceImpl::GroupUpdatedNotification> &
+ GroupUpdatedNotification_ptr;
} // Namespace API
} // Namespace Mantid
diff --git a/Framework/API/inc/MantidAPI/ExperimentInfo.h b/Framework/API/inc/MantidAPI/ExperimentInfo.h
index e4051d9594d6285d988296fc84864a9e2b16ab49..5cfb38e09e50e2371030bc8df69b8823ac8a9844 100644
--- a/Framework/API/inc/MantidAPI/ExperimentInfo.h
+++ b/Framework/API/inc/MantidAPI/ExperimentInfo.h
@@ -115,8 +115,9 @@ public:
/// Easy access to the efixed value for this run & detector ID
virtual double getEFixed(const detid_t detID) const;
/// Easy access to the efixed value for this run & optional detector
- virtual double getEFixed(const Geometry::IDetector_const_sptr detector =
- Geometry::IDetector_const_sptr()) const;
+ virtual double
+ getEFixed(const Geometry::IDetector_const_sptr
+ detector = Geometry::IDetector_const_sptr()) const;
/// Set the efixed value for a given detector ID
virtual void setEFixed(const detid_t detID, const double value);
diff --git a/Framework/API/inc/MantidAPI/FunctionFactory.h b/Framework/API/inc/MantidAPI/FunctionFactory.h
index 2b02b7e0928e14cc21fa1897e32d18f87d407922..6d2d9c045858261580790a96da1c0a4058545542 100644
--- a/Framework/API/inc/MantidAPI/FunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/FunctionFactory.h
@@ -160,8 +160,8 @@ typedef MANTID_API_DLL Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>
typedef FunctionFactoryImpl::UpdateNotification
FunctionFactoryUpdateNotification;
/// Convenient typedef for an UpdateNotification AutoPtr
-typedef const Poco::AutoPtr<FunctionFactoryUpdateNotification>
- &FunctionFactoryUpdateNotification_ptr;
+typedef const Poco::AutoPtr<FunctionFactoryUpdateNotification> &
+ FunctionFactoryUpdateNotification_ptr;
} // namespace API
} // namespace Mantid
diff --git a/Framework/API/src/CompositeFunction.cpp b/Framework/API/src/CompositeFunction.cpp
index c1fb32fdd8cef85746312539cc5f1f0e9770e35f..59cbeea0695038395a01683e9baf37a5c3bc4115 100644
--- a/Framework/API/src/CompositeFunction.cpp
+++ b/Framework/API/src/CompositeFunction.cpp
@@ -669,8 +669,7 @@ void CompositeFunction::setUpForFit() {
ParameterTie *tie = getTie(i);
if (tie && !tie->isConstant()) {
g_log.warning() << "Numeric derivatives should be used when "
- "non-constant ties defined."
- << std::endl;
+ "non-constant ties defined." << std::endl;
break;
}
}
diff --git a/Framework/API/src/Expression.cpp b/Framework/API/src/Expression.cpp
index 7ce95dd4438cab51caa206485642803e8d37b2cd..ec8ba7247905b98852c8cd68caa01b1f7ad6f9ff 100644
--- a/Framework/API/src/Expression.cpp
+++ b/Framework/API/src/Expression.cpp
@@ -11,8 +11,8 @@ namespace API {
typedef Mantid::Kernel::StringTokenizer tokenizer;
-const std::string DEFAULT_OPS_STR[] = {
- ";", ",", "=", "== != > < <= >=", "&& || ^^", "+ -", "* /", "^"};
+const std::string DEFAULT_OPS_STR[] = {";", ",", "=", "== != > < <= >=",
+ "&& || ^^", "+ -", "* /", "^"};
Expression::Expression() {
diff --git a/Framework/API/src/MatrixWorkspace.cpp b/Framework/API/src/MatrixWorkspace.cpp
index d18bfe83780e1371966d54197aa9ac4e1181bf63..6a415d758d46e213c1b1b293ccafc49696652d19 100644
--- a/Framework/API/src/MatrixWorkspace.cpp
+++ b/Framework/API/src/MatrixWorkspace.cpp
@@ -524,8 +524,8 @@ std::vector<size_t> MatrixWorkspace::getDetectorIDToWorkspaceIndexVector(
int index = det + offset;
if (index < 0 || index >= outSize) {
g_log.debug() << "MatrixWorkspace::getDetectorIDToWorkspaceIndexVector("
- "): detector ID found ("
- << det << " at workspace index " << workspaceIndex
+ "): detector ID found (" << det
+ << " at workspace index " << workspaceIndex
<< ") is invalid." << std::endl;
} else
// Save it at that point.
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h b/Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h
index 2697530659c06f5f570cd7a7cbbb5af99833677a..9b219be72d3ba930509e660689ef61925388d7df 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/GeneratePeaks.h
@@ -71,8 +71,8 @@ private:
void processTableColumnNames();
void importPeaksFromTable(
- std::map<specnum_t, std::vector<std::pair<double, API::IFunction_sptr>>>
- &functionmap);
+ std::map<specnum_t, std::vector<std::pair<double, API::IFunction_sptr>>> &
+ functionmap);
/// Import peak and background function parameters from vector
void importPeakFromVector(
@@ -81,8 +81,8 @@ private:
/// Generate peaks in output data workspaces
void generatePeaks(
const std::map<specnum_t,
- std::vector<std::pair<double, API::IFunction_sptr>>>
- &functionmap,
+ std::vector<std::pair<double, API::IFunction_sptr>>> &
+ functionmap,
API::MatrixWorkspace_sptr dataWS);
/// Check whether function has a certain parameter
diff --git a/Framework/Algorithms/src/CreateSampleWorkspace.cpp b/Framework/Algorithms/src/CreateSampleWorkspace.cpp
index ed8dc147283399e5d4e3b480bab572991b7a9449..e5f29acc8c7c9e5fbfadfd25a3456010472a12ca 100644
--- a/Framework/Algorithms/src/CreateSampleWorkspace.cpp
+++ b/Framework/Algorithms/src/CreateSampleWorkspace.cpp
@@ -182,8 +182,7 @@ void CreateSampleWorkspace::exec() {
// down
binWidth = xMax - xMin;
g_log.warning() << "The bin width is so large that there is less than one "
- "bin - it has been changed to "
- << binWidth << std::endl;
+ "bin - it has been changed to " << binWidth << std::endl;
}
std::string functionString = "";
diff --git a/Framework/Algorithms/src/GeneratePeaks.cpp b/Framework/Algorithms/src/GeneratePeaks.cpp
index a8f086a3cd407f71f00af259389c3b5deef2ca3b..41e1505e39177cc5e9e8590b8108024372406c6e 100644
--- a/Framework/Algorithms/src/GeneratePeaks.cpp
+++ b/Framework/Algorithms/src/GeneratePeaks.cpp
@@ -244,8 +244,8 @@ void GeneratePeaks::processAlgProperties(std::string &peakfunctype,
* spectrum
*/
void GeneratePeaks::importPeaksFromTable(
- std::map<specnum_t, std::vector<std::pair<double, API::IFunction_sptr>>>
- &functionmap) {
+ std::map<specnum_t, std::vector<std::pair<double, API::IFunction_sptr>>> &
+ functionmap) {
size_t numpeaks = m_funcParamWS->rowCount();
size_t icolchi2 = m_funcParamWS->columnCount() - 1;
size_t numpeakparams = m_peakFunction->nParams();
@@ -433,8 +433,8 @@ void GeneratePeaks::importPeakFromVector(
*/
void GeneratePeaks::generatePeaks(
const std::map<specnum_t,
- std::vector<std::pair<double, API::IFunction_sptr>>>
- &functionmap,
+ std::vector<std::pair<double, API::IFunction_sptr>>> &
+ functionmap,
API::MatrixWorkspace_sptr dataWS) {
// Calcualte function
std::map<specnum_t,
diff --git a/Framework/Algorithms/src/GetAllEi.cpp b/Framework/Algorithms/src/GetAllEi.cpp
index 7400653343551f70fdb2551c06434faf776a1896..4609e6c59ffaa363617918d6320c13f375b762b6 100644
--- a/Framework/Algorithms/src/GetAllEi.cpp
+++ b/Framework/Algorithms/src/GetAllEi.cpp
@@ -661,8 +661,7 @@ bool GetAllEi::findMonitorPeak(const API::MatrixWorkspace_sptr &inputWS,
boost::lexical_cast<std::string>(peak1TwoSigma) +
"\n and Peak at mon2: Ei= " +
boost::lexical_cast<std::string>(peak2Pos) + "and height: " +
- boost::lexical_cast<std::string>(peak1Height)
- << std::endl;
+ boost::lexical_cast<std::string>(peak1Height) << std::endl;
return false;
}
diff --git a/Framework/Algorithms/src/GetEi.cpp b/Framework/Algorithms/src/GetEi.cpp
index 0bdbcf671e35eb0016e3ef3a1fe241172e87d387..aa7bd4e2fa39b1d3bc9e57c43abe6b3c3bc51380 100644
--- a/Framework/Algorithms/src/GetEi.cpp
+++ b/Framework/Algorithms/src/GetEi.cpp
@@ -97,14 +97,14 @@ void GetEi::exec() {
// write a lot of stuff to the log at user level as it is very possible for
// fit routines not to the expected thing
g_log.information() << "Based on the user selected energy the first peak "
- "will be searched for at TOF "
- << peakLoc0 << " micro seconds +/-"
+ "will be searched for at TOF " << peakLoc0
+ << " micro seconds +/-"
<< boost::lexical_cast<std::string>(100.0 * HALF_WINDOW)
<< "%\n";
const double peakLoc1 = 1e6 * timeToFly(dist2moni1, E_est);
g_log.information() << "Based on the user selected energy the second peak "
- "will be searched for at TOF "
- << peakLoc1 << " micro seconds +/-"
+ "will be searched for at TOF " << peakLoc1
+ << " micro seconds +/-"
<< boost::lexical_cast<std::string>(100.0 * HALF_WINDOW)
<< "%\n";
@@ -380,8 +380,8 @@ void GetEi::getPeakEstimates(double &height, int64_t ¢reInd,
"the monitor spectrum, which is at TOF "
<< (m_tempWS->readX(0)[centreInd] +
m_tempWS->readX(0)[centreInd + 1]) /
- 2
- << " (peak height " << height << " counts/microsecond)\n";
+ 2 << " (peak height " << height
+ << " counts/microsecond)\n";
}
/** Estimates the closest time, looking either or back, when the number of
* counts is
diff --git a/Framework/Crystal/src/AnvredCorrection.cpp b/Framework/Crystal/src/AnvredCorrection.cpp
index fd307e2f637730e72159159885bf409b0d097e5d..5ab009d0c6cae96fb3e9ec7ade26d33d21cdb692 100644
--- a/Framework/Crystal/src/AnvredCorrection.cpp
+++ b/Framework/Crystal/src/AnvredCorrection.cpp
@@ -66,11 +66,19 @@ using namespace Geometry;
using namespace API;
using namespace DataObjects;
using namespace Mantid::PhysicalConstants;
-std::map<int, double> detScale = {
- {17, 1.092114823}, {18, 0.869105443}, {22, 1.081377685}, {26, 1.055199489},
- {27, 1.070308725}, {28, 0.886157884}, {36, 1.112773972}, {37, 1.012894506},
- {38, 1.049384146}, {39, 0.890313805}, {47, 1.068553893}, {48, 0.900566426},
- {58, 0.911249203}};
+std::map<int, double> detScale = {{17, 1.092114823},
+ {18, 0.869105443},
+ {22, 1.081377685},
+ {26, 1.055199489},
+ {27, 1.070308725},
+ {28, 0.886157884},
+ {36, 1.112773972},
+ {37, 1.012894506},
+ {38, 1.049384146},
+ {39, 0.890313805},
+ {47, 1.068553893},
+ {48, 0.900566426},
+ {58, 0.911249203}};
AnvredCorrection::AnvredCorrection()
: API::Algorithm(), m_smu(0.), m_amu(0.), m_radius(0.), m_power_th(0.),
@@ -134,8 +142,7 @@ void AnvredCorrection::exec() {
m_onlySphericalAbsorption = true;
g_log.warning() << "Lorentz Correction was already done for this "
"workspace. OnlySphericalAbsorption was changed to "
- "true."
- << std::endl;
+ "true." << std::endl;
}
}
}
diff --git a/Framework/Crystal/src/PeakHKLErrors.cpp b/Framework/Crystal/src/PeakHKLErrors.cpp
index 2c8adfd12cccf68abd77a869888866744890c40e..92314edc9afa3af099908e76ea5ee9993c4105e5 100644
--- a/Framework/Crystal/src/PeakHKLErrors.cpp
+++ b/Framework/Crystal/src/PeakHKLErrors.cpp
@@ -403,8 +403,7 @@ void PeakHKLErrors::function1D(double *out, const double *xValues,
}
g_log.debug() << "------------------------Function---------------------------"
- "--------------------"
- << std::endl;
+ "--------------------" << std::endl;
for (size_t p = 0; p < nParams(); p++) {
g_log.debug() << parameterName(p) << "(" << getParameter(p) << "),";
if ((p + 1) % 6 == 0)
diff --git a/Framework/Crystal/src/SaveIsawPeaks.cpp b/Framework/Crystal/src/SaveIsawPeaks.cpp
index f8cb6bbfa8cd2775085314fca0152da41841364a..af13c09af206c1761e2a334a2c331228b9941e7c 100644
--- a/Framework/Crystal/src/SaveIsawPeaks.cpp
+++ b/Framework/Crystal/src/SaveIsawPeaks.cpp
@@ -164,8 +164,7 @@ void SaveIsawPeaks::exec() {
if (true) {
out << "4 DETNUM NROWS NCOLS WIDTH HEIGHT DEPTH DETD CenterX "
" CenterY CenterZ BaseX BaseY BaseZ UpX UpY "
- " UpZ"
- << std::endl;
+ " UpZ" << std::endl;
// Here would save each detector...
for (auto it = uniqueBanks.begin(); it != uniqueBanks.end(); ++it) {
// Build up the bank name
diff --git a/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h b/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h
index bb6f8f9d392af6d5eec8812015a964a8452a888a..1999f8ba3b5f94b69f727799ea3638909a6cf95b 100644
--- a/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h
+++ b/Framework/Crystal/test/IntegratePeaksUsingClustersTest.h
@@ -288,8 +288,8 @@ public:
//=====================================================================================
// clang-format off
class IntegratePeaksUsingClustersTestPerformance : public CxxTest::TestSuite, public ClusterIntegrationBaseTest
-// clang-format on
-{
+ // clang-format on
+ {
private:
// Input data
diff --git a/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
index d4a9299b9625cefa6eb57037bb002ab3d7ff81ea..0ef5f1dcee13c7b3088ff972f837a17c8354f980 100644
--- a/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
+++ b/Framework/CurveFitting/src/Algorithms/LeBailFit.cpp
@@ -420,8 +420,7 @@ void LeBailFit::processInputBackground() {
}
g_log.information() << "[Input] Use background specified with vector with "
- "input vector sized "
- << numparams << ".\n";
+ "input vector sized " << numparams << ".\n";
} else {
g_log.information()
<< "[Input] Use background specified by table workspace.\n";
@@ -980,11 +979,10 @@ void LeBailFit::parseInstrumentParametersTable() {
// string data
g_log.debug() << "Col-name = " << colname << ", ";
trow >> strvalue;
- strvalue.erase(
- std::find_if(strvalue.rbegin(), strvalue.rend(),
- std::not1(std::ptr_fun<int, int>(std::isspace)))
- .base(),
- strvalue.end());
+ strvalue.erase(std::find_if(strvalue.rbegin(), strvalue.rend(),
+ std::not1(std::ptr_fun<int, int>(
+ std::isspace))).base(),
+ strvalue.end());
g_log.debug() << "Value = " << strvalue << ".\n";
tempstrmap.emplace(colname, strvalue);
diff --git a/Framework/CurveFitting/test/Algorithms/LeBailFitTest.h b/Framework/CurveFitting/test/Algorithms/LeBailFitTest.h
index e10d9f3ef47b3be7c010c16e130b8ef80322210a..b9bf311c47b3f135d26e997f98755d85ae51e5ce 100644
--- a/Framework/CurveFitting/test/Algorithms/LeBailFitTest.h
+++ b/Framework/CurveFitting/test/Algorithms/LeBailFitTest.h
@@ -948,8 +948,7 @@ public:
// 0. Check
if (hkls.size() != heights.size()) {
std::cout << "createInputHKLWorkspace: input two vectors have different "
- "sizes. It is not supported."
- << std::endl;
+ "sizes. It is not supported." << std::endl;
throw std::invalid_argument(
"Vectors for HKL and heights are of different sizes.");
}
diff --git a/Framework/CurveFitting/test/Algorithms/LeBailFunctionTest.h b/Framework/CurveFitting/test/Algorithms/LeBailFunctionTest.h
index 0a1cb22a77589cbd6fc0eb247de0c24683b684f5..12ded4346100b8f7ff7665fda46752608e06b892 100644
--- a/Framework/CurveFitting/test/Algorithms/LeBailFunctionTest.h
+++ b/Framework/CurveFitting/test/Algorithms/LeBailFunctionTest.h
@@ -331,17 +331,23 @@ public:
// Add peak parameters
map<string, double> parammap
- {{"Dtt1", 16370.650}, {"Dtt2", 0.10},
+ {{"Dtt1", 16370.650},
+ {"Dtt2", 0.10},
{"Zero", 0.0},
- {"Alph0", 1.0}, {"Alph1", 0.0},
- {"Beta0", 0.109036}, {"Beta1", 0.009834},
+ {"Alph0", 1.0},
+ {"Alph1", 0.0},
+ {"Beta0", 0.109036},
+ {"Beta1", 0.009834},
- {"Sig2", sqrt(91.127)}, {"Sig1", sqrt(1119.230)},
+ {"Sig2", sqrt(91.127)},
+ {"Sig1", sqrt(1119.230)},
{"Sig0", sqrt(0.0)},
- {"Gam0", 0.0}, {"Gam1", 7.688},
- {"Gam2", 0.0}, {"LatticeConstant", 5.431363}};
+ {"Gam0", 0.0},
+ {"Gam1", 7.688},
+ {"Gam2", 0.0},
+ {"LatticeConstant", 5.431363}};
lebailfunction.setProfileParameterValues(parammap);
diff --git a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
index 75eb2d022eefff99f7bcfaddf4e7c36198a3f3a6..b0eba695946b2ff2f6c8b6789e9f621db059239e 100644
--- a/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
+++ b/Framework/DataHandling/inc/MantidDataHandling/LoadEventNexus.h
@@ -241,8 +241,8 @@ public:
bool m_haveWeights;
/// Pointer to the vector of weighted events
- typedef std::vector<Mantid::DataObjects::WeightedEvent>
- *WeightedEventVector_pt;
+ typedef std::vector<Mantid::DataObjects::WeightedEvent> *
+ WeightedEventVector_pt;
/// Vector where index = event_id; value = ptr to std::vector<WeightedEvent>
/// in the event list.
diff --git a/Framework/DataHandling/src/DownloadInstrument.cpp b/Framework/DataHandling/src/DownloadInstrument.cpp
index 047a33fc4f406148f897ef87656a4263bbef43b9..2ac3f74bca8f6a91d9014482fc3d410230627171 100644
--- a/Framework/DataHandling/src/DownloadInstrument.cpp
+++ b/Framework/DataHandling/src/DownloadInstrument.cpp
@@ -92,8 +92,7 @@ void DownloadInstrument::exec() {
} else {
// log the failure at Notice Level
g_log.notice() << "Internet Connection Failed - cannot update instrument "
- "definitions."
- << std::endl;
+ "definitions." << std::endl;
// log this error at information level
g_log.information() << errorText << std::endl;
}
@@ -284,8 +283,7 @@ size_t DownloadInstrument::removeOrphanedFiles(
if (filenamesToKeep.find(entryPath.getFileName()) ==
filenamesToKeep.end()) {
g_log.debug() << "File not found in remote instrument repository, will "
- "be deleted: "
- << entryPath.getFileName() << std::endl;
+ "be deleted: " << entryPath.getFileName() << std::endl;
filesToDelete.push_back(it->path());
}
}
diff --git a/Framework/DataHandling/src/GroupDetectors2.cpp b/Framework/DataHandling/src/GroupDetectors2.cpp
index cc3b5ca13d352ec574791b0a66bede0cee623a91..4811836ecf3c78bfe95785ad1cd10086cc090336 100644
--- a/Framework/DataHandling/src/GroupDetectors2.cpp
+++ b/Framework/DataHandling/src/GroupDetectors2.cpp
@@ -359,8 +359,7 @@ void GroupDetectors2::getGroups(API::MatrixWorkspace_const_sptr workspace,
if (*it > maxIn) {
g_log.error() << "Spectra index " << *it
<< " doesn't exist in the input workspace, the highest "
- "possible index is "
- << maxIn << std::endl;
+ "possible index is " << maxIn << std::endl;
throw std::out_of_range("One of the spectra requested to group does "
"not exist in the input workspace");
}
diff --git a/Framework/DataHandling/src/Load.cpp b/Framework/DataHandling/src/Load.cpp
index fc63ae42becf6bbfbc3aea439329dcd47fd4ff3b..0088e1933ce45f56a00a52058cc342f8b4f68100 100644
--- a/Framework/DataHandling/src/Load.cpp
+++ b/Framework/DataHandling/src/Load.cpp
@@ -615,8 +615,7 @@ Load::getOutputWorkspace(const std::string &propName,
g_log.debug() << "Workspace property " << propName
<< " did not return to MatrixWorkspace, EventWorkspace, "
- "IMDEventWorkspace, IMDWorkspace"
- << std::endl;
+ "IMDEventWorkspace, IMDWorkspace" << std::endl;
return Workspace_sptr();
}
diff --git a/Framework/DataHandling/src/LoadAscii.cpp b/Framework/DataHandling/src/LoadAscii.cpp
index 9c423eb064dce3598c7b69f64931d775528f82af..9ff4ba9b10e8b7029e523360d4bb181e1184ac1e 100644
--- a/Framework/DataHandling/src/LoadAscii.cpp
+++ b/Framework/DataHandling/src/LoadAscii.cpp
@@ -313,9 +313,12 @@ void LoadAscii::init() {
"the read-in data and stored in the [[Analysis Data "
"Service]].");
- std::string spacers[6][6] = {{"Automatic", ",\t:; "}, {"CSV", ","},
- {"Tab", "\t"}, {"Space", " "},
- {"Colon", ":"}, {"SemiColon", ";"}};
+ std::string spacers[6][6] = {{"Automatic", ",\t:; "},
+ {"CSV", ","},
+ {"Tab", "\t"},
+ {"Space", " "},
+ {"Colon", ":"},
+ {"SemiColon", ";"}};
// For the ListValidator
std::vector<std::string> sepOptions;
for (size_t i = 0; i < 5; ++i) {
diff --git a/Framework/DataHandling/src/LoadAscii2.cpp b/Framework/DataHandling/src/LoadAscii2.cpp
index 857280b407a6187323261ebe4ddc72577667d1c8..ef39f1abb01fb7d07b3fd67cbde142a77aa8c40b 100644
--- a/Framework/DataHandling/src/LoadAscii2.cpp
+++ b/Framework/DataHandling/src/LoadAscii2.cpp
@@ -673,8 +673,7 @@ void LoadAscii2::exec() {
if (sep.empty()) {
g_log.notice() << "\"UserDefined\" has been selected, but no custom "
"separator has been entered."
- " Using default instead."
- << std::endl;
+ " Using default instead." << std::endl;
sep = ",";
}
m_columnSep = sep;
diff --git a/Framework/DataHandling/src/LoadEventNexus.cpp b/Framework/DataHandling/src/LoadEventNexus.cpp
index b979fd20a871c94b3ab1370ef9a7d3bde9681ff1..7c725b16cde04fe603e6e4820fd1e137f549f76f 100644
--- a/Framework/DataHandling/src/LoadEventNexus.cpp
+++ b/Framework/DataHandling/src/LoadEventNexus.cpp
@@ -1981,13 +1981,11 @@ void LoadEventNexus::loadEvents(API::Progress *const prog,
if (shortest_tof < 0)
g_log.warning() << "The shortest TOF was negative! At least 1 event has an "
- "invalid time-of-flight."
- << std::endl;
+ "invalid time-of-flight." << std::endl;
if (bad_tofs > 0)
g_log.warning() << "Found " << bad_tofs << " events with TOF > 2e8. This "
"may indicate errors in the raw "
- "TOF data."
- << std::endl;
+ "TOF data." << std::endl;
// Use T0 offset from TOPAZ Parameter file if it exists
if (m_ws->getInstrument()->hasParameter("T0")) {
@@ -2314,8 +2312,7 @@ void LoadEventNexus::runLoadMonitorsAsEvents(API::Progress *const prog) {
if (m_instrument_loaded_correctly) {
m_ws->setInstrument(dataWS->getInstrument());
g_log.information() << "Instrument data copied into monitors workspace "
- " from the data workspace."
- << std::endl;
+ " from the data workspace." << std::endl;
}
// Perform the load (only events from monitor)
@@ -2337,8 +2334,7 @@ void LoadEventNexus::runLoadMonitorsAsEvents(API::Progress *const prog) {
g_log.error()
<< "Could not copy log data into monitors workspace. Some "
" logs may be wrong and/or missing in the output "
- "monitors workspace."
- << std::endl;
+ "monitors workspace." << std::endl;
}
}
diff --git a/Framework/DataHandling/src/LoadMcStas.cpp b/Framework/DataHandling/src/LoadMcStas.cpp
index 76291c6b10e2538d99bd8878441810fe99823659..f620fff2906c4c9d0cd796b0eb4a2e44b34692d8 100644
--- a/Framework/DataHandling/src/LoadMcStas.cpp
+++ b/Framework/DataHandling/src/LoadMcStas.cpp
@@ -274,8 +274,7 @@ void LoadMcStas::readEventData(
::NeXus::Info id_info = nxFile.getInfo();
if (id_info.dims.size() != 2) {
g_log.error() << "Event data in McStas nexus file not loaded. Expected "
- "event data block to be two dimensional"
- << std::endl;
+ "event data block to be two dimensional" << std::endl;
return;
}
int64_t nNeutrons = id_info.dims[0];
diff --git a/Framework/DataHandling/src/LoadNexusMonitors2.cpp b/Framework/DataHandling/src/LoadNexusMonitors2.cpp
index 987a1b73f414a8dc4b8f3a9784a98ebe981ae1fc..48accfd8c4a46f861bd99ce7673d5e395e01c5ba 100644
--- a/Framework/DataHandling/src/LoadNexusMonitors2.cpp
+++ b/Framework/DataHandling/src/LoadNexusMonitors2.cpp
@@ -572,8 +572,7 @@ void LoadNexusMonitors2::runLoadLogs(const std::string filename,
loadLogs->execute();
} catch (...) {
g_log.error() << "Error while loading Logs from Nexus. Some sample logs "
- "may be missing."
- << std::endl;
+ "may be missing." << std::endl;
}
}
@@ -625,8 +624,7 @@ void LoadNexusMonitors2::splitMutiPeriodHistrogramData(
<< "Attempted to split multiperiod histogram workspace with "
<< m_workspace->blocksize() << "data entries, into " << numPeriods
<< "periods."
- " Aborted."
- << std::endl;
+ " Aborted." << std::endl;
return;
}
diff --git a/Framework/DataHandling/src/LoadNexusProcessed.cpp b/Framework/DataHandling/src/LoadNexusProcessed.cpp
index 3441c47dbc2666e8a7b2072977a944bbebff2d7e..674e572e62e71248294503dcbab1c325d90e1926 100644
--- a/Framework/DataHandling/src/LoadNexusProcessed.cpp
+++ b/Framework/DataHandling/src/LoadNexusProcessed.cpp
@@ -302,8 +302,7 @@ Workspace_sptr LoadNexusProcessed::doAccelleratedMultiPeriodLoading(
std::stringstream buffer;
buffer << "Group entry " << p - 1 << " has fractional area present. Try "
"reloading with FastMultiPeriod set "
- "off."
- << std::endl;
+ "off." << std::endl;
throw std::runtime_error(buffer.str());
}
diff --git a/Framework/DataHandling/src/LoadRawHelper.cpp b/Framework/DataHandling/src/LoadRawHelper.cpp
index 7e17e0ea3a1ed61e78156fa5eb1ef99b44be88df..eb77f187b2f5209db2316cf76904dbafd4820ea0 100644
--- a/Framework/DataHandling/src/LoadRawHelper.cpp
+++ b/Framework/DataHandling/src/LoadRawHelper.cpp
@@ -853,8 +853,7 @@ void LoadRawHelper::loadRunParameters(API::MatrixWorkspace_sptr localWorkspace,
DateAndTime(isisDate.substr(7, 4) + "-" +
convertMonthLabelToIntStr(isisDate.substr(3, 3)) + "-" +
isisDate.substr(0, 2) + "T" +
- std::string(localISISRaw->hdr.hd_time, 8))
- .toISO8601String());
+ std::string(localISISRaw->hdr.hd_time, 8)).toISO8601String());
}
/// To help transforming date stored in ISIS raw file into iso 8601
diff --git a/Framework/DataHandling/test/LoadMaskTest.h b/Framework/DataHandling/test/LoadMaskTest.h
index 5c507c6bab0f9b3094883a756c80dabbf29638db..bd6a0aa042e02a835773dd4e7e5b288f23469a09 100644
--- a/Framework/DataHandling/test/LoadMaskTest.h
+++ b/Framework/DataHandling/test/LoadMaskTest.h
@@ -316,7 +316,8 @@ public:
}
// 4. End of file
- ss << " </group>" << std::endl << "</detector-masking>" << std::endl;
+ ss << " </group>" << std::endl
+ << "</detector-masking>" << std::endl;
return ScopedFileHelper::ScopedFile(ss.str(), maskfilename);
}
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h b/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
index 0c0ab63b796e96c5a617ebb21498f452dcc4dad1..81192c3ed2f373036b1576bedcac0498883d14d9 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDBoxBase.h
@@ -51,8 +51,8 @@ public:
MDBoxBase(Mantid::API::BoxController *const BoxController,
const uint32_t depth, const size_t boxID,
- const std::vector<Mantid::Geometry::MDDimensionExtents<coord_t>>
- &extentsVector);
+ const std::vector<Mantid::Geometry::MDDimensionExtents<coord_t>> &
+ extentsVector);
MDBoxBase(const MDBoxBase<MDE, nd> &box,
Mantid::API::BoxController *const otherBC);
diff --git a/Framework/Geometry/src/Instrument/ParameterMap.cpp b/Framework/Geometry/src/Instrument/ParameterMap.cpp
index d154b4a7f6618e620bce0a573cd8708c84094f50..c1152cefe7a5dc6f08b3dbecd213b278400797d1 100644
--- a/Framework/Geometry/src/Instrument/ParameterMap.cpp
+++ b/Framework/Geometry/src/Instrument/ParameterMap.cpp
@@ -222,8 +222,8 @@ const std::string ParameterMap::diff(const ParameterMap &rhs,
if (!match) {
// output some information that helps with understanding the mismatch
strOutput << "Parameter mismatch LHS=RHS for LHS parameter in component "
- "with name: "
- << fullName << ". Parameter name is: " << (*param).name()
+ "with name: " << fullName
+ << ". Parameter name is: " << (*param).name()
<< " and value: " << (*param).asString() << std::endl;
bool componentWithSameNameRHS = false;
bool parameterWithSameNameRHS = false;
@@ -384,8 +384,7 @@ void ParameterMap::addPositionCoordinate(
position.setZ(value);
else {
g_log.warning() << "addPositionCoordinate() called with unrecognized "
- "coordinate symbol: "
- << name;
+ "coordinate symbol: " << name;
// set description if one is provided
if (pDescription) {
param->setDescription(*pDescription);
@@ -824,8 +823,8 @@ Parameter_sptr ParameterMap::getByType(const IComponent *comp,
}
} // found->firdst
} // it_found != m_map.end()
- } //! m_map.empty()
- } // PARALLEL_CRITICAL(m_map_access)
+ } //! m_map.empty()
+ } // PARALLEL_CRITICAL(m_map_access)
return result;
}
diff --git a/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp b/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
index ce70728997400a9ab141abe3d68069b241824dc0..036968a097705ebf82c2ecda830f7f9b7d6b1d2c 100644
--- a/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
+++ b/Framework/Geometry/src/MDGeometry/MDGeometryXMLBuilder.cpp
@@ -83,8 +83,8 @@ MDGeometryBuilderXML<CheckDimensionPolicy>::MDGeometryBuilderXML(
template <typename CheckDimensionPolicy>
MDGeometryBuilderXML<CheckDimensionPolicy> &
-MDGeometryBuilderXML<CheckDimensionPolicy>::
-operator=(const MDGeometryBuilderXML<CheckDimensionPolicy> &other) {
+ MDGeometryBuilderXML<CheckDimensionPolicy>::
+ operator=(const MDGeometryBuilderXML<CheckDimensionPolicy> &other) {
if (this != &other) {
m_vecDimensions = other.m_vecDimensions;
m_spXDimension = other.m_spXDimension;
diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index ea20e906adae0dabc0742d578283c7afcda2ae3c..41e0dfc9d2728e0f0ee42f2a642fe0456c8fb2c4 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -355,8 +355,8 @@ typedef MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<ConfigServiceImpl>
typedef Mantid::Kernel::ConfigServiceImpl::ValueChanged
ConfigValChangeNotification;
-typedef const Poco::AutoPtr<Mantid::Kernel::ConfigServiceImpl::ValueChanged>
- &ConfigValChangeNotification_ptr;
+typedef const Poco::AutoPtr<Mantid::Kernel::ConfigServiceImpl::ValueChanged> &
+ ConfigValChangeNotification_ptr;
} // namespace Kernel
} // namespace Mantid
diff --git a/Framework/Kernel/inc/MantidKernel/IPropertyManager.h b/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
index f698fb7ba1936ce186d8d62f59d82f58bc7e86b6..6d8a5421b8fdde3995648978ca6a264f8b9e207d 100644
--- a/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
+++ b/Framework/Kernel/inc/MantidKernel/IPropertyManager.h
@@ -81,8 +81,8 @@ public:
*/
virtual void setPropertiesWithSimpleString(
const std::string &propertiesString,
- const std::unordered_set<std::string> &ignoreProperties =
- std::unordered_set<std::string>()) = 0;
+ const std::unordered_set<std::string> &
+ ignoreProperties = std::unordered_set<std::string>()) = 0;
/** Sets all the declared properties from a string.
@param propertiesJson :: A string of name = value pairs formatted
@@ -92,8 +92,8 @@ public:
*/
virtual void
setProperties(const std::string &propertiesJson,
- const std::unordered_set<std::string> &ignoreProperties =
- std::unordered_set<std::string>()) = 0;
+ const std::unordered_set<std::string> &
+ ignoreProperties = std::unordered_set<std::string>()) = 0;
/** Sets all the declared properties from a json object
@param jsonValue :: A json name value pair collection
@@ -102,8 +102,8 @@ public:
*/
virtual void
setProperties(const ::Json::Value &jsonValue,
- const std::unordered_set<std::string> &ignoreProperties =
- std::unordered_set<std::string>()) = 0;
+ const std::unordered_set<std::string> &
+ ignoreProperties = std::unordered_set<std::string>()) = 0;
/** Sets property value from a string
@param name :: Property name
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 9c4549272e24b020f85eefc201900154694c1cef..67c1bd9b27d6cbfd9916076e5155835bbe8e0d3f 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -242,8 +242,7 @@ ConfigServiceImpl::ConfigServiceImpl()
<< " revision " << MantidVersion::revision() << std::endl;
g_log.information() << "running on " << getComputerName() << " starting "
<< DateAndTime::getCurrentTime().toFormattedString(
- "%Y-%m-%dT%H:%MZ")
- << "\n";
+ "%Y-%m-%dT%H:%MZ") << "\n";
g_log.information() << "Properties file(s) loaded: " << propertiesFilesList
<< std::endl;
#ifndef MPI_BUILD // There is no logging to file by default in MPI build
@@ -631,22 +630,18 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
std::fstream::out);
filestr << "# This file can be used to override any properties for this "
- "installation."
- << std::endl;
+ "installation." << std::endl;
filestr << "# Any properties found in this file will override any that are "
- "found in the Mantid.Properties file"
- << std::endl;
+ "found in the Mantid.Properties file" << std::endl;
filestr << "# As this file will not be replaced with futher installations "
- "of Mantid it is a safe place to put "
- << std::endl;
+ "of Mantid it is a safe place to put " << std::endl;
filestr << "# properties that suit your particular installation."
<< std::endl;
filestr << "#" << std::endl;
filestr << "# See here for a list of possible options:" << std::endl;
filestr << "# "
"http://www.mantidproject.org/"
- "Properties_File#Mantid.User.Properties"
- << std::endl;
+ "Properties_File#Mantid.User.Properties" << std::endl;
filestr << std::endl;
filestr << "##" << std::endl;
filestr << "## GENERAL" << std::endl;
@@ -679,21 +674,18 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
filestr << std::endl;
filestr << "## Sets the Q.convention" << std::endl;
filestr << "## Set to Crystallography for kf-ki instead of default "
- "Inelastic which is ki-kf"
- << std::endl;
+ "Inelastic which is ki-kf" << std::endl;
filestr << "#Q.convention=Crystallography" << std::endl;
filestr << "##" << std::endl;
filestr << "## DIRECTORIES" << std::endl;
filestr << "##" << std::endl;
filestr << std::endl;
filestr << "## Sets a list of directories (separated by semi colons) to "
- "search for data"
- << std::endl;
+ "search for data" << std::endl;
filestr << "#datasearch.directories=../data;../isis/data" << std::endl;
filestr << std::endl;
filestr << "## Set a list (separated by semi colons) of directories to "
- "look for additional Python scripts"
- << std::endl;
+ "look for additional Python scripts" << std::endl;
filestr << "#pythonscripts.directories=../scripts;../docs/MyScripts"
<< std::endl;
filestr << std::endl;
@@ -734,8 +726,7 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
filestr << "#MantidOptions.ReusePlotInstances=Off" << std::endl;
filestr << std::endl;
filestr << "## Uncomment to disable use of OpenGL to render unwrapped "
- "instrument views"
- << std::endl;
+ "instrument views" << std::endl;
filestr << "#MantidOptions.InstrumentView.UseOpenGL=Off" << std::endl;
filestr.close();
diff --git a/Framework/Kernel/src/Memory.cpp b/Framework/Kernel/src/Memory.cpp
index 51710be81de9e4e3bc6963967d6dd503374dff3f..ed1be30afae44d7eaa72ad4da6be1c70e6c9f397 100644
--- a/Framework/Kernel/src/Memory.cpp
+++ b/Framework/Kernel/src/Memory.cpp
@@ -503,7 +503,7 @@ size_t MemoryStats::getPeakRSS() const {
GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
return (size_t)info.PeakWorkingSetSize;
-#elif (defined(_AIX) || defined(__TOS__AIX__)) || \
+#elif(defined(_AIX) || defined(__TOS__AIX__)) || \
(defined(__sun__) || defined(__sun) || \
defined(sun) && (defined(__SVR4) || defined(__svr4__)))
/* AIX and Solaris ------------------------------------------ */
diff --git a/Framework/Kernel/src/TimeSeriesProperty.cpp b/Framework/Kernel/src/TimeSeriesProperty.cpp
index c591c8a2475e3812ea59c81081c82f5590ce89f1..d806dc1a132e75d8e27cf2f165412afac44f30a5 100644
--- a/Framework/Kernel/src/TimeSeriesProperty.cpp
+++ b/Framework/Kernel/src/TimeSeriesProperty.cpp
@@ -1076,14 +1076,12 @@ template <typename TYPE> TYPE TimeSeriesProperty<TYPE>::lastValue() const {
template <typename TYPE> TYPE TimeSeriesProperty<TYPE>::minValue() const {
return std::min_element(m_values.begin(), m_values.end(),
- TimeValueUnit<TYPE>::valueCmp)
- ->value();
+ TimeValueUnit<TYPE>::valueCmp)->value();
}
template <typename TYPE> TYPE TimeSeriesProperty<TYPE>::maxValue() const {
return std::max_element(m_values.begin(), m_values.end(),
- TimeValueUnit<TYPE>::valueCmp)
- ->value();
+ TimeValueUnit<TYPE>::valueCmp)->value();
}
/// Returns the number of values at UNIQUE time intervals in the time series
diff --git a/Framework/Kernel/test/DataServiceTest.h b/Framework/Kernel/test/DataServiceTest.h
index ca07fed834ecff931ad8c6283cdf47825cc23f62..18b0db3c8a9158c7f94e47519608eaeb2b0b625d 100644
--- a/Framework/Kernel/test/DataServiceTest.h
+++ b/Framework/Kernel/test/DataServiceTest.h
@@ -76,17 +76,15 @@ public:
svc.notificationCenter.removeObserver(observer);
}
- void handlePreDeleteNotification(
- const Poco::AutoPtr<FakeDataService::PreDeleteNotification>
- ¬ification) {
+ void handlePreDeleteNotification(const Poco::AutoPtr<
+ FakeDataService::PreDeleteNotification> ¬ification) {
TS_ASSERT_EQUALS(notification->objectName(), "one");
TS_ASSERT_EQUALS(*notification->object(), 1);
++notificationFlag;
}
- void handlePostDeleteNotification(
- const Poco::AutoPtr<FakeDataService::PostDeleteNotification>
- ¬ification) {
+ void handlePostDeleteNotification(const Poco::AutoPtr<
+ FakeDataService::PostDeleteNotification> ¬ification) {
TS_ASSERT_EQUALS(notification->objectName(), "one");
++notificationFlag;
}
diff --git a/Framework/Kernel/test/DiskBufferISaveableTest.h b/Framework/Kernel/test/DiskBufferISaveableTest.h
index 6bde9775cbdd72694a0830c0d56e8298e5a4ca95..5acaba5a308092048f355f70e2baef96bf37aa36 100644
--- a/Framework/Kernel/test/DiskBufferISaveableTest.h
+++ b/Framework/Kernel/test/DiskBufferISaveableTest.h
@@ -358,8 +358,7 @@ public:
dbuf.toWrite(bigData[indexToRemove[i]]);
}
std::cout << "Finished DiskBuffer inserting/deleting performance test, 1 "
- "thread in "
- << clock.elapsed() << " sec\n";
+ "thread in " << clock.elapsed() << " sec\n";
TS_ASSERT_EQUALS(dbuf.getWriteBufferUsed(), BIG_NUM + DATA_SIZE);
// cleanup memory
@@ -399,8 +398,7 @@ public:
dbuf.toWrite(bigData[indexToRemove[i]]);
}
std::cout << "Finished DiskBuffer inserting/deleting performance test, "
- "multithread in "
- << clock.elapsed() << " sec\n";
+ "multithread in " << clock.elapsed() << " sec\n";
TS_ASSERT_EQUALS(dbuf.getWriteBufferUsed(), BIG_NUM + DATA_SIZE);
// cleanup memory
diff --git a/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h b/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
index d7378b3fd87de4853aa4a8296b6f8eaee4930c09..b71395531c587fc3883cd4bcca682a38711368e8 100644
--- a/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
+++ b/Framework/LiveData/inc/MantidLiveData/FakeEventDataListener.h
@@ -58,8 +58,8 @@ private:
DataObjects::EventWorkspace_sptr
m_buffer; ///< Used to buffer events between calls to extractData()
- Kernel::PseudoRandomNumberGenerator
- *m_rand; ///< Used in generation of random events
+ Kernel::PseudoRandomNumberGenerator *
+ m_rand; ///< Used in generation of random events
Poco::Timer
m_timer; ///< Used to call the event-generating function on a schedule
int m_datarate; ///< The data rate to (attempt to) generate in events/sec
diff --git a/Framework/LiveData/src/ISISLiveEventDataListener.cpp b/Framework/LiveData/src/ISISLiveEventDataListener.cpp
index 52538b877cf6e524395d92f4a5c6a1990ca7a954..bc476ebf3ff81e3ad4ed58d91c949970d577f92c 100644
--- a/Framework/LiveData/src/ISISLiveEventDataListener.cpp
+++ b/Framework/LiveData/src/ISISLiveEventDataListener.cpp
@@ -282,8 +282,8 @@ void ISISLiveEventDataListener::run() {
saveEvents(events.data, pulseTime, events.head_n.period);
}
- } catch (std::runtime_error
- &e) { // exception handler for generic runtime exceptions
+ } catch (std::runtime_error &
+ e) { // exception handler for generic runtime exceptions
g_log.error() << "Caught a runtime exception." << std::endl
<< "Exception message: " << e.what() << std::endl;
@@ -291,9 +291,9 @@ void ISISLiveEventDataListener::run() {
m_backgroundException = boost::make_shared<std::runtime_error>(e);
- } catch (std::invalid_argument
- &e) { // TimeSeriesProperty (and possibly some other things) can
- // can throw these errors
+ } catch (std::invalid_argument &
+ e) { // TimeSeriesProperty (and possibly some other things) can
+ // can throw these errors
g_log.error() << "Caught an invalid argument exception." << std::endl
<< "Exception message: " << e.what() << std::endl;
m_isConnected = false;
@@ -304,8 +304,7 @@ void ISISLiveEventDataListener::run() {
} catch (...) { // Default exception handler
g_log.error() << "Uncaught exception in ISISLiveEventDataListener network "
- "read thread."
- << std::endl;
+ "read thread." << std::endl;
m_isConnected = false;
m_backgroundException = boost::shared_ptr<std::runtime_error>(
new std::runtime_error("Unknown error in backgound thread"));
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AccumulateMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AccumulateMD.h
index c720bf05e2848652d014cc7584a4bef92fd3859d..787c47475950bcfa7390aff3adaa1eeee6083420 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AccumulateMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/AccumulateMD.h
@@ -57,8 +57,9 @@ insertDataSources(const std::string &data_sources,
bool fileExists(const std::string &filename);
/// Pad vector of parameters to given length
-extern void MANTID_MDALGORITHMS_DLL padParameterVector(
- std::vector<double> ¶m_vector, const size_t grow_to_size);
+extern void MANTID_MDALGORITHMS_DLL
+padParameterVector(std::vector<double> ¶m_vector,
+ const size_t grow_to_size);
/** AccumulateMD : Algorithm for appending new data to a MDHistoWorkspace
diff --git a/Framework/MatlabAPI/src/MatlabInterface.cpp b/Framework/MatlabAPI/src/MatlabInterface.cpp
index 08253e4061230cc274d5d4ad20687df07f635957..928e9f54b4e9a739ef7c63c081e6d0a2794da971 100644
--- a/Framework/MatlabAPI/src/MatlabInterface.cpp
+++ b/Framework/MatlabAPI/src/MatlabInterface.cpp
@@ -230,7 +230,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) {
}
for (i = 0;
i < static_cast<int>(sizeof(mex_functions) / sizeof(mexfunc_s_t)) &&
- !func_called;
+ !func_called;
i++) {
if ((mex_functions[i].name != NULL) &&
!compare_nocase(funcname, mex_functions[i].name)) {
@@ -689,8 +689,7 @@ void CreateSimpleAPIHelper(const std::string &algName,
// The function definition
mfile << "if nargin < " << (orderedProperties.size() - iOpt) << "\n"
<< "\tfprintf('All mandatory arguments have not been supplied, type "
- "\"help "
- << algName << "\" for more information\\n');\n"
+ "\"help " << algName << "\" for more information\\n');\n"
<< "\treturn\n"
<< "end\n";
diff --git a/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp b/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
index 7b670d0683c25f163e789eb122d26f04f5b5db2d..6d3d6357d4c1803b02ede21c50cc9c6c3feae502 100644
--- a/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
+++ b/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
@@ -132,50 +132,50 @@ void export_Projection() {
.def("setType", &setUnit, (arg("self"), arg("dimension"), arg("unit")),
"Sets the unit for the given dimension")
.add_property(
- "u", make_function(
- &Projection::U, return_internal_reference<>(),
- boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
- make_function(
- boost::bind(&Projection::setAxis, _1, 0, _2),
- default_call_policies(),
- boost::mpl::vector3<void, Projection &, Mantid::Kernel::V3D>()))
+ "u", make_function(
+ &Projection::U, return_internal_reference<>(),
+ boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
+ make_function(
+ boost::bind(&Projection::setAxis, _1, 0, _2),
+ default_call_policies(),
+ boost::mpl::vector3<void, Projection &, Mantid::Kernel::V3D>()))
.add_property(
- "v", make_function(
- &Projection::V, return_internal_reference<>(),
- boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
- make_function(
- boost::bind(&Projection::setAxis, _1, 1, _2),
- default_call_policies(),
- boost::mpl::vector3<void, Projection &, Mantid::Kernel::V3D>()))
+ "v", make_function(
+ &Projection::V, return_internal_reference<>(),
+ boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
+ make_function(
+ boost::bind(&Projection::setAxis, _1, 1, _2),
+ default_call_policies(),
+ boost::mpl::vector3<void, Projection &, Mantid::Kernel::V3D>()))
.add_property(
- "w", make_function(
- &Projection::W, return_internal_reference<>(),
- boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
- make_function(
- boost::bind(&Projection::setAxis, _1, 2, _2),
- default_call_policies(),
- boost::mpl::vector3<void, Projection &, Mantid::Kernel::V3D>()))
+ "w", make_function(
+ &Projection::W, return_internal_reference<>(),
+ boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
+ make_function(
+ boost::bind(&Projection::setAxis, _1, 2, _2),
+ default_call_policies(),
+ boost::mpl::vector3<void, Projection &, Mantid::Kernel::V3D>()))
.add_property(
- "u", make_function(
- &Projection::U, return_internal_reference<>(),
- boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
- make_function(
- boost::bind(&projSetAxis, _1, 0, _2), default_call_policies(),
- boost::mpl::vector3<void, Projection &, const object &>()))
+ "u", make_function(
+ &Projection::U, return_internal_reference<>(),
+ boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
+ make_function(
+ boost::bind(&projSetAxis, _1, 0, _2), default_call_policies(),
+ boost::mpl::vector3<void, Projection &, const object &>()))
.add_property(
- "v", make_function(
- &Projection::V, return_internal_reference<>(),
- boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
- make_function(
- boost::bind(&projSetAxis, _1, 1, _2), default_call_policies(),
- boost::mpl::vector3<void, Projection &, const object &>()))
+ "v", make_function(
+ &Projection::V, return_internal_reference<>(),
+ boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
+ make_function(
+ boost::bind(&projSetAxis, _1, 1, _2), default_call_policies(),
+ boost::mpl::vector3<void, Projection &, const object &>()))
.add_property(
- "w", make_function(
- &Projection::W, return_internal_reference<>(),
- boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
- make_function(
- boost::bind(&projSetAxis, _1, 2, _2), default_call_policies(),
- boost::mpl::vector3<void, Projection &, const object &>()))
+ "w", make_function(
+ &Projection::W, return_internal_reference<>(),
+ boost::mpl::vector2<Mantid::Kernel::V3D &, Projection &>()),
+ make_function(
+ boost::bind(&projSetAxis, _1, 2, _2), default_call_policies(),
+ boost::mpl::vector3<void, Projection &, const object &>()))
.def("createWorkspace", createWorkspace(),
"Create a TableWorkspace representing the projection");
}
diff --git a/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp b/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
index 96554bc492a8f982d06eae591c9926b362d7058e..5997a26ab258b7a8f9c831439f7db38471cdc23d 100644
--- a/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
+++ b/Framework/ScriptRepository/src/ScriptRepositoryImpl.cpp
@@ -242,8 +242,7 @@ ScriptRepositoryImpl::ScriptRepositoryImpl(const std::string &local_rep,
if (!rep_json.exists()) {
g_log.error() << "Corrupted ScriptRepository at " << local_repository
<< ". Please, remove this folder, and install "
- "ScriptRepository again"
- << std::endl;
+ "ScriptRepository again" << std::endl;
}
}
} catch (Poco::FileNotFoundException & /*ex*/) {
@@ -360,8 +359,7 @@ void ScriptRepositoryImpl::ensureValidRepository() {
if (!isValid()) {
std::stringstream ss;
ss << "ScriptRepository is not installed correctly. The current path for "
- "ScriptRepository is "
- << local_repository
+ "ScriptRepository is " << local_repository
<< " but some important files that are required are corrupted or not "
"present."
<< "\nPlease, re-install the ScriptRepository!\n"
@@ -463,12 +461,11 @@ std::vector<std::string> ScriptRepositoryImpl::listFiles() {
// it will proceed in this situation.
} catch (Poco::Exception &ex) {
g_log.error() << "ScriptRepository failed to list all entries inside the "
- "repository. Details: "
- << ex.className() << ":> " << ex.displayText() << std::endl;
+ "repository. Details: " << ex.className() << ":> "
+ << ex.displayText() << std::endl;
} catch (std::exception &ex) {
g_log.error() << "ScriptRepository failed to list all entries inside the "
- "repository. Details: "
- << ex.what() << std::endl;
+ "repository. Details: " << ex.what() << std::endl;
}
std::vector<std::string> out(repo.size());
size_t i = repo.size();
diff --git a/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp b/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
index fe432ba0adb662906099a5cd57c9b31fc272789f..465479b5b87f59a03005c638a754a02ba7a1e37f 100644
--- a/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
+++ b/Framework/WorkflowAlgorithms/src/EQSANSLoad.cpp
@@ -446,8 +446,7 @@ void EQSANSLoad::exec() {
EventWorkspace_sptr inputEventWS = getProperty("InputWorkspace");
if (fileName.size() == 0 && !inputEventWS) {
g_log.error() << "EQSANSLoad input error: Either a valid file path or an "
- "input workspace must be provided"
- << std::endl;
+ "input workspace must be provided" << std::endl;
throw std::runtime_error("EQSANSLoad input error: Either a valid file path "
"or an input workspace must be provided");
} else if (fileName.size() > 0 && inputEventWS) {
@@ -688,8 +687,7 @@ void EQSANSLoad::exec() {
dataWS->mutableRun().addProperty("is_frame_skipping", 0, true);
if (correct_for_flight_path) {
g_log.error() << "CorrectForFlightPath and SkipTOFCorrection can't be "
- "set to true at the same time"
- << std::endl;
+ "set to true at the same time" << std::endl;
m_output_message += " Skipped flight path correction: see error log\n";
}
} else {