From b22b67eb93b37d1b71dd1c058ac19caaf56fbc9c Mon Sep 17 00:00:00 2001
From: Ross Whitfield <whitfieldre@ornl.gov>
Date: Wed, 29 Apr 2015 11:47:26 -0400
Subject: [PATCH] Disable clang-format for PythonInterface exports.

---
 .../mantid/api/src/Exports/Algorithm.cpp             |  2 ++
 .../mantid/api/src/Exports/AlgorithmFactory.cpp      |  2 ++
 .../mantid/api/src/Exports/AlgorithmHistory.cpp      |  2 ++
 .../mantid/api/src/Exports/AlgorithmManager.cpp      |  2 ++
 .../mantid/api/src/Exports/AlgorithmProperty.cpp     |  2 ++
 .../mantid/api/src/Exports/AlgorithmProxy.cpp        |  2 ++
 .../mantid/api/src/Exports/AnalysisDataService.cpp   |  2 ++
 .../PythonInterface/mantid/api/src/Exports/Axis.cpp  |  8 ++++++++
 .../mantid/api/src/Exports/BinaryOperations.cpp      |  2 ++
 .../mantid/api/src/Exports/BoxController.cpp         |  2 ++
 .../mantid/api/src/Exports/CatalogManager.cpp        |  2 ++
 .../mantid/api/src/Exports/CatalogSession.cpp        |  2 ++
 .../api/src/Exports/DataProcessorAlgorithm.cpp       |  2 ++
 .../api/src/Exports/DeprecatedAlgorithmChecker.cpp   |  2 ++
 .../mantid/api/src/Exports/ExperimentInfo.cpp        |  2 ++
 .../mantid/api/src/Exports/FileFinder.cpp            |  2 ++
 .../mantid/api/src/Exports/FileProperty.cpp          |  4 ++++
 .../mantid/api/src/Exports/FrameworkManager.cpp      |  2 ++
 .../mantid/api/src/Exports/FunctionFactory.cpp       |  2 ++
 .../mantid/api/src/Exports/FunctionProperty.cpp      |  2 ++
 .../mantid/api/src/Exports/IAlgorithm.cpp            |  2 ++
 .../mantid/api/src/Exports/IEventList.cpp            |  2 ++
 .../mantid/api/src/Exports/IEventWorkspace.cpp       |  2 ++
 .../api/src/Exports/IEventWorkspaceProperty.cpp      |  2 ++
 .../mantid/api/src/Exports/IFunction.cpp             |  2 ++
 .../mantid/api/src/Exports/IFunction1D.cpp           |  2 ++
 .../mantid/api/src/Exports/IMDEventWorkspace.cpp     |  2 ++
 .../api/src/Exports/IMDEventWorkspaceProperty.cpp    |  2 ++
 .../mantid/api/src/Exports/IMDHistoWorkspace.cpp     |  2 ++
 .../api/src/Exports/IMDHistoWorkspaceProperty.cpp    |  2 ++
 .../mantid/api/src/Exports/IMDWorkspace.cpp          |  2 ++
 .../mantid/api/src/Exports/IMDWorkspaceProperty.cpp  |  2 ++
 .../PythonInterface/mantid/api/src/Exports/IPeak.cpp |  2 ++
 .../mantid/api/src/Exports/IPeakFunction.cpp         |  2 ++
 .../mantid/api/src/Exports/IPeaksWorkspace.cpp       |  2 ++
 .../api/src/Exports/IPeaksWorkspaceProperty.cpp      |  2 ++
 .../mantid/api/src/Exports/ISpectrum.cpp             |  2 ++
 .../mantid/api/src/Exports/ISplittersWorkspace.cpp   |  2 ++
 .../mantid/api/src/Exports/ITableWorkspace.cpp       |  2 ++
 .../api/src/Exports/ITableWorkspaceProperty.cpp      |  2 ++
 .../mantid/api/src/Exports/IWorkspaceProperty.cpp    |  2 ++
 .../mantid/api/src/Exports/InstrumentValidator.cpp   |  2 ++
 .../mantid/api/src/Exports/Jacobian.cpp              |  2 ++
 .../mantid/api/src/Exports/MDGeometry.cpp            |  2 ++
 .../mantid/api/src/Exports/MatrixWorkspace.cpp       |  2 ++
 .../api/src/Exports/MatrixWorkspaceProperty.cpp      |  2 ++
 .../api/src/Exports/MultipleExperimentInfos.cpp      |  2 ++
 .../mantid/api/src/Exports/MultipleFileProperty.cpp  |  2 ++
 .../mantid/api/src/Exports/Progress.cpp              |  2 ++
 .../mantid/api/src/Exports/Projection.cpp            |  2 ++
 .../mantid/api/src/Exports/PropertyHistory.cpp       |  2 ++
 .../api/src/Exports/PropertyManagerDataService.cpp   |  2 ++
 .../PythonInterface/mantid/api/src/Exports/Run.cpp   |  2 ++
 .../mantid/api/src/Exports/Sample.cpp                |  2 ++
 .../mantid/api/src/Exports/ScriptRepository.cpp      |  2 ++
 .../api/src/Exports/ScriptRepositoryFactory.cpp      |  2 ++
 .../mantid/api/src/Exports/Workspace.cpp             |  2 ++
 .../mantid/api/src/Exports/WorkspaceFactory.cpp      |  2 ++
 .../mantid/api/src/Exports/WorkspaceGroup.cpp        |  2 ++
 .../api/src/Exports/WorkspaceGroupProperty.cpp       |  2 ++
 .../mantid/api/src/Exports/WorkspaceHistory.cpp      |  2 ++
 .../mantid/api/src/Exports/WorkspaceProperty.cpp     |  2 ++
 .../mantid/api/src/Exports/WorkspaceValidators.cpp   |  4 ++++
 .../mantid/geometry/src/Exports/BoundingBox.cpp      |  2 ++
 .../mantid/geometry/src/Exports/CompAssembly.cpp     |  2 ++
 .../mantid/geometry/src/Exports/Component.cpp        |  2 ++
 .../mantid/geometry/src/Exports/Detector.cpp         |  2 ++
 .../mantid/geometry/src/Exports/DetectorGroup.cpp    |  2 ++
 .../mantid/geometry/src/Exports/Goniometer.cpp       |  2 ++
 .../mantid/geometry/src/Exports/Group.cpp            |  2 ++
 .../mantid/geometry/src/Exports/ICompAssembly.cpp    |  2 ++
 .../mantid/geometry/src/Exports/IComponent.cpp       |  2 ++
 .../mantid/geometry/src/Exports/IDetector.cpp        |  2 ++
 .../mantid/geometry/src/Exports/IMDDimension.cpp     |  2 ++
 .../mantid/geometry/src/Exports/IObjComponent.cpp    |  2 ++
 .../mantid/geometry/src/Exports/Instrument.cpp       |  2 ++
 .../mantid/geometry/src/Exports/ObjCompAssembly.cpp  |  2 ++
 .../mantid/geometry/src/Exports/ObjComponent.cpp     |  2 ++
 .../mantid/geometry/src/Exports/Object.cpp           |  2 ++
 .../mantid/geometry/src/Exports/OrientedLattice.cpp  |  2 ++
 .../mantid/geometry/src/Exports/PeakShape.cpp        |  2 ++
 .../mantid/geometry/src/Exports/PointGroup.cpp       |  2 ++
 .../geometry/src/Exports/PointGroupFactory.cpp       |  2 ++
 .../geometry/src/Exports/RectangularDetector.cpp     |  4 ++++
 .../mantid/geometry/src/Exports/ReferenceFrame.cpp   |  2 ++
 .../mantid/geometry/src/Exports/SpaceGroup.cpp       |  2 ++
 .../geometry/src/Exports/SpaceGroupFactory.cpp       |  2 ++
 .../mantid/geometry/src/Exports/SymmetryElement.cpp  |  2 ++
 .../geometry/src/Exports/SymmetryElementFactory.cpp  |  2 ++
 .../geometry/src/Exports/SymmetryOperation.cpp       |  2 ++
 .../src/Exports/SymmetryOperationFactory.cpp         |  2 ++
 .../mantid/geometry/src/Exports/UnitCell.cpp         |  2 ++
 .../kernel/src/Exports/ArrayBoundedValidator.cpp     |  2 ++
 .../kernel/src/Exports/ArrayLengthValidator.cpp      |  2 ++
 .../mantid/kernel/src/Exports/ArrayProperty.cpp      |  2 ++
 .../mantid/kernel/src/Exports/BoundedValidator.cpp   |  2 ++
 .../mantid/kernel/src/Exports/CompositeValidator.cpp |  2 ++
 .../mantid/kernel/src/Exports/ConfigService.cpp      |  2 ++
 .../mantid/kernel/src/Exports/DataItem.cpp           |  2 ++
 .../mantid/kernel/src/Exports/DateAndTime.cpp        |  4 ++++
 .../mantid/kernel/src/Exports/DeltaEMode.cpp         |  2 ++
 .../kernel/src/Exports/EnabledWhenProperty.cpp       |  2 ++
 .../mantid/kernel/src/Exports/FacilityInfo.cpp       |  2 ++
 .../src/Exports/FilteredTimeSeriesProperty.cpp       |  2 ++
 .../mantid/kernel/src/Exports/IPropertyManager.cpp   |  2 ++
 .../mantid/kernel/src/Exports/IPropertySettings.cpp  |  2 ++
 .../mantid/kernel/src/Exports/IValidator.cpp         |  2 ++
 .../mantid/kernel/src/Exports/InstrumentInfo.cpp     |  2 ++
 .../mantid/kernel/src/Exports/ListValidator.cpp      |  2 ++
 .../mantid/kernel/src/Exports/LogFilter.cpp          |  2 ++
 .../mantid/kernel/src/Exports/Logger.cpp             |  2 ++
 .../mantid/kernel/src/Exports/MandatoryValidator.cpp |  2 ++
 .../mantid/kernel/src/Exports/Material.cpp           |  2 ++
 .../mantid/kernel/src/Exports/Memory.cpp             |  2 ++
 .../mantid/kernel/src/Exports/NullValidator.cpp      |  2 ++
 .../mantid/kernel/src/Exports/ProgressBase.cpp       |  2 ++
 .../mantid/kernel/src/Exports/Property.cpp           |  2 ++
 .../mantid/kernel/src/Exports/PropertyHistory.cpp    |  2 ++
 .../mantid/kernel/src/Exports/PropertyManager.cpp    |  2 ++
 .../mantid/kernel/src/Exports/PropertyWithValue.cpp  |  2 ++
 .../mantid/kernel/src/Exports/Quat.cpp               |  2 ++
 .../mantid/kernel/src/Exports/Statistics.cpp         |  2 ++
 .../mantid/kernel/src/Exports/StlContainers.cpp      |  2 ++
 .../mantid/kernel/src/Exports/TimeSeriesProperty.cpp | 12 ++++++++++++
 .../mantid/kernel/src/Exports/Unit.cpp               |  2 ++
 .../mantid/kernel/src/Exports/UnitConversion.cpp     |  2 ++
 .../mantid/kernel/src/Exports/UnitFactory.cpp        |  2 ++
 .../mantid/kernel/src/Exports/UnitLabel.cpp          |  2 ++
 .../mantid/kernel/src/Exports/Units.cpp              |  2 ++
 .../mantid/kernel/src/Exports/V3D.cpp                |  2 ++
 .../mantid/kernel/src/Exports/VMD.cpp                |  2 ++
 .../kernel/src/Exports/VisibleWhenProperty.cpp       |  2 ++
 132 files changed, 288 insertions(+)

diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
index 99e7e215f5d..eb372bd605f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp
@@ -38,7 +38,9 @@ namespace
   BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType3_Overload, PythonAlgorithm::declarePyAlgProperty, 4, 5)
 }
 
+// clang-format off
 void export_leaf_classes()
+// clang-format on
 {
 
   register_ptr_to_python<boost::shared_ptr<Algorithm>>();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
index 2b3feeae340..374187c08e7 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmFactory.cpp
@@ -107,7 +107,9 @@ GCC_DIAG_OFF(cast-qual)
 GCC_DIAG_ON(cast-qual)
 // clang-format on
 
+// clang-format off
 void export_AlgorithmFactory()
+// clang-format on
 {
 
   class_<AlgorithmFactoryImpl,boost::noncopyable>("AlgorithmFactoryImpl", no_init)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
index 6ebd0b981e5..3febd8e0af5 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmHistory.cpp
@@ -54,7 +54,9 @@ boost::python::object getPropertiesAsList(AlgorithmHistory& self)
   return names;
 }
 
+// clang-format off
 void export_AlgorithmHistory()
+// clang-format on
 {
   register_ptr_to_python<Mantid::API::AlgorithmHistory_sptr >();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
index 4296086b4f6..970a6999a46 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmManager.cpp
@@ -64,7 +64,9 @@ namespace
   ///@endcond
 }
 
+// clang-format off
 void export_AlgorithmManager()
+// clang-format on
 {
   typedef class_<AlgorithmManagerImpl,boost::noncopyable> PythonType;
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProperty.cpp
index 27eb76b69b3..532266fc430 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProperty.cpp
@@ -38,7 +38,9 @@ namespace
 
 }
 
+// clang-format off
 void export_AlgorithmProperty()
+// clang-format on
 {
   // AlgorithmProperty has base PropertyWithValue<boost::shared_ptr<IAlgorithm>>
   // which must be exported
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProxy.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProxy.cpp
index 34b4053367b..da3f99efa96 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProxy.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AlgorithmProxy.cpp
@@ -9,7 +9,9 @@
 using namespace Mantid::API;
 using namespace boost::python;
 
+// clang-format off
 void export_algorithm_proxy()
+// clang-format on
 {
 
   register_ptr_to_python<boost::shared_ptr<AlgorithmProxy>>();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp
index a2d181201d6..7723bf3eb02 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/AnalysisDataService.cpp
@@ -65,7 +65,9 @@ namespace
 
 }
 
+// clang-format off
 void export_AnalysisDataService()
+// clang-format on
 {
   typedef DataServiceExporter<AnalysisDataServiceImpl, Workspace_sptr> ADSExporter;
   auto pythonClass = ADSExporter::define("AnalysisDataServiceImpl");
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
index 4151bcbebf8..7ab4b583a6f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Axis.cpp
@@ -78,7 +78,9 @@ namespace
 }
 
 
+// clang-format off
 void export_Axis()
+// clang-format on
 {
   register_ptr_to_python<Axis*>();
 
@@ -119,7 +121,9 @@ Axis* createNumericAxis(int length)
   return new Mantid::API::NumericAxis(length);
 }
 
+// clang-format off
 void export_NumericAxis()
+// clang-format on
 {
   /// Exported so that Boost.Python can give back a NumericAxis class when an Axis* is returned
   class_< NumericAxis, bases<Axis>, boost::noncopyable >("NumericAxis", no_init)
@@ -143,7 +147,9 @@ Axis* createBinEdgeAxis(int length)
   return new Mantid::API::BinEdgeAxis(length);
 }
 
+// clang-format off
 void export_BinEdgeAxis()
+// clang-format on
 {
   /// Exported so that Boost.Python can give back a BinEdgeAxis class when an Axis* is returned
   class_< BinEdgeAxis, bases<NumericAxis>, boost::noncopyable >("BinEdgeAxis", no_init)
@@ -168,7 +174,9 @@ Axis* createTextAxis(int length)
 }
 
 
+// clang-format off
 void export_TextAxis()
+// clang-format on
 {
   class_< TextAxis, bases<Axis>, boost::noncopyable >("TextAxis", no_init)
     .def("setLabel", & TextAxis::setLabel, "Set the label at the given entry")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp
index e2f388a9d7b..ca1f13e7930 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BinaryOperations.cpp
@@ -14,7 +14,9 @@
 
 namespace Policies = Mantid::PythonInterface::Policies;
 
+// clang-format off
 void export_BinaryOperations()
+// clang-format on
 {
   using namespace Mantid::API;
   using boost::python::return_value_policy;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
index a77e0b319ad..950a9cdb187 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/BoxController.cpp
@@ -7,7 +7,9 @@
 using Mantid::API::BoxController;
 using namespace boost::python;
 
+// clang-format off
 void export_BoxController()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<BoxController>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/CatalogManager.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/CatalogManager.cpp
index 9104eead369..46bedf92c58 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/CatalogManager.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/CatalogManager.cpp
@@ -19,7 +19,9 @@ boost::python::object getActiveSessionsAsList(CatalogManagerImpl& self)
   return sessions;
 }
 
+// clang-format off
 void export_CatalogManager()
+// clang-format on
 {
   register_ptr_to_python<CatalogManagerImpl*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/CatalogSession.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/CatalogSession.cpp
index f888c6110c7..98532ffe0fa 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/CatalogSession.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/CatalogSession.cpp
@@ -7,7 +7,9 @@
 using Mantid::API::CatalogSession;
 using namespace boost::python;
 
+// clang-format off
 void export_CatalogSession()
+// clang-format on
 {
     register_ptr_to_python<boost::shared_ptr<CatalogSession> >();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
index a8bcac9e082..08a1b34c686 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/DataProcessorAlgorithm.cpp
@@ -14,7 +14,9 @@ namespace
   typedef Workspace_sptr(DataProcessorAdapter::*loadOverload2)(const std::string&, const bool);
 }
 
+// clang-format off
 void export_DataProcessorAlgorithm()
+// clang-format on
 {
   // for strings will actually create a list
   using Mantid::PythonInterface::Policies::VectorToNumpy;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/DeprecatedAlgorithmChecker.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/DeprecatedAlgorithmChecker.cpp
index 53f4cb6fa0e..821e324d7c9 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/DeprecatedAlgorithmChecker.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/DeprecatedAlgorithmChecker.cpp
@@ -50,7 +50,9 @@ namespace
   };
 }
 
+// clang-format off
 void export_DeprecatedAlgorithmChecker()
+// clang-format on
 {
   class_<DeprecatedAlgorithmChecker>("DeprecatedAlgorithmChecker", no_init)
     .def(init<const std::string&,int>((arg("algName"),arg("version")),"Constructs a DeprecatedAlgorithmChecker for the given algorithm & version. (-1 indicates latest version)"))
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
index b02c444f40f..e6dcc21ac75 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ExperimentInfo.cpp
@@ -13,7 +13,9 @@ using namespace boost::python;
 /// Overload generator for getInstrumentFilename
 BOOST_PYTHON_FUNCTION_OVERLOADS(getInstrumentFilename_Overload, ExperimentInfo::getInstrumentFilename, 1, 2)
 
+// clang-format off
 void export_ExperimentInfo()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<ExperimentInfo>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
index d4bec6851b0..12fdb1d5a8e 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FileFinder.cpp
@@ -11,7 +11,9 @@ namespace {
   BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getFullPathOverloader, getFullPath, 1, 2)
 }
 
+// clang-format off
 void export_FileFinder()
+// clang-format on
 {
   class_<FileFinderImpl, boost::noncopyable>("FileFinderImpl", no_init)
     .def("getFullPath", &FileFinderImpl::getFullPath,
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FileProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FileProperty.cpp
index 02749eae567..faa83923fff 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FileProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FileProperty.cpp
@@ -17,7 +17,9 @@ using Mantid::Kernel::PropertyWithValue;
 using Mantid::PythonInterface::Converters::PySequenceToVector;
 namespace bpl = boost::python;
 
+// clang-format off
 void export_ActionEnum()
+// clang-format on
 {
   bpl::enum_<FileProperty::FileAction>("FileAction")
         .value("Save", FileProperty::Save)
@@ -63,7 +65,9 @@ namespace
 
 }
 
+// clang-format off
 void export_FileProperty()
+// clang-format on
 {
   bpl::class_<FileProperty, bpl::bases<PropertyWithValue<std::string> >, boost::noncopyable>("FileProperty", bpl::no_init)
     .def("__init__",
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
index b917c6637eb..f47580ff37f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FrameworkManager.cpp
@@ -8,7 +8,9 @@ using Mantid::API::FrameworkManagerImpl;
 using Mantid::API::FrameworkManager;
 using namespace boost::python;
 
+// clang-format off
 void export_FrameworkManager()
+// clang-format on
 {
   class_<FrameworkManagerImpl,boost::noncopyable>("FrameworkManagerImpl", no_init)
     .def("setNumOMPThreadsToConfigValue", &FrameworkManagerImpl::setNumOMPThreadsToConfigValue,
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
index d00e88e34f3..e504e39e19e 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionFactory.cpp
@@ -86,7 +86,9 @@ namespace
   ///@endcond
 }
 
+// clang-format off
 void export_FunctionFactory()
+// clang-format on
 {
 
   class_<FunctionFactoryImpl,boost::noncopyable>("FunctionFactoryImpl", no_init)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionProperty.cpp
index 1f042a31cf6..ffbfbdb11b8 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/FunctionProperty.cpp
@@ -8,7 +8,9 @@ using Mantid::Kernel::PropertyWithValue;
 using Mantid::PythonInterface::PropertyWithValueExporter;
 using namespace boost::python;
 
+// clang-format off
 void export_FunctionProperty()
+// clang-format on
 {
   // FuncitonProperty has base PropertyWithValue<boost::shared_ptr<IFunction>>
   // which must be exported
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
index 07ef49a108f..2f5406854f3 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IAlgorithm.cpp
@@ -262,7 +262,9 @@ namespace
 
 }
 
+// clang-format off
 void export_ialgorithm()
+// clang-format on
 {
   class_<AlgorithmIDProxy>("AlgorithmID", no_init)
     .def(self == self)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventList.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventList.cpp
index 19fd218d92f..7537d8f60f8 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventList.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventList.cpp
@@ -20,7 +20,9 @@ using namespace boost::python;
 /// return_value_policy for copied numpy array
 typedef return_value_policy<Policies::VectorToNumpy> return_clone_numpy;
 
+// clang-format off
 void export_IEventList()
+// clang-format on
 {
   register_ptr_to_python<IEventList *>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspace.cpp
index 57bd6601a24..af2bfc0bea8 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspace.cpp
@@ -12,7 +12,9 @@ using namespace boost::python;
 /**
  * Python exports of the Mantid::API::IEventWorkspace class.
  */
+// clang-format off
 void export_IEventWorkspace()
+// clang-format on
 {
   class_<IEventWorkspace, bases<Mantid::API::MatrixWorkspace>, boost::noncopyable>("IEventWorkspace", no_init)
     .def("getNumberEvents", &IEventWorkspace::getNumberEvents, args("self"),
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspaceProperty.cpp
index 99afcf21875..241e1e9825b 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IEventWorkspaceProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidPythonInterface/api/WorkspacePropertyExporter.h"
 #include "MantidAPI/IEventWorkspace.h"
 
+// clang-format off
 void export_IEventWorkspaceProperty()
+// clang-format on
 {
   using Mantid::API::IEventWorkspace;
   using Mantid::PythonInterface::WorkspacePropertyExporter;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
index d43ac0538b7..292be1504f6 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp
@@ -44,7 +44,9 @@ namespace
   ///@endcond
 }
 
+// clang-format off
 void export_IFunction()
+// clang-format on
 {
 
   register_ptr_to_python<boost::shared_ptr<IFunction>>();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp
index 726caf7ea27..df88a040e9f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IFunction1D.cpp
@@ -8,7 +8,9 @@ using Mantid::PythonInterface::IFunction1DAdapter;
 using Mantid::PythonInterface::IFunctionAdapter;
 using namespace boost::python;
 
+// clang-format off
 void export_IFunction1D()
+// clang-format on
 {
   /**
    * The Python held type, boost::shared_ptr<IFunction1DAdapter>, allows
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
index 436f0544624..8bc61937167 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspace.cpp
@@ -15,7 +15,9 @@ namespace
   static const unsigned int NUM_EVENT_TYPES = 2;
 }
 
+// clang-format off
 void export_IMDEventWorkspace()
+// clang-format on
 {
   // MDEventWorkspace class
   class_< IMDEventWorkspace, bases<IMDWorkspace, MultipleExperimentInfos>,
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspaceProperty.cpp
index c0169c29fc0..74795da8d32 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDEventWorkspaceProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidPythonInterface/api/WorkspacePropertyExporter.h"
 #include "MantidAPI/IMDEventWorkspace.h"
 
+// clang-format off
 void export_IMDEventWorkspaceProperty()
+// clang-format on
 {
   using Mantid::API::IMDEventWorkspace;
   using Mantid::PythonInterface::WorkspacePropertyExporter;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
index b33c0331041..24ab708188f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspace.cpp
@@ -140,7 +140,9 @@ namespace
 
 }
 
+// clang-format off
 void export_IMDHistoWorkspace()
+// clang-format on
 {
   // IMDHistoWorkspace class
   class_< IMDHistoWorkspace, bases<IMDWorkspace,MultipleExperimentInfos>, boost::noncopyable >("IMDHistoWorkspace", no_init)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspaceProperty.cpp
index 7457356b21c..44e6346bf64 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDHistoWorkspaceProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidPythonInterface/api/WorkspacePropertyExporter.h"
 #include "MantidAPI/IMDHistoWorkspace.h"
 
+// clang-format off
 void export_IMDHistoWorkspaceProperty()
+// clang-format on
 {
   using Mantid::API::IMDHistoWorkspace;
   using Mantid::PythonInterface::WorkspacePropertyExporter;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp
index 5c728e614f8..8b0931b8389 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspace.cpp
@@ -9,7 +9,9 @@ using namespace Mantid::API;
 using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 
+// clang-format off
 void export_IMDWorkspace()
+// clang-format on
 {
   boost::python::enum_<Mantid::API::MDNormalization>("MDNormalization")
           .value("NoNormalization", Mantid::API::NoNormalization)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspaceProperty.cpp
index 23299662ed1..6c90bfc8c30 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IMDWorkspaceProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidPythonInterface/api/WorkspacePropertyExporter.h"
 #include "MantidAPI/IMDWorkspace.h"
 
+// clang-format off
 void export_IMDWorkspaceProperty()
+// clang-format on
 {
   using Mantid::API::IMDWorkspace;
   using Mantid::PythonInterface::WorkspacePropertyExporter;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
index e12912bc5a0..223e88b9fce 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeak.cpp
@@ -31,7 +31,9 @@ void setQSampleFrame2(IPeak &peak, Mantid::Kernel::V3D qSampleFrame, double dist
 
 }
 
+// clang-format off
 void export_IPeak()
+// clang-format on
 {
   register_ptr_to_python<IPeak*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
index c8589a927a7..ae238374b38 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeakFunction.cpp
@@ -7,7 +7,9 @@ using Mantid::API::IPeakFunction;
 using Mantid::PythonInterface::IPeakFunctionAdapter;
 using namespace boost::python;
 
+// clang-format off
 void export_IPeakFunction()
+// clang-format on
 {
   class_<IPeakFunction, bases<IFunction1D>, boost::shared_ptr<IPeakFunctionAdapter>,
           boost::noncopyable>("IPeakFunction")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
index 965bf50050c..9ea3e721fbc 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspace.cpp
@@ -33,7 +33,9 @@ IPeak* createPeakQLabWithDistance(IPeaksWorkspace & self, const object& data, do
 
 }
 
+// clang-format off
 void export_IPeaksWorkspace()
+// clang-format on
 {
   // IPeaksWorkspace class
   class_< IPeaksWorkspace, bases<ITableWorkspace, ExperimentInfo>, boost::noncopyable >("IPeaksWorkspace", no_init)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspaceProperty.cpp
index f98cc9dec62..c34674f7982 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IPeaksWorkspaceProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidPythonInterface/api/WorkspacePropertyExporter.h"
 #include "MantidAPI/IPeaksWorkspace.h"
 
+// clang-format off
 void export_IPeaksWorkspaceProperty()
+// clang-format on
 {
   using Mantid::API::IPeaksWorkspace;
   using Mantid::PythonInterface::WorkspacePropertyExporter;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
index 364740c5913..615caeda892 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ISpectrum.cpp
@@ -7,7 +7,9 @@ using Mantid::API::ISpectrum;
 using Mantid::detid_t;
 using namespace boost::python;
 
+// clang-format off
 void export_ISpectrum()
+// clang-format on
 {
   register_ptr_to_python<ISpectrum*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
index 0216ac789bd..6511a0fa089 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ISplittersWorkspace.cpp
@@ -7,7 +7,9 @@
 using namespace Mantid::API;
 using namespace boost::python;
 
+// clang-format off
 void export_IPeaksWorkspace()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<ISplittersWorkspace>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
index e892a1c8e4b..a614c7c8ae0 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspace.cpp
@@ -338,7 +338,9 @@ namespace
    }
 }
 
+// clang-format off
 void export_ITableWorkspace()
+// clang-format on
 {
   using Mantid::PythonInterface::Policies::VectorToNumpy;
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspaceProperty.cpp
index 28d6bc0abcf..2eeaa76e020 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ITableWorkspaceProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidPythonInterface/api/WorkspacePropertyExporter.h"
 #include "MantidAPI/ITableWorkspace.h"
 
+// clang-format off
 void export_ITableWorkspaceProperty()
+// clang-format on
 {
   using Mantid::API::ITableWorkspace;
   using Mantid::PythonInterface::WorkspacePropertyExporter;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
index 598d3d4ad74..ebff24c9de7 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/IWorkspaceProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidAPI/IWorkspaceProperty.h"
 #include <boost/python/class.hpp>
 
+// clang-format off
 void export_IWorkspaceProperty()
+// clang-format on
 {
   using namespace boost::python;
   using Mantid::API::IWorkspaceProperty;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/InstrumentValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/InstrumentValidator.cpp
index 45390cfe462..fc49fcd67d1 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/InstrumentValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/InstrumentValidator.cpp
@@ -8,7 +8,9 @@ using namespace boost::python;
 
 
 // This is typed on the ExperimentInfo class
+// clang-format off
 void export_InstrumentValidator()
+// clang-format on
 {
   TypedValidatorExporter<ExperimentInfo_sptr>::define("ExperimentInfoValidator");
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
index 690476a1930..ccd3830fe27 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Jacobian.cpp
@@ -5,7 +5,9 @@
 using Mantid::API::Jacobian;
 using namespace boost::python;
 
+// clang-format off
 void export_Jacobian()
+// clang-format on
 {
   register_ptr_to_python<Jacobian*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
index da17825399b..815cf0cb239 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MDGeometry.cpp
@@ -36,7 +36,9 @@ namespace
 
 }
 
+// clang-format off
 void export_MDGeometry()
+// clang-format on
 {
   class_<MDGeometry,boost::noncopyable>("MDGeometry", no_init)
     .def("getNumDims", &MDGeometry::getNumDims, "Returns the number of dimensions present")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
index c2ed44869bd..326886edf0d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspace.cpp
@@ -127,7 +127,9 @@ namespace
 }
 
 /** Python exports of the Mantid::API::MatrixWorkspace class. */
+// clang-format off
 void export_MatrixWorkspace()
+// clang-format on
 {
   /// Typedef to remove const qualifier on input detector shared_ptr. See Policies/RemoveConst.h for more details
   typedef double (MatrixWorkspace::*getDetectorSignature)(Mantid::Geometry::IDetector_sptr det) const;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspaceProperty.cpp
index 481f3c9a311..1f7f7633997 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MatrixWorkspaceProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidPythonInterface/api/WorkspacePropertyExporter.h"
 #include "MantidAPI/MatrixWorkspace.h"
 
+// clang-format off
 void export_MatrixWorkspaceProperty()
+// clang-format on
 {
   using Mantid::API::MatrixWorkspace;
   using Mantid::PythonInterface::WorkspacePropertyExporter;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
index e84dca45699..b0570359ba9 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MultipleExperimentInfos.cpp
@@ -6,7 +6,9 @@ using Mantid::API::MultipleExperimentInfos;
 using Mantid::API::ExperimentInfo_sptr;
 using namespace boost::python;
 
+// clang-format off
 void export_MultipleExperimentInfos()
+// clang-format on
 {
   class_<MultipleExperimentInfos,boost::noncopyable>("MultipleExperimentInfos", no_init)
       .def("getExperimentInfo", (ExperimentInfo_sptr(MultipleExperimentInfos::*)(const uint16_t) ) &MultipleExperimentInfos::getExperimentInfo,
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MultipleFileProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MultipleFileProperty.cpp
index e121994dbc5..7c7e4196d73 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MultipleFileProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/MultipleFileProperty.cpp
@@ -55,7 +55,9 @@ namespace
   }
 }
 
+// clang-format off
 void export_MultipleFileProperty()
+// clang-format on
 {
   typedef PropertyWithValue<HeldType> BaseClass;
   PropertyWithValueExporter<HeldType>::define("VectorVectorStringPropertyWithValue");
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Progress.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Progress.cpp
index 05da2bcef07..5260c3d0099 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Progress.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Progress.cpp
@@ -9,7 +9,9 @@ using Mantid::API::Algorithm;
 using Mantid::Kernel::ProgressBase;
 using namespace boost::python;
 
+// clang-format off
 void export_Progress()
+// clang-format on
 {
   class_<Progress,
          bases<ProgressBase>,
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
index b1045d4837f..3aef685af33 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Projection.cpp
@@ -100,7 +100,9 @@ Projection_sptr projCtor3(
 
 } //anonymous namespace
 
+// clang-format off
 void export_Projection()
+// clang-format on
 {
   class_<Projection>(
     "Projection",
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/PropertyHistory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/PropertyHistory.cpp
index 3d1be876fd7..e1af05fc98d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/PropertyHistory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/PropertyHistory.cpp
@@ -10,7 +10,9 @@ using Mantid::Kernel::PropertyHistory;
 using Mantid::API::IAlgorithm;
 using namespace boost::python;
 
+// clang-format off
 void export_PropertyHistory()
+// clang-format on
 {
   register_ptr_to_python<PropertyHistory*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/PropertyManagerDataService.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/PropertyManagerDataService.cpp
index 19b8cbb58a8..157a454a24c 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/PropertyManagerDataService.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/PropertyManagerDataService.cpp
@@ -15,7 +15,9 @@ using namespace boost::python;
 /// Weak pointer to DataItem typedef
 typedef boost::weak_ptr<PropertyManager> PropertyManager_wptr;
 
+// clang-format off
 void export_PropertyManagerDataService()
+// clang-format on
 {
 
   register_ptr_to_python<PropertyManager_wptr>();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
index e83d7784d16..dc253da4b81 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Run.cpp
@@ -111,7 +111,9 @@ namespace
 
 }
 
+// clang-format off
 void export_Run()
+// clang-format on
 {
   //Pointer
   register_ptr_to_python<Run*>();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
index 232dda2f067..1da621ce987 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Sample.cpp
@@ -10,7 +10,9 @@ using Mantid::Geometry::OrientedLattice;
 using Mantid::Kernel::Material;
 using namespace boost::python;
 
+// clang-format off
 void export_Sample()
+// clang-format on
 {
   register_ptr_to_python<Sample*>();
   register_ptr_to_python<boost::shared_ptr<Sample> >();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
index 206afe3f75c..b655a853a55 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepository.cpp
@@ -77,7 +77,9 @@ namespace
   /** @endcond */
 }
 
+// clang-format off
 void export_ScriptRepository()
+// clang-format on
 {
 
   register_ptr_to_python<boost::shared_ptr<ScriptRepository>>();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepositoryFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepositoryFactory.cpp
index 6b7d223e588..ec3af278f39 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepositoryFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/ScriptRepositoryFactory.cpp
@@ -16,7 +16,9 @@ namespace
   ///@endcond
 }
 
+// clang-format off
 void export_ScriptRepositoryFactory()
+// clang-format on
 {
   class_<ScriptRepositoryFactoryImpl,boost::noncopyable>("ScriptRepositoryFactory", no_init)
       .def("create", &ScriptRepositoryFactoryImpl::create,
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
index 11dd4f9b8bf..20da316f150 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/Workspace.cpp
@@ -17,7 +17,9 @@ namespace
   ///@endcond
 }
 
+// clang-format off
 void export_Workspace()
+// clang-format on
 {
   class_<Workspace, bases<DataItem>, boost::noncopyable>("Workspace", no_init)
     .def("getName", &Workspace::getName, return_value_policy<copy_const_reference>(), 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
index e7cc6802b0f..775bcaa2dcf 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceFactory.cpp
@@ -39,7 +39,9 @@ namespace
   BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(createPeaks_Overload, createPeaks, 0, 1)
 }
 
+// clang-format off
 void export_WorkspaceFactory()
+// clang-format on
 {
   const char * createFromParentDoc = "Create a workspace based on the given one. The meta-data, instrument etc are copied from the input"
       "If the size parameters are passed then the workspace will be a different size.";
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
index 494562d4564..67de0e52e7f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroup.cpp
@@ -10,7 +10,9 @@ using Mantid::PythonInterface::Registry::DataItemInterface;
 using namespace boost::python;
 namespace Policies = Mantid::PythonInterface::Policies;
 
+// clang-format off
 void export_WorkspaceGroup() 
+// clang-format on
 {
   class_< WorkspaceGroup, bases<Workspace>, boost::noncopyable >("WorkspaceGroup", no_init)
     .def("getNumberOfEntries", &WorkspaceGroup::getNumberOfEntries, "Returns the number of entries in the group")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroupProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroupProperty.cpp
index 5fc61cf55e6..ef7cfb1a905 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroupProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceGroupProperty.cpp
@@ -1,7 +1,9 @@
 #include "MantidPythonInterface/api/WorkspacePropertyExporter.h"
 #include "MantidAPI/WorkspaceGroup.h"
 
+// clang-format off
 void export_WorkspaceGroupProperty()
+// clang-format on
 {
   using Mantid::API::WorkspaceGroup;
   using Mantid::PythonInterface::WorkspacePropertyExporter;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
index 7875df88036..175af51dc42 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceHistory.cpp
@@ -35,7 +35,9 @@ boost::python::object getHistoriesAsList(WorkspaceHistory& self)
   return names;
 }
 
+// clang-format off
 void export_WorkspaceHistory()
+// clang-format on
 {
   register_ptr_to_python<WorkspaceHistory*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceProperty.cpp
index d147a1402cb..a6ba97642d7 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceProperty.cpp
@@ -2,7 +2,9 @@
 #include "MantidAPI/Workspace.h"
 #include <boost/python/enum.hpp>
 
+// clang-format off
 void export_WorkspaceProperty()
+// clang-format on
 {
   using Mantid::API::PropertyMode;
   // Property and Lock mode enums
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceValidators.cpp b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceValidators.cpp
index 593da16e88a..9ff38ace9cc 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceValidators.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/api/src/Exports/WorkspaceValidators.cpp
@@ -7,7 +7,9 @@ using Mantid::PythonInterface::TypedValidatorExporter;
 using namespace boost::python;
 
 /// This is the base TypedValidator for most of the WorkspaceValidators
+// clang-format off
 void export_MatrixWorkspaceValidator()
+// clang-format on
 {
   using Mantid::API::MatrixWorkspace_sptr;
   using Mantid::API::MatrixWorkspaceValidator;
@@ -44,7 +46,9 @@ void export_MatrixWorkspaceValidator()
           init<ArgType>(arg(ArgName)=DefaultValue, DocString))\
    ;
 
+// clang-format off
 void export_WorkspaceValidators()
+// clang-format on
 {
   using namespace Mantid::API;
   
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
index 015dc563df2..207c55d8ba3 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/BoundingBox.cpp
@@ -6,7 +6,9 @@ using Mantid::Geometry::BoundingBox;
 using Mantid::Kernel::V3D;
 using namespace boost::python;
 
+// clang-format off
 void export_BoundingBox()
+// clang-format on
 {
   class_<BoundingBox>("BoundingBox", "Constructs a zero-sized box")
     .def(init<double, double, double, double, double, double>(
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/CompAssembly.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/CompAssembly.cpp
index 9ae85503981..1362f10ebc7 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/CompAssembly.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/CompAssembly.cpp
@@ -10,7 +10,9 @@ using namespace boost::python;
  * Enables boost.python to automatically "cast" an object up to the
  * appropriate CompAssembly leaf type 
  */
+// clang-format off
 void export_CompAssembly()
+// clang-format on
 {
   class_<CompAssembly, bases<ICompAssembly, Component>, boost::noncopyable>("CompAssembly", no_init)
     ;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
index 02856d5765b..a83a0c9cb79 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Component.cpp
@@ -22,7 +22,9 @@ namespace
 
 }
 
+// clang-format off
 void export_Component()
+// clang-format on
 {
   class_<Component, bases<IComponent>, boost::noncopyable>("Component", no_init)
     .def("getParameterNames", &Component::getParameterNames, Component_getParameterNames())
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Detector.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Detector.cpp
index 33711dd7582..091bb7c5a0c 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Detector.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Detector.cpp
@@ -10,7 +10,9 @@ using namespace boost::python;
  * Enables boost.python to automatically "cast" an object up to the
  * appropriate Detector leaf type 
  */
+// clang-format off
 void export_Detector()
+// clang-format on
 {
   class_<Detector, bases<IDetector, ObjComponent>, boost::noncopyable>("Detector", no_init)
     ;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
index f83aaef0afa..c32cc878400 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorGroup.cpp
@@ -5,7 +5,9 @@ using Mantid::Geometry::DetectorGroup;
 using Mantid::Geometry::IDetector;
 using namespace boost::python;
 
+// clang-format off
 void export_DetectorGroup()
+// clang-format on
 {
   class_<DetectorGroup, bases<IDetector>, boost::noncopyable>("DetectorGroup", no_init)
     .def("getDetectorIDs", &DetectorGroup::getDetectorIDs, "Returns the list of detector IDs within this group")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
index 74b37cfebea..b3e268583f4 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Goniometer.cpp
@@ -24,7 +24,9 @@ namespace //<unnamed>
   }
 }
 
+// clang-format off
 void export_Goniometer()
+// clang-format on
 {
 
   // return_value_policy for read-only numpy array
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
index 1c12be9b7f0..0eab2da92d5 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Group.cpp
@@ -23,7 +23,9 @@ namespace {
     }
 }
 
+// clang-format off
 void export_Group()
+// clang-format on
 {
   enum_<Group::CoordinateSystem>("CoordinateSystem")
       .value("Orthogonal", Group::Orthogonal)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
index 5e034c71bcf..5b1a3e9e446 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ICompAssembly.cpp
@@ -6,7 +6,9 @@ using Mantid::Geometry::ICompAssembly;
 using Mantid::Geometry::IComponent;
 using namespace boost::python;
 
+// clang-format off
 void export_ICompAssembly()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<ICompAssembly>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
index 46161d9e0f0..c1e2e2c80d7 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IComponent.cpp
@@ -25,7 +25,9 @@ namespace
 
 }
 
+// clang-format off
 void export_IComponent()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<IComponent>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
index 69bb41f1898..ce251b6f7c4 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IDetector.cpp
@@ -6,7 +6,9 @@ using Mantid::Geometry::IDetector;
 using Mantid::Geometry::IObjComponent;
 using namespace boost::python;
 
+// clang-format off
 void export_IDetector()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<IDetector>>();
   
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
index 53d53027bb1..122dbe8a728 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IMDDimension.cpp
@@ -20,7 +20,9 @@ namespace
   }
 }
 
+// clang-format off
 void export_IMDDimension()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<IMDDimension>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
index c893ff5ba0b..1586524e18e 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/IObjComponent.cpp
@@ -20,7 +20,9 @@ namespace
   }
 }
 
+// clang-format off
 void export_IObjComponent()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<IObjComponent>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
index b1d3ba2f116..52c46fc5873 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Instrument.cpp
@@ -10,7 +10,9 @@ using Mantid::detid_t;
 using namespace boost::python;
 using Mantid::PythonInterface::Policies::RemoveConstSharedPtr;
 
+// clang-format off
 void export_Instrument()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<Instrument>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ObjCompAssembly.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ObjCompAssembly.cpp
index 2c239635a51..bd3f6fbee5f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ObjCompAssembly.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ObjCompAssembly.cpp
@@ -8,7 +8,9 @@ using Mantid::Geometry::ICompAssembly;
 using Mantid::Geometry::ObjComponent;
 using namespace boost::python;
 
+// clang-format off
 void export_ObjCompAssembly()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<ObjCompAssembly>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ObjComponent.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ObjComponent.cpp
index eaa0c2e310c..61f7b9adad5 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ObjComponent.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ObjComponent.cpp
@@ -6,7 +6,9 @@ using Mantid::Geometry::IObjComponent;
 using Mantid::Geometry::Component;
 using namespace boost::python;
 
+// clang-format off
 void export_ObjComponent()
+// clang-format on
 {
   class_<ObjComponent, boost::python::bases<IObjComponent, Component>, boost::noncopyable>("ObjComponent", no_init)
     ;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
index af1c7ac7376..bd5810cec00 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/Object.cpp
@@ -7,7 +7,9 @@ using Mantid::Geometry::Object;
 using Mantid::Geometry::BoundingBox;
 using namespace boost::python;
 
+// clang-format off
 void export_Object()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<Object>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
index 6204d5f4c8e..c64c2e35ed4 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/OrientedLattice.cpp
@@ -46,7 +46,9 @@ namespace //<unnamed>
 
 }
 
+// clang-format off
 void export_OrientedLattice()
+// clang-format on
 {
   /// return_value_policy for read-only numpy array
   typedef return_value_policy<Policies::MatrixToNumpy<Converters::WrapReadOnly> > return_readonly_numpy;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
index d73179460a2..095c373388c 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PeakShape.cpp
@@ -6,7 +6,9 @@ using Mantid::Geometry::PeakShape;
 using namespace boost::python;
 
 
+// clang-format off
 void export_PeakShape()
+// clang-format on
 {
   register_ptr_to_python<Mantid::Geometry::PeakShape_sptr>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
index ded37c8fca9..b1410156a08 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroup.cpp
@@ -40,7 +40,9 @@ namespace //<unnamed>
   }
 }
 
+// clang-format off
 void export_PointGroup()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<PointGroup> >();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
index 17097ab43f2..82ba14acbe9 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/PointGroupFactory.cpp
@@ -19,7 +19,9 @@ namespace {
     }
 }
 
+// clang-format off
 void export_PointGroupFactory()
+// clang-format on
 {
 
     class_<PointGroupFactoryImpl,boost::noncopyable>("PointGroupFactoryImpl", no_init)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
index 53b01d504d0..7131f5f2b47 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/RectangularDetector.cpp
@@ -11,7 +11,9 @@ using namespace boost::python;
  * Enables boost.python to automatically "cast" an object up to the
  * appropriate Detector leaf type 
  */
+// clang-format off
 void export_RectangularDetector()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<RectangularDetector>>();
 
@@ -33,7 +35,9 @@ void export_RectangularDetector()
     ;
 }
 
+// clang-format off
 void export_RectangularDetectorPixel()
+// clang-format on
 {
   class_<RectangularDetectorPixel, bases<Detector>, boost::noncopyable>("RectangularDetectorPixel", no_init)
     ;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
index d5e1a4500d5..78ecba343f0 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/ReferenceFrame.cpp
@@ -9,7 +9,9 @@ using Mantid::Geometry::ReferenceFrame;
 using Mantid::Kernel::V3D;
 using namespace boost::python;
 
+// clang-format off
 void export_ReferenceFrame()
+// clang-format on
 {
   using namespace Mantid::Geometry;
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
index ba7a58c1575..82fcc26a38d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroup.cpp
@@ -33,7 +33,9 @@ namespace //<unnamed>
 
 }
 
+// clang-format off
 void export_SpaceGroup()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<SpaceGroup> >();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
index 52fa370c732..a7f266ace39 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SpaceGroupFactory.cpp
@@ -38,7 +38,9 @@ namespace
 
 }
 
+// clang-format off
 void export_SpaceGroupFactory()
+// clang-format on
 {
 
     class_<SpaceGroupFactoryImpl,boost::noncopyable>("SpaceGroupFactoryImpl", no_init)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
index b32232a7c01..497380d38fb 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElement.cpp
@@ -19,7 +19,9 @@ namespace {
     }
 }
 
+// clang-format off
 void export_SymmetryElement()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<SymmetryElement> >();  
   scope symmetryElementScope = class_<SymmetryElement, boost::noncopyable>("SymmetryElement", no_init);
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
index e9b8fbce249..d35fb43969f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryElementFactory.cpp
@@ -5,7 +5,9 @@
 using namespace Mantid::Geometry;
 using namespace boost::python;
 
+// clang-format off
 void export_SymmetryElementFactory()
+// clang-format on
 {
     class_<SymmetryElementFactoryImpl,boost::noncopyable>("SymmetryElementFactoryImpl", no_init)
             .def("createSymElement", &SymmetryElementFactoryImpl::createSymElement, "Creates the symmetry element that corresponds to the supplied symmetry operation.")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
index 59d75917621..05a248a3511 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperation.cpp
@@ -28,7 +28,9 @@ namespace //<unnamed>
   }
 }
 
+// clang-format off
 void export_SymmetryOperation()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<SymmetryOperation> >();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
index 436815a0ae2..1d3a7a92583 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/SymmetryOperationFactory.cpp
@@ -21,7 +21,9 @@ namespace {
 
 }
 
+// clang-format off
 void export_SymmetryOperationFactory()
+// clang-format on
 {
     class_<SymmetryOperationFactoryImpl,boost::noncopyable>("SymmetryOperationFactoryImpl", no_init)
             .def("exists", &SymmetryOperationFactoryImpl::isSubscribed, "Returns true if the symmetry operation is supplied.")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
index 471f301bbae..fc71b88a46f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/src/Exports/UnitCell.cpp
@@ -28,7 +28,9 @@ namespace //<unnamed>
   }
 }
 
+// clang-format off
 void export_UnitCell()
+// clang-format on
 {
   enum_<AngleUnits>("AngleUnits")
     .value("Degrees", angDegrees)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayBoundedValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayBoundedValidator.cpp
index b255501eef4..93c36da8c28 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayBoundedValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayBoundedValidator.cpp
@@ -27,7 +27,9 @@ namespace
 
 }
 
+// clang-format off
 void export_ArrayBoundedValidator()
+// clang-format on
 {
   EXPORT_ARRAYBOUNDEDVALIDATOR(double, Float);
   EXPORT_ARRAYBOUNDEDVALIDATOR(long, Int);
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayLengthValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayLengthValidator.cpp
index 6504f388889..58fed5853ca 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayLengthValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayLengthValidator.cpp
@@ -34,7 +34,9 @@ namespace
   ;
 }
 
+// clang-format off
 void export_ArrayLengthValidator()
+// clang-format on
 {
   EXPORT_LENGTHVALIDATOR(double, Float);
   EXPORT_LENGTHVALIDATOR(long, Int);
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayProperty.cpp
index b1087288d27..80fb6fce003 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ArrayProperty.cpp
@@ -88,7 +88,9 @@ namespace
 
 }
 
+// clang-format off
 void export_ArrayProperty()
+// clang-format on
 {
   // Match the python names to their C types
   EXPORT_ARRAY_PROP(double,Float);
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/BoundedValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/BoundedValidator.cpp
index e0129e22ab5..725aa11e9ec 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/BoundedValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/BoundedValidator.cpp
@@ -83,7 +83,9 @@ namespace
     ;
 }
 
+// clang-format off
 void export_BoundedValidator()
+// clang-format on
 {
   EXPORT_BOUNDEDVALIDATOR(double, Float);
   EXPORT_BOUNDEDVALIDATOR(long, Int);
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/CompositeValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/CompositeValidator.cpp
index 3222a68833a..64c202f1b2d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/CompositeValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/CompositeValidator.cpp
@@ -36,7 +36,9 @@ namespace
   }
 }
 
+// clang-format off
 void export_CompositeValidator()
+// clang-format on
 {
   class_<CompositeValidator, bases<IValidator>, boost::noncopyable>("CompositeValidator")
     .def("__init__", make_constructor(&createCompositeValidator, default_call_policies(),
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
index 8d6d56263ed..1cb3e06dce6 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ConfigService.cpp
@@ -36,7 +36,9 @@ namespace
   BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(getString_Overload, getString, 1, 2)
 }
 
+// clang-format off
 void export_ConfigService()
+// clang-format on
 {
   using Mantid::PythonInterface::std_vector_exporter;
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DataItem.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DataItem.cpp
index e90ce011f8e..ddcfd758bfc 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DataItem.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DataItem.cpp
@@ -6,7 +6,9 @@
 using Mantid::Kernel::DataItem;
 using namespace boost::python;
 
+// clang-format off
 void export_DataItem()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<DataItem>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp
index a7c64fc9277..8c567746bd6 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DateAndTime.cpp
@@ -15,7 +15,9 @@ std::string ISO8601StringPlusSpace(DateAndTime & self)
   return self.toISO8601String()+" ";
 }
 
+// clang-format off
 void export_DateAndTime()
+// clang-format on
 {
   class_<DateAndTime>("DateAndTime", no_init)
     // Constructors
@@ -39,7 +41,9 @@ void export_DateAndTime()
   ;
 }
 
+// clang-format off
 void export_time_duration()
+// clang-format on
 {
   class_<time_duration>("time_duration", no_init)
     .def("hours", &time_duration::hours, "Returns the normalized number of hours")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DeltaEMode.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DeltaEMode.cpp
index 325e1683c9b..95805dd2073 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DeltaEMode.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/DeltaEMode.cpp
@@ -9,7 +9,9 @@ using Mantid::Kernel::DeltaEMode;
 namespace Policies = Mantid::PythonInterface::Policies;
 using namespace boost::python;
 
+// clang-format off
 void export_DeltaEMode()
+// clang-format on
 {
   enum_<Mantid::Kernel::DeltaEMode::Type>("DeltaEModeType")
     .value("Elastic", DeltaEMode::Elastic)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/EnabledWhenProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/EnabledWhenProperty.cpp
index d2b8a15ee8e..37a4485452b 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/EnabledWhenProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/EnabledWhenProperty.cpp
@@ -5,7 +5,9 @@
 using namespace Mantid::Kernel;
 using namespace boost::python;
 
+// clang-format off
 void export_EnabledWhenProperty()
+// clang-format on
 {
   // State enumeration
   enum_<ePropertyCriterion>("PropertyCriterion")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FacilityInfo.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FacilityInfo.cpp
index 7d8144fb52e..05cadb4de7b 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FacilityInfo.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FacilityInfo.cpp
@@ -7,7 +7,9 @@ using Mantid::Kernel::FacilityInfo;
 using Mantid::Kernel::InstrumentInfo;
 using namespace boost::python;
 
+// clang-format off
 void export_FacilityInfo()
+// clang-format on
 {
 
   register_ptr_to_python<FacilityInfo*>();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FilteredTimeSeriesProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FilteredTimeSeriesProperty.cpp
index 9d29696e5f7..49b3e1adfc5 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FilteredTimeSeriesProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/FilteredTimeSeriesProperty.cpp
@@ -24,7 +24,9 @@ namespace
       ;
 }
 
+// clang-format off
 void export_FilteredTimeSeriesProperty()
+// clang-format on
 {
   EXPORT_FILTEREDTIMESERIES_PROP(double, Float);
   EXPORT_FILTEREDTIMESERIES_PROP(bool, Bool);
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IPropertyManager.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IPropertyManager.cpp
index d40c6cb68a6..4e686b53126 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IPropertyManager.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IPropertyManager.cpp
@@ -120,7 +120,9 @@ namespace
 
 }
 
+// clang-format off
 void export_IPropertyManager()
+// clang-format on
 {
   register_ptr_to_python<IPropertyManager*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IPropertySettings.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IPropertySettings.cpp
index 5e8d17528be..426df48a16b 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IPropertySettings.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IPropertySettings.cpp
@@ -6,7 +6,9 @@
 using Mantid::Kernel::IPropertySettings;
 using namespace boost::python;
 
+// clang-format off
 void export_IPropertySettings()
+// clang-format on
 {
   register_ptr_to_python<IPropertySettings*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IValidator.cpp
index 44f793b69fc..995e528b72c 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/IValidator.cpp
@@ -5,7 +5,9 @@
 using Mantid::Kernel::IValidator;
 using namespace boost::python;
 
+// clang-format off
 void export_IValidator()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<IValidator>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/InstrumentInfo.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/InstrumentInfo.cpp
index 6ec736305bd..361bfa76ec3 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/InstrumentInfo.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/InstrumentInfo.cpp
@@ -7,7 +7,9 @@
 using Mantid::Kernel::InstrumentInfo;
 using namespace boost::python;
 
+// clang-format off
 void export_InstrumentInfo()
+// clang-format on
 {
   using namespace Mantid::PythonInterface;
   std_vector_exporter<InstrumentInfo>::wrap("std_vector_InstrumentInfo");
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ListValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ListValidator.cpp
index be87143732b..e1f5c4b1583 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ListValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ListValidator.cpp
@@ -39,7 +39,9 @@ namespace
 
 }
 
+// clang-format off
 void export_ListValidator()
+// clang-format on
 {
   EXPORT_LISTVALIDATOR(std::string, String);
   EXPORT_LISTVALIDATOR(long, Int);
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/LogFilter.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/LogFilter.cpp
index 6647cea5116..f837a843588 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/LogFilter.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/LogFilter.cpp
@@ -8,7 +8,9 @@ using Mantid::Kernel::Property;
 
 using namespace boost::python;
 
+// clang-format off
 void export_LogFilter()
+// clang-format on
 {
   class_<LogFilter,boost::noncopyable>("LogFilter", 
                                         init<const Property*>("Creates a log filter using the log to be filtered"))
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Logger.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Logger.cpp
index abf45b7d820..ccd697878b9 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Logger.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Logger.cpp
@@ -20,7 +20,9 @@ namespace
   }
 }
 
+// clang-format off
 void export_Logger()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<Logger>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/MandatoryValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/MandatoryValidator.cpp
index 98a389f0f2f..debfe9081c2 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/MandatoryValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/MandatoryValidator.cpp
@@ -15,7 +15,9 @@ namespace
     ;
 }
 
+// clang-format off
 void export_MandatoryValidator()
+// clang-format on
 {
   EXPORT_MANDATORYVALIDATOR(double, Float);
   EXPORT_MANDATORYVALIDATOR(long, Int);
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Material.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Material.cpp
index 9de29e96cd4..37436b0ff2a 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Material.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Material.cpp
@@ -9,7 +9,9 @@ using Mantid::Kernel::Material;
 using Mantid::PhysicalConstants::NeutronAtom;
 using namespace boost::python;
 
+// clang-format off
 void export_Material()
+// clang-format on
 {
   register_ptr_to_python<Material*>();
   register_ptr_to_python<boost::shared_ptr<Material> >();
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Memory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Memory.cpp
index 46e6432c8ee..4707cf36f21 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Memory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Memory.cpp
@@ -4,7 +4,9 @@
 using Mantid::Kernel::MemoryStats;
 using namespace boost::python;
 
+// clang-format off
 void export_MemoryStats()
+// clang-format on
 {
 
   class_< MemoryStats>("MemoryStats", init<>("Construct MemoryStats object."))
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/NullValidator.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/NullValidator.cpp
index 39418a1cbbc..0cf927b618d 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/NullValidator.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/NullValidator.cpp
@@ -7,7 +7,9 @@ using Mantid::Kernel::NullValidator;
 using Mantid::Kernel::IValidator;
 using namespace boost::python;
 
+// clang-format off
 void export_NullValidator()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<NullValidator>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ProgressBase.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ProgressBase.cpp
index 6943676f17c..9fb35344e36 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ProgressBase.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/ProgressBase.cpp
@@ -4,7 +4,9 @@
 using Mantid::Kernel::ProgressBase;
 using namespace boost::python;
 
+// clang-format off
 void export_ProgressBase()
+// clang-format on
 {
   class_<ProgressBase,boost::noncopyable>("ProgressBase", no_init)
     .def("report", (void (ProgressBase::*)())&ProgressBase::report, "Increment the progress by 1 and report with no message")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp
index 1b85f6db92a..5ecd1107e12 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Property.cpp
@@ -16,7 +16,9 @@ using Mantid::PythonInterface::std_vector_exporter;
 using namespace boost::python;
 
 
+// clang-format off
 void export_Property()
+// clang-format on
 {
   register_ptr_to_python<Property*>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyHistory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyHistory.cpp
index 78f829ce76b..5915f2910f9 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyHistory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyHistory.cpp
@@ -9,7 +9,9 @@
 using Mantid::Kernel::PropertyHistory;
 using namespace boost::python;
 
+// clang-format off
 void export_PropertyHistory()
+// clang-format on
 {
   register_ptr_to_python<Mantid::Kernel::PropertyHistory_sptr>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManager.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManager.cpp
index f958225431e..c7b6b16f035 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManager.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyManager.cpp
@@ -26,7 +26,9 @@ namespace
 
 }
 
+// clang-format off
 void export_PropertyManager()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<PropertyManager>>();
   class_<PropertyManager, bases<IPropertyManager>, boost::noncopyable>("PropertyManager")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyWithValue.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyWithValue.cpp
index 7560ad24547..a7eb9bd5f20 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyWithValue.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/PropertyWithValue.cpp
@@ -2,7 +2,9 @@
 
 using Mantid::PythonInterface::PropertyWithValueExporter;
 
+// clang-format off
 void export_BasicPropertyWithValueTypes()
+// clang-format on
 {
   // cut down copy-and-paste code
 #define EXPORT_PROP(CType, ExportName) \
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Quat.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Quat.cpp
index 94f32da0902..0c34adcab33 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Quat.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Quat.cpp
@@ -18,7 +18,9 @@ using boost::python::return_value_policy;
 /**
  * Python exports of the Mantid::Kernel::Quat class.
  */
+// clang-format off
 void export_Quat()
+// clang-format on
 {
   //Quat class
   class_< Quat >("Quat", "Quaternions are the 3D generalization of complex numbers. "
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
index 3bfa9244083..94a0138cb1b 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Statistics.cpp
@@ -213,7 +213,9 @@ namespace
 
 // -------------------------------------- Exports start here --------------------------------------
 
+// clang-format off
 void export_Statistics()
+// clang-format on
 {
   // typedef std::vector --> numpy array result converter
   typedef return_value_policy<Policies::VectorToNumpy> ReturnNumpyArray;
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/StlContainers.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/StlContainers.cpp
index 42853b3c485..95251d4eeee 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/StlContainers.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/StlContainers.cpp
@@ -5,7 +5,9 @@
 using Mantid::PythonInterface::std_vector_exporter;
 using Mantid::PythonInterface::std_set_exporter;
 
+// clang-format off
 void exportStlContainers()
+// clang-format on
 {
     // Export some frequently used stl containers
   // std::vector
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
index 2f9bf530009..e40411537a4 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/TimeSeriesProperty.cpp
@@ -40,33 +40,45 @@ namespace
       ;
 }
 
+// clang-format off
 void export_TimeSeriesProperty_Double()
+// clang-format on
 {
   EXPORT_TIMESERIES_PROP(double, Float);
 }
 
+// clang-format off
 void export_TimeSeriesProperty_Bool()
+// clang-format on
 {
   EXPORT_TIMESERIES_PROP(bool, Bool);
 }
 
+// clang-format off
 void export_TimeSeriesProperty_Int32()
+// clang-format on
 {
   EXPORT_TIMESERIES_PROP(int32_t, Int32);
 }
 
+// clang-format off
 void export_TimeSeriesProperty_Int64()
+// clang-format on
 {
   EXPORT_TIMESERIES_PROP(int64_t, Int64);
 }
 
+// clang-format off
 void export_TimeSeriesProperty_String()
+// clang-format on
 {
   EXPORT_TIMESERIES_PROP(std::string, String);
 }
 
 
+// clang-format off
 void export_TimeSeriesPropertyStatistics()
+// clang-format on
 {
   class_<Mantid::Kernel::TimeSeriesPropertyStatistics>("TimeSeriesPropertyStatistics", no_init)
     .add_property("minimum", &Mantid::Kernel::TimeSeriesPropertyStatistics::minimum)
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Unit.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Unit.cpp
index 479d4a2b295..53635677a21 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Unit.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Unit.cpp
@@ -31,7 +31,9 @@ namespace
 
 }
 
+// clang-format off
 void export_Unit()
+// clang-format on
 {
   register_ptr_to_python<boost::shared_ptr<Unit>>();
 
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitConversion.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitConversion.cpp
index 65de0e2ff57..2710396f41e 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitConversion.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitConversion.cpp
@@ -6,7 +6,9 @@ using Mantid::Kernel::UnitConversion;
 using Mantid::Kernel::DeltaEMode;
 using namespace boost::python;
 
+// clang-format off
 void export_UnitConversion()
+// clang-format on
 {
   // Function pointer typedef
   typedef double (*StringVersion)(const std::string & src, const std::string & dest,
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitFactory.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitFactory.cpp
index bd0850258e4..47afdf578fc 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitFactory.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitFactory.cpp
@@ -12,7 +12,9 @@ namespace Policies = Mantid::PythonInterface::Policies;
 namespace Converters = Mantid::PythonInterface::Converters;
 using namespace boost::python;
 
+// clang-format off
 void export_UnitFactory()
+// clang-format on
 {
   class_<UnitFactoryImpl, boost::noncopyable>("UnitFactoryImpl", no_init)
     .def("create", &UnitFactoryImpl::create, "Creates a named unit if it exists in the factory")
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitLabel.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitLabel.cpp
index 661eb18e8f1..241a50504f1 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitLabel.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/UnitLabel.cpp
@@ -46,7 +46,9 @@ namespace
 
 }
 
+// clang-format off
 void export_UnitLabel()
+// clang-format on
 {
   class_<UnitLabel>("UnitLabel", no_init)
     .def("__init__",
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Units.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Units.cpp
index 0c60a679683..602cfa12808 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Units.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/Units.cpp
@@ -24,7 +24,9 @@ namespace
 
 // We only export the concrete unit classes that
 // have additional functionality over the base class
+// clang-format off
 void export_Label()
+// clang-format on
 {
   class_<Label, bases<Unit>, boost::noncopyable>("Label", no_init)
     .def("setLabel", &setLabelFromStdString,
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/V3D.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/V3D.cpp
index 845ecc46f1b..0c725af643f 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/V3D.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/V3D.cpp
@@ -29,7 +29,9 @@ namespace
 }
 
 
+// clang-format off
 void export_V3D()
+// clang-format on
 {
   //V3D class
   class_< V3D >("V3D",init<>("Construct a V3D at the origin"))
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/VMD.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/VMD.cpp
index 42ec793e917..d6831df4826 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/VMD.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/VMD.cpp
@@ -47,7 +47,9 @@ namespace
   }
 }
 
+// clang-format off
 void export_VMD()
+// clang-format on
 {
   class_<VMD>("VMD", init<>("Default constructor gives an object with 1 dimension"))
     .def(init<VMD_t,VMD_t>("Constructs a 2 dimensional vector at the point given", args(("val0"),("val1"))))
diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/VisibleWhenProperty.cpp b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/VisibleWhenProperty.cpp
index 59ded113a4d..5b9166a6e26 100644
--- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/VisibleWhenProperty.cpp
+++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/src/Exports/VisibleWhenProperty.cpp
@@ -4,7 +4,9 @@
 using namespace Mantid::Kernel;
 using namespace boost::python;
 
+// clang-format off
 void export_VisibleWhenProperty()
+// clang-format on
 {
   class_<VisibleWhenProperty, bases<EnabledWhenProperty>,
          boost::noncopyable>("VisibleWhenProperty", no_init)
-- 
GitLab