Commit f044de9c authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Reformat codebase with clang-format 6.0

parent 1e924cdb
...@@ -126,7 +126,7 @@ private: ...@@ -126,7 +126,7 @@ private:
#pragma warning( \ #pragma warning( \
pop) // Re-enable the warning about multiple assignment operators pop) // Re-enable the warning about multiple assignment operators
#endif #endif
} } // namespace API
} // namespace Mantid } // namespace Mantid
#endif // MANTID_API_FILEPROPERTY_H_ #endif // MANTID_API_FILEPROPERTY_H_
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include "MantidTypes/SpectrumDefinition.h" #include "MantidTypes/SpectrumDefinition.h"
#include <type_traits> #include <type_traits>
using Mantid::Kernel::V3D;
using Mantid::SpectrumDefinition; using Mantid::SpectrumDefinition;
using Mantid::Kernel::V3D;
namespace Mantid { namespace Mantid {
namespace API { namespace API {
......
...@@ -99,12 +99,12 @@ double SpectrumInfo::signedTwoTheta(const size_t index) const { ...@@ -99,12 +99,12 @@ double SpectrumInfo::signedTwoTheta(const size_t index) const {
return signedTwoTheta / static_cast<double>(spectrumDefinition(index).size()); return signedTwoTheta / static_cast<double>(spectrumDefinition(index).size());
} }
/** Returns the out-of-plane angle in radians (angle w.r.t. to vecPointingHorizontal /** Returns the out-of-plane angle in radians (angle w.r.t. to
* direction). * vecPointingHorizontal direction).
* *
* Throws an exception if the spectrum is a monitor. * Throws an exception if the spectrum is a monitor.
*/ double */
SpectrumInfo::azimuthal(const size_t index) const { double SpectrumInfo::azimuthal(const size_t index) const {
double phi{0.0}; double phi{0.0};
for (const auto &detIndex : checkAndGetSpectrumDefinition(index)) for (const auto &detIndex : checkAndGetSpectrumDefinition(index))
phi += m_detectorInfo.azimuthal(detIndex); phi += m_detectorInfo.azimuthal(detIndex);
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include "Poco/DateTime.h" #include "Poco/DateTime.h"
#include <Poco/DateTimeParser.h> #include <Poco/DateTimeParser.h>
using Mantid::Kernel::EnvironmentHistory;
using boost::algorithm::split; using boost::algorithm::split;
using Mantid::Kernel::EnvironmentHistory;
namespace Mantid { namespace Mantid {
namespace API { namespace API {
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
using namespace Mantid::API; using namespace Mantid::API;
using namespace Mantid::Kernel; using namespace Mantid::Kernel;
using ::testing::Mock;
using ::testing::_; using ::testing::_;
using ::testing::Mock;
class FunctionParameterDecoratorTest; class FunctionParameterDecoratorTest;
......
...@@ -19,9 +19,9 @@ using Mantid::Kernel::V3D; ...@@ -19,9 +19,9 @@ using Mantid::Kernel::V3D;
using namespace Mantid::API; using namespace Mantid::API;
using ::testing::_;
using ::testing::Mock; using ::testing::Mock;
using ::testing::Return; using ::testing::Return;
using ::testing::_;
class ILatticeFunctionTest : public CxxTest::TestSuite { class ILatticeFunctionTest : public CxxTest::TestSuite {
public: public:
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "MantidKernel/Exception.h" #include "MantidKernel/Exception.h"
using Mantid::API::LatticeDomain; using Mantid::API::LatticeDomain;
using Mantid::Kernel::Exception::IndexError;
using Mantid::Kernel::V3D; using Mantid::Kernel::V3D;
using Mantid::Kernel::Exception::IndexError;
using namespace Mantid::API; using namespace Mantid::API;
......
...@@ -16,8 +16,8 @@ class PropertyManagerHelper : public Mantid::Kernel::PropertyManager { ...@@ -16,8 +16,8 @@ class PropertyManagerHelper : public Mantid::Kernel::PropertyManager {
public: public:
PropertyManagerHelper() : PropertyManager() {} PropertyManagerHelper() : PropertyManager() {}
using IPropertyManager::TypedValue;
using IPropertyManager::getValue; using IPropertyManager::getValue;
using IPropertyManager::TypedValue;
using PropertyManager::declareProperty; using PropertyManager::declareProperty;
using PropertyManager::setProperty; using PropertyManager::setProperty;
}; };
......
...@@ -29,8 +29,8 @@ DECLARE_ALGORITHM(ChangeTimeZero) ...@@ -29,8 +29,8 @@ DECLARE_ALGORITHM(ChangeTimeZero)
using namespace Mantid::Kernel; using namespace Mantid::Kernel;
using namespace Mantid::API; using namespace Mantid::API;
using Types::Core::DateAndTime;
using std::size_t; using std::size_t;
using Types::Core::DateAndTime;
namespace { namespace {
/** /**
......
...@@ -34,9 +34,9 @@ using Mantid::API::MatrixWorkspace; ...@@ -34,9 +34,9 @@ using Mantid::API::MatrixWorkspace;
using Mantid::API::MatrixWorkspace_const_sptr; using Mantid::API::MatrixWorkspace_const_sptr;
using Mantid::API::MatrixWorkspace_sptr; using Mantid::API::MatrixWorkspace_sptr;
using Mantid::API::WorkspaceProperty; using Mantid::API::WorkspaceProperty;
using Mantid::DataObjects::create;
using Mantid::DataObjects::Workspace2D; using Mantid::DataObjects::Workspace2D;
using Mantid::DataObjects::Workspace2D_sptr; using Mantid::DataObjects::Workspace2D_sptr;
using Mantid::DataObjects::create;
using Mantid::HistogramData::HistogramBuilder; using Mantid::HistogramData::HistogramBuilder;
using Mantid::Kernel::BoundedValidator; using Mantid::Kernel::BoundedValidator;
using Mantid::Kernel::CompositeValidator; using Mantid::Kernel::CompositeValidator;
......
...@@ -31,10 +31,10 @@ using DataObjects::EventWorkspace; ...@@ -31,10 +31,10 @@ using DataObjects::EventWorkspace;
using DataObjects::EventWorkspace_const_sptr; using DataObjects::EventWorkspace_const_sptr;
using DataObjects::EventWorkspace_sptr; using DataObjects::EventWorkspace_sptr;
using HistogramData::BinEdges; using HistogramData::BinEdges;
using HistogramData::Exception::InvalidBinEdgesError;
using HistogramData::Frequencies; using HistogramData::Frequencies;
using HistogramData::FrequencyStandardDeviations; using HistogramData::FrequencyStandardDeviations;
using HistogramData::Histogram; using HistogramData::Histogram;
using HistogramData::Exception::InvalidBinEdgesError;
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
// Public static methods // Public static methods
......
...@@ -18,8 +18,8 @@ namespace Algorithms { ...@@ -18,8 +18,8 @@ namespace Algorithms {
using namespace API; using namespace API;
using DataObjects::EventWorkspace; using DataObjects::EventWorkspace;
using DataObjects::EventWorkspace_const_sptr; using DataObjects::EventWorkspace_const_sptr;
using HistogramData::CountStandardDeviations;
using HistogramData::Counts; using HistogramData::Counts;
using HistogramData::CountStandardDeviations;
// Register the algorithm into the AlgorithmFactory // Register the algorithm into the AlgorithmFactory
DECLARE_ALGORITHM(RebinToWorkspace) DECLARE_ALGORITHM(RebinToWorkspace)
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
using Mantid::Kernel::ChebyshevPolyFit; using Mantid::Kernel::ChebyshevPolyFit;
using Mantid::Kernel::ChebyshevSeries; using Mantid::Kernel::ChebyshevSeries;
using Mantid::Kernel::getStatistics;
using Mantid::Kernel::MersenneTwister; using Mantid::Kernel::MersenneTwister;
using Mantid::Kernel::StatOptions; using Mantid::Kernel::StatOptions;
using Mantid::Kernel::getStatistics;
using std::pow; using std::pow;
namespace { namespace {
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#include <boost/math/special_functions/pow.hpp> #include <boost/math/special_functions/pow.hpp>
using Mantid::Geometry::rad2deg;
using boost::math::pow; using boost::math::pow;
using Mantid::Geometry::rad2deg;
namespace { namespace {
/** /**
......
...@@ -41,8 +41,8 @@ void UpdateScriptRepository::init() {} ...@@ -41,8 +41,8 @@ void UpdateScriptRepository::init() {}
void UpdateScriptRepository::exec() { void UpdateScriptRepository::exec() {
// TODO Auto-generated execute stub // TODO Auto-generated execute stub
using Mantid::API::ScriptRepository; using Mantid::API::ScriptRepository;
using Mantid::API::ScriptRepositoryFactory;
using Mantid::API::ScriptRepository_sptr; using Mantid::API::ScriptRepository_sptr;
using Mantid::API::ScriptRepositoryFactory;
auto repo_ptr = auto repo_ptr =
ScriptRepositoryFactory::Instance().create("ScriptRepositoryImpl"); ScriptRepositoryFactory::Instance().create("ScriptRepositoryImpl");
......
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
#include <boost/cast.hpp> #include <boost/cast.hpp>
using Mantid::Algorithms::CalculateDynamicRange;
using Mantid::Algorithms::CreateSampleWorkspace;
using Mantid::API::FrameworkManager; using Mantid::API::FrameworkManager;
using Mantid::API::MatrixWorkspace; using Mantid::API::MatrixWorkspace;
using Mantid::API::MatrixWorkspace_sptr; using Mantid::API::MatrixWorkspace_sptr;
using Mantid::API::Workspace; using Mantid::API::Workspace;
using Mantid::API::Workspace_sptr; using Mantid::API::Workspace_sptr;
using Mantid::Algorithms::CalculateDynamicRange;
using Mantid::Algorithms::CreateSampleWorkspace;
using Mantid::DataHandling::MaskDetectorsInShape; using Mantid::DataHandling::MaskDetectorsInShape;
using Mantid::DataHandling::MoveInstrumentComponent; using Mantid::DataHandling::MoveInstrumentComponent;
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h" #include "MantidTestHelpers/WorkspaceCreationHelper.h"
#include <cxxtest/TestSuite.h> #include <cxxtest/TestSuite.h>
using Mantid::API::AlgorithmManager; using Mantid::MantidVec;
using Mantid::Algorithms::CalculatePlaczekSelfScattering;
using Mantid::API::Algorithm_sptr; using Mantid::API::Algorithm_sptr;
using Mantid::API::AlgorithmManager;
using Mantid::API::MatrixWorkspace_sptr; using Mantid::API::MatrixWorkspace_sptr;
using Mantid::Algorithms::CalculatePlaczekSelfScattering;
using Mantid::MantidVec;
// generate incident spectrum data // generate incident spectrum data
std::vector<double> std::vector<double>
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
using namespace Mantid::API; using namespace Mantid::API;
using namespace Mantid::DataObjects; using namespace Mantid::DataObjects;
using namespace Mantid::Geometry; using namespace Mantid::Geometry;
using Mantid::MantidVecPtr;
using Mantid::Algorithms::ClearMaskFlag; using Mantid::Algorithms::ClearMaskFlag;
using Mantid::HistogramData::BinEdges; using Mantid::HistogramData::BinEdges;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::Counts; using Mantid::HistogramData::Counts;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::LinearGenerator; using Mantid::HistogramData::LinearGenerator;
using Mantid::MantidVecPtr;
class ClearMaskFlagTest : public CxxTest::TestSuite { class ClearMaskFlagTest : public CxxTest::TestSuite {
public: public:
......
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h" #include "MantidTestHelpers/WorkspaceCreationHelper.h"
using Mantid::MantidVecPtr;
using Mantid::Algorithms::ConvertToHistogram;
using Mantid::API::IAlgorithm_sptr; using Mantid::API::IAlgorithm_sptr;
using Mantid::API::MatrixWorkspace; using Mantid::API::MatrixWorkspace;
using Mantid::API::MatrixWorkspace_sptr; using Mantid::API::MatrixWorkspace_sptr;
using Mantid::Algorithms::ConvertToHistogram;
using Mantid::DataObjects::Workspace2D_sptr; using Mantid::DataObjects::Workspace2D_sptr;
using Mantid::HistogramData::HistogramDx; using Mantid::HistogramData::HistogramDx;
using Mantid::HistogramData::LinearGenerator; using Mantid::HistogramData::LinearGenerator;
using Mantid::HistogramData::Points; using Mantid::HistogramData::Points;
using Mantid::Kernel::make_cow; using Mantid::Kernel::make_cow;
using Mantid::MantidVecPtr;
class ConvertToHistogramTest : public CxxTest::TestSuite { class ConvertToHistogramTest : public CxxTest::TestSuite {
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
#include "MantidKernel/Unit.h" #include "MantidKernel/Unit.h"
#include "MantidKernel/UnitFactory.h" #include "MantidKernel/UnitFactory.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h" #include "MantidTestHelpers/WorkspaceCreationHelper.h"
using Mantid::Algorithms::ConvertToPointData;
using Mantid::API::IAlgorithm_sptr; using Mantid::API::IAlgorithm_sptr;
using Mantid::API::MatrixWorkspace; using Mantid::API::MatrixWorkspace;
using Mantid::API::MatrixWorkspace_sptr; using Mantid::API::MatrixWorkspace_sptr;
using Mantid::Algorithms::ConvertToPointData;
using Mantid::DataObjects::Workspace2D_sptr; using Mantid::DataObjects::Workspace2D_sptr;
class ConvertToPointDataTest : public CxxTest::TestSuite { class ConvertToPointDataTest : public CxxTest::TestSuite {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment