From f8ecaf237e678ff4eefa7fe9477c30becc37acd3 Mon Sep 17 00:00:00 2001
From: "McDonnell, Marshall T" <mcdonnellmt@ornl.gov>
Date: Tue, 8 May 2018 14:52:16 -0400
Subject: [PATCH] Clang formatting
---
.../CalculateCarpenterSampleCorrection.h | 8 ++++----
.../inc/MantidAlgorithms/CarpenterSampleCorrection.h | 9 +++++----
Framework/Algorithms/src/CarpenterSampleCorrection.cpp | 8 ++++----
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CalculateCarpenterSampleCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/CalculateCarpenterSampleCorrection.h
index b9d812c4465..5f780459e42 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CalculateCarpenterSampleCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CalculateCarpenterSampleCorrection.h
@@ -20,7 +20,7 @@ namespace Algorithms {
correct vanadium spectrum at IPNS. Algorithm originally worked
out by Jack Carpenter and Asfia Huq and implmented in Java by
Alok Chatterjee. Translated to C++ by Dennis Mikkelson.
-
+
Copyright © 2018 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
@@ -52,9 +52,9 @@ public:
/// Algorithm's version for identification overriding a virtual method
int version() const override;
const std::vector<std::string> seeAlso() const override {
- return {"CarpenterSampleCorrection", "CylinderAbsorption",
- "MonteCarloAbsorption", "MayersSampleCorrection",
- "PearlMCAbsorption", "VesuvioCalculateMS"};
+ return { "CarpenterSampleCorrection", "CylinderAbsorption",
+ "MonteCarloAbsorption", "MayersSampleCorrection",
+ "PearlMCAbsorption", "VesuvioCalculateMS" };
}
/// Algorithm's category for identification overriding a virtual method
diff --git a/Framework/Algorithms/inc/MantidAlgorithms/CarpenterSampleCorrection.h b/Framework/Algorithms/inc/MantidAlgorithms/CarpenterSampleCorrection.h
index 0969365dd33..e1c48780a47 100644
--- a/Framework/Algorithms/inc/MantidAlgorithms/CarpenterSampleCorrection.h
+++ b/Framework/Algorithms/inc/MantidAlgorithms/CarpenterSampleCorrection.h
@@ -42,7 +42,8 @@ namespace Algorithms {
<https://github.com/mantidproject/mantid>
Code Documentation is available at: <http://doxygen.mantidproject.org>
*/
-class DLLExport CarpenterSampleCorrection : public API::DistributedDataProcessorAlgorithm {
+class DLLExport CarpenterSampleCorrection
+ : public API::DistributedDataProcessorAlgorithm {
public:
/// Algorithm's name for identification overriding a virtual method
const std::string name() const override;
@@ -50,9 +51,9 @@ public:
/// Algorithm's version for identification overriding a virtual method
int version() const override;
const std::vector<std::string> seeAlso() const override {
- return {"CalculateCarpenterSampleCorrection", "CylinderAbsorption",
- "MonteCarloAbsorption", "MayersSampleCorrection",
- "PearlMCAbsorption", "VesuvioCalculateMS"};
+ return { "CalculateCarpenterSampleCorrection", "CylinderAbsorption",
+ "MonteCarloAbsorption", "MayersSampleCorrection",
+ "PearlMCAbsorption", "VesuvioCalculateMS" };
}
/// Algorithm's category for identification overriding a virtual method
diff --git a/Framework/Algorithms/src/CarpenterSampleCorrection.cpp b/Framework/Algorithms/src/CarpenterSampleCorrection.cpp
index cc7c3297dff..a2b34cf0f0a 100644
--- a/Framework/Algorithms/src/CarpenterSampleCorrection.cpp
+++ b/Framework/Algorithms/src/CarpenterSampleCorrection.cpp
@@ -52,7 +52,8 @@ void CarpenterSampleCorrection::init() {
wsValidator->add<WorkspaceUnitValidator>("Wavelength");
wsValidator->add<InstrumentValidator>();
- auto algCalcCarpenter = AlgorithmManager::Instance().createUnmanaged("CalculateCarpenterSampleCorrection");
+ auto algCalcCarpenter = AlgorithmManager::Instance().createUnmanaged(
+ "CalculateCarpenterSampleCorrection");
algCalcCarpenter->initialize();
declareProperty(make_unique<WorkspaceProperty<API::MatrixWorkspace> >(
@@ -114,9 +115,8 @@ void CarpenterSampleCorrection::exec() {
WorkspaceGroup_sptr CarpenterSampleCorrection::calculateCorrection(
MatrixWorkspace_sptr &inputWksp, double radius, double coeff1,
double coeff2, double coeff3, bool doAbs, bool doMS) {
- auto calculate =
- this->createChildAlgorithm("CalculateCarpenterSampleCorrection",
- 0.0, 0.25);
+ auto calculate = this->createChildAlgorithm(
+ "CalculateCarpenterSampleCorrection", 0.0, 0.25);
calculate->setProperty("InputWorkspace", inputWksp);
calculate->setProperty("CylinderSampleRadius", radius);
calculate->setProperty("AttenuationXSection", coeff1);
--
GitLab