diff --git a/Framework/API/inc/MantidAPI/AlgorithmFactory.h b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
index 37c18ad440faf7432f6eddcadab5225269947b64..c0e1afdd9d16d8c078ab1c10c090ca5417c2d5bb 100644
--- a/Framework/API/inc/MantidAPI/AlgorithmFactory.h
+++ b/Framework/API/inc/MantidAPI/AlgorithmFactory.h
@@ -168,8 +168,7 @@ private:
VersionMap m_vmap;
};
-typedef Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl>
- AlgorithmFactory;
+typedef Mantid::Kernel::SingletonHolder<AlgorithmFactoryImpl> AlgorithmFactory;
/// Convenient typedef for an UpdateNotification
typedef Mantid::Kernel::DynamicFactory<Algorithm>::UpdateNotification
@@ -182,7 +181,8 @@ typedef const Poco::AutoPtr<Mantid::Kernel::DynamicFactory<
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::AlgorithmFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::AlgorithmFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/AnalysisDataService.h b/Framework/API/inc/MantidAPI/AnalysisDataService.h
index e9bf588fd3d780b01be28224ab26f0910103122a..d46cd86ba7f8521020432c596d9594e5a98496c0 100644
--- a/Framework/API/inc/MantidAPI/AnalysisDataService.h
+++ b/Framework/API/inc/MantidAPI/AnalysisDataService.h
@@ -178,7 +178,6 @@ private:
std::string m_illegalChars;
};
-
typedef Mantid::Kernel::SingletonHolder<AnalysisDataServiceImpl>
AnalysisDataService;
@@ -244,7 +243,8 @@ typedef const Poco::AutoPtr<AnalysisDataServiceImpl::GroupUpdatedNotification> &
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::AnalysisDataServiceImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::AnalysisDataServiceImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
index 98855c2622f4c3c7fba7c496bcd6a0d8dbf42497..a08b918d1fd23651341c27c703665444fc950a73 100644
--- a/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
+++ b/Framework/API/inc/MantidAPI/ArchiveSearchFactory.h
@@ -63,7 +63,8 @@ typedef Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::ArchiveSearchFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::ArchiveSearchFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/CatalogFactory.h b/Framework/API/inc/MantidAPI/CatalogFactory.h
index 1bc7a885f9dceef154138a521f78bfd5a8588a1b..b6133d3315da6d90d751b8945c3a9e603c90a989 100644
--- a/Framework/API/inc/MantidAPI/CatalogFactory.h
+++ b/Framework/API/inc/MantidAPI/CatalogFactory.h
@@ -78,15 +78,15 @@ private:
/// The specialisation of the SingletonHolder class that holds the
/// CatalogFactory
-typedef Mantid::Kernel::SingletonHolder<CatalogFactoryImpl>
- CatalogFactory;
+typedef Mantid::Kernel::SingletonHolder<CatalogFactoryImpl> CatalogFactory;
} // namespace API
} // namespace Mantid
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::CatalogFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::CatalogFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/CatalogManager.h b/Framework/API/inc/MantidAPI/CatalogManager.h
index f528e2fd4a5544a995e6271511064a56e621010a..d7bc46ddcffeefbd6927bda3bbf474e4265cecf0 100644
--- a/Framework/API/inc/MantidAPI/CatalogManager.h
+++ b/Framework/API/inc/MantidAPI/CatalogManager.h
@@ -67,14 +67,14 @@ private:
std::map<CatalogSession_sptr, ICatalog_sptr> m_activeCatalogs;
};
-typedef Kernel::SingletonHolder<CatalogManagerImpl>
- CatalogManager;
+typedef Kernel::SingletonHolder<CatalogManagerImpl> CatalogManager;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Kernel::SingletonHolder<Mantid::API::CatalogManagerImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Kernel::SingletonHolder<Mantid::API::CatalogManagerImpl>;
}
}
#endif /* MANTID_ICAT_CATALOGMANAGERIMPL_H_ */
diff --git a/Framework/API/inc/MantidAPI/ColumnFactory.h b/Framework/API/inc/MantidAPI/ColumnFactory.h
index 2db50e7ca764ea0bfbde5489c555adc87a2e5673..df6a3d92e9815754d3eb65eb913c70c4bfe9988e 100644
--- a/Framework/API/inc/MantidAPI/ColumnFactory.h
+++ b/Framework/API/inc/MantidAPI/ColumnFactory.h
@@ -63,15 +63,15 @@ private:
~ColumnFactoryImpl() override = default;
};
-typedef Mantid::Kernel::SingletonHolder<ColumnFactoryImpl>
- ColumnFactory;
+typedef Mantid::Kernel::SingletonHolder<ColumnFactoryImpl> ColumnFactory;
} // namespace API
} // namespace Mantid
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::ColumnFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::ColumnFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/ConstraintFactory.h b/Framework/API/inc/MantidAPI/ConstraintFactory.h
index a4f210fdf7baa818897e1fd520fe027f4f3cc444..560770e3bc4f3ebb6076e64a18ca526a59251d18 100644
--- a/Framework/API/inc/MantidAPI/ConstraintFactory.h
+++ b/Framework/API/inc/MantidAPI/ConstraintFactory.h
@@ -80,7 +80,8 @@ typedef Mantid::Kernel::SingletonHolder<ConstraintFactoryImpl>
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::ConstraintFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::ConstraintFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/CostFunctionFactory.h b/Framework/API/inc/MantidAPI/CostFunctionFactory.h
index c1717e0b3653fe1e6364aaf1332716ab6577093b..26d5b33867beff0ae7a09d168fe54bf604bf2699 100644
--- a/Framework/API/inc/MantidAPI/CostFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/CostFunctionFactory.h
@@ -69,10 +69,10 @@ typedef Mantid::Kernel::SingletonHolder<CostFunctionFactoryImpl>
} // namespace API
} // namespace Mantid
-
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::CostFunctionFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::CostFunctionFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
index b778a7577093f27cc89284444f84fc68ee0a988b..9aace3d1ea1820d254450e6e0d2c9ece7dca261a 100644
--- a/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
+++ b/Framework/API/inc/MantidAPI/DomainCreatorFactory.h
@@ -76,7 +76,8 @@ typedef Mantid::Kernel::SingletonHolder<DomainCreatorFactoryImpl>
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::DomainCreatorFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::DomainCreatorFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/FileFinder.h b/Framework/API/inc/MantidAPI/FileFinder.h
index 92ef7c19cfca61848d7add051f29b4ec61bf6f81..ffd119eda4326e6eb14c92dff37be914ce9a2bbf 100644
--- a/Framework/API/inc/MantidAPI/FileFinder.h
+++ b/Framework/API/inc/MantidAPI/FileFinder.h
@@ -94,14 +94,14 @@ private:
int m_globOption;
};
-typedef Mantid::Kernel::SingletonHolder<FileFinderImpl>
- FileFinder;
+typedef Mantid::Kernel::SingletonHolder<FileFinderImpl> FileFinder;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FileFinderImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::FileFinderImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/FileLoaderRegistry.h b/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
index c3e3bf2f16f6b105da1640f59cceda648a88b18a..c53d1efb878f78e4820a02aed53bbe6f113d8aba 100644
--- a/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
+++ b/Framework/API/inc/MantidAPI/FileLoaderRegistry.h
@@ -153,7 +153,8 @@ typedef Mantid::Kernel::SingletonHolder<FileLoaderRegistryImpl>
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FileLoaderRegistryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::FileLoaderRegistryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/FrameworkManager.h b/Framework/API/inc/MantidAPI/FrameworkManager.h
index 90383b3f0ed271dbe0bed1e5c59b455df8070ae0..d62900c4feff9a241a8272fc5820170bde503118 100644
--- a/Framework/API/inc/MantidAPI/FrameworkManager.h
+++ b/Framework/API/inc/MantidAPI/FrameworkManager.h
@@ -135,15 +135,15 @@ private:
#endif
};
-typedef Mantid::Kernel::SingletonHolder<FrameworkManagerImpl>
- FrameworkManager;
+typedef Mantid::Kernel::SingletonHolder<FrameworkManagerImpl> FrameworkManager;
} // namespace Kernel
} // namespace Mantid
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FrameworkManagerImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::FrameworkManagerImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h b/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
index a8466107519a9fed222c4fa3a59e3b9218c167f7..7944b5e2f915c9ae3bc403f6f7f6893fc4a1fe83 100644
--- a/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
+++ b/Framework/API/inc/MantidAPI/FuncMinimizerFactory.h
@@ -69,7 +69,8 @@ typedef Mantid::Kernel::SingletonHolder<FuncMinimizerFactoryImpl>
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FuncMinimizerFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::FuncMinimizerFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/FunctionFactory.h b/Framework/API/inc/MantidAPI/FunctionFactory.h
index b9e8c214a390f1b3124616a11bb74a989fb21217..36962ff28982c4314a0c205ddad372e288284dde 100644
--- a/Framework/API/inc/MantidAPI/FunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/FunctionFactory.h
@@ -142,8 +142,7 @@ const std::vector<std::string> &FunctionFactoryImpl::getFunctionNames() const {
return typeNames;
}
-typedef Mantid::Kernel::SingletonHolder<FunctionFactoryImpl>
- FunctionFactory;
+typedef Mantid::Kernel::SingletonHolder<FunctionFactoryImpl> FunctionFactory;
/// Convenient typedef for an UpdateNotification
typedef FunctionFactoryImpl::UpdateNotification
@@ -156,7 +155,8 @@ typedef const Poco::AutoPtr<FunctionFactoryUpdateNotification> &
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::FunctionFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::FunctionFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
index 69196e90c4f1e16624f4f8d2ddb3d29235553ca6..10b8c9f04b4eb515313e6a0ca0b03df4e1c2318d 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionFactory.h
@@ -64,17 +64,16 @@ private:
~ImplicitFunctionFactoryImpl() override = default;
};
-
-typedef Mantid::Kernel::SingletonHolder<
- ImplicitFunctionFactoryImpl> ImplicitFunctionFactory;
+typedef Mantid::Kernel::SingletonHolder<ImplicitFunctionFactoryImpl>
+ ImplicitFunctionFactory;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<Mantid::API::ImplicitFunctionFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::ImplicitFunctionFactoryImpl>;
}
}
-
#endif
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
index 25096efc9bccfce8616159237c78313d402e208c..98578f7383c4f556d821c2e5c82922993fe392f2 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParameterParserFactory.h
@@ -62,15 +62,16 @@ private:
~ImplicitFunctionParameterParserFactoryImpl() override = default;
};
-typedef Mantid::Kernel::SingletonHolder<ImplicitFunctionParameterParserFactoryImpl>
- ImplicitFunctionParameterParserFactory;
+typedef Mantid::Kernel::SingletonHolder<
+ ImplicitFunctionParameterParserFactoryImpl>
+ ImplicitFunctionParameterParserFactory;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<Mantid::API::ImplicitFunctionParameterParserFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+ Mantid::API::ImplicitFunctionParameterParserFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
index b4953ccd77180cdd688d79cb542d1f188b3bac22..0c6b2e00f18791a05aa0a4b5f4685beb39060825 100644
--- a/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
+++ b/Framework/API/inc/MantidAPI/ImplicitFunctionParserFactory.h
@@ -66,16 +66,15 @@ private:
~ImplicitFunctionParserFactoryImpl() override = default;
};
-
-typedef Mantid::Kernel::SingletonHolder<
- ImplicitFunctionParserFactoryImpl> ImplicitFunctionParserFactory;
+typedef Mantid::Kernel::SingletonHolder<ImplicitFunctionParserFactoryImpl>
+ ImplicitFunctionParserFactory;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<Mantid::API::ImplicitFunctionParserFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL Mantid::Kernel::SingletonHolder<
+ Mantid::API::ImplicitFunctionParserFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/InstrumentDataService.h b/Framework/API/inc/MantidAPI/InstrumentDataService.h
index 79304263a4544e97fd0a7429c69ffca23be29874..3ff486fb1cecc7484085b00fb9fd8522c14496bd 100644
--- a/Framework/API/inc/MantidAPI/InstrumentDataService.h
+++ b/Framework/API/inc/MantidAPI/InstrumentDataService.h
@@ -48,16 +48,16 @@ private:
operator=(const InstrumentDataServiceImpl &) = delete;
};
-typedef Mantid::Kernel::SingletonHolder<
- InstrumentDataServiceImpl> InstrumentDataService;
+typedef Mantid::Kernel::SingletonHolder<InstrumentDataServiceImpl>
+ InstrumentDataService;
} // Namespace API
} // Namespace Mantid
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<Mantid::API::InstrumentDataServiceImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::InstrumentDataServiceImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
index 05321c94a9a849dfb507b359a12f8faafb2fbea8..8fb819cd541c8f6c73d71136f15eb1b97910405c 100644
--- a/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
+++ b/Framework/API/inc/MantidAPI/RemoteJobManagerFactory.h
@@ -87,16 +87,16 @@ private:
};
// The factory is just a specialisation of SingletonHolder
-typedef Mantid::Kernel::SingletonHolder<
- RemoteJobManagerFactoryImpl> RemoteJobManagerFactory;
+typedef Mantid::Kernel::SingletonHolder<RemoteJobManagerFactoryImpl>
+ RemoteJobManagerFactory;
} // namespace API
} // namespace Mantid
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<Mantid::API::RemoteJobManagerFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::RemoteJobManagerFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
index a9db437db5f77a3666f20dc868ad81fede9fa28d..f5bad9732e7069cbea92017de01573c7e2e31be6 100644
--- a/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
+++ b/Framework/API/inc/MantidAPI/ScriptRepositoryFactory.h
@@ -67,20 +67,19 @@ private:
~ScriptRepositoryFactoryImpl() override = default;
};
-typedef Mantid::Kernel::SingletonHolder<
- ScriptRepositoryFactoryImpl> ScriptRepositoryFactory;
+typedef Mantid::Kernel::SingletonHolder<ScriptRepositoryFactoryImpl>
+ ScriptRepositoryFactory;
} // namespace API
} // namespace Mantid
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<Mantid::API::ScriptRepositoryFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::ScriptRepositoryFactoryImpl>;
}
}
-
/**
* Macro for declaring a new type of function to be used with the
* FunctionFactory
diff --git a/Framework/API/inc/MantidAPI/TransformScaleFactory.h b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
index c1f715acbd3041f635fb651082d44dba959699e3..8d58b0832101d2d9bb628bfb2679f1f0b1e5d72c 100644
--- a/Framework/API/inc/MantidAPI/TransformScaleFactory.h
+++ b/Framework/API/inc/MantidAPI/TransformScaleFactory.h
@@ -67,16 +67,16 @@ private:
// Do not use default methods
};
-typedef Mantid::Kernel::SingletonHolder<
- TransformScaleFactoryImpl> TransformScaleFactory;
+typedef Mantid::Kernel::SingletonHolder<TransformScaleFactoryImpl>
+ TransformScaleFactory;
} // namespace API
} // namespace Mantid
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<Mantid::API::TransformScaleFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::TransformScaleFactoryImpl>;
}
}
diff --git a/Framework/API/inc/MantidAPI/WorkspaceFactory.h b/Framework/API/inc/MantidAPI/WorkspaceFactory.h
index a89c5720aba7ce9bd04495ba993208e214903d78..fd19fbaf48c8635b7dc3999be58fc04e61df507b 100644
--- a/Framework/API/inc/MantidAPI/WorkspaceFactory.h
+++ b/Framework/API/inc/MantidAPI/WorkspaceFactory.h
@@ -98,16 +98,15 @@ private:
using Kernel::DynamicFactory<Workspace>::create;
};
-typedef Mantid::Kernel::SingletonHolder<WorkspaceFactoryImpl>
- WorkspaceFactory;
+typedef Mantid::Kernel::SingletonHolder<WorkspaceFactoryImpl> WorkspaceFactory;
} // namespace API
} // namespace Mantid
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_API template class MANTID_API_DLL
- Mantid::Kernel::SingletonHolder<Mantid::API::WorkspaceFactoryImpl>;
+EXTERN_MANTID_API template class MANTID_API_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::API::WorkspaceFactoryImpl>;
}
}
diff --git a/Framework/API/src/AlgorithmFactory.cpp b/Framework/API/src/AlgorithmFactory.cpp
index 4a02ae9374531ef33bd0d8d7b68ed363cc477ee8..3401322948f38b68864ff5901e82b02d7aba53f0 100644
--- a/Framework/API/src/AlgorithmFactory.cpp
+++ b/Framework/API/src/AlgorithmFactory.cpp
@@ -426,7 +426,5 @@ AlgorithmFactoryImpl::createAlgorithm(const std::string &name,
return Kernel::DynamicFactory<Algorithm>::create(createName(name, version));
}
-
} // namespace API
} // namespace Mantid
-
diff --git a/Framework/API/src/AnalysisDataService.cpp b/Framework/API/src/AnalysisDataService.cpp
index c643b5262d83e7b302a5700df0154df38c4afda0..44f38d031141b40c09c94f73a31b9a4bee0e5309 100644
--- a/Framework/API/src/AnalysisDataService.cpp
+++ b/Framework/API/src/AnalysisDataService.cpp
@@ -325,4 +325,3 @@ void AnalysisDataServiceImpl::verifyName(const std::string &name) {
} // Namespace API
} // Namespace Mantid
-
diff --git a/Framework/API/src/CatalogManager.cpp b/Framework/API/src/CatalogManager.cpp
index 9855db6a376a701feb6602d7c5193e3ba4ac4737..ec7babcff5f436e3e907c9bb2d56044471cc9f82 100644
--- a/Framework/API/src/CatalogManager.cpp
+++ b/Framework/API/src/CatalogManager.cpp
@@ -108,6 +108,5 @@ std::vector<CatalogSession_sptr> CatalogManagerImpl::getActiveSessions() {
size_t CatalogManagerImpl::numberActiveSessions() const {
return m_activeCatalogs.size();
}
-
}
}
diff --git a/Framework/API/src/CostFunctionFactory.cpp b/Framework/API/src/CostFunctionFactory.cpp
index fd7d945cff48f9db7b7484ca0faaebb0e3b4f70a..ea0e131e3a024925ddd078ceea612d507ba7759f 100644
--- a/Framework/API/src/CostFunctionFactory.cpp
+++ b/Framework/API/src/CostFunctionFactory.cpp
@@ -15,9 +15,3 @@ CostFunctionFactoryImpl::CostFunctionFactoryImpl()
} // namespace API
} // namespace Mantid
-
-
-
-
-
-
diff --git a/Framework/API/src/FrameworkManager.cpp b/Framework/API/src/FrameworkManager.cpp
index 1a8a79494bcec01d55694b38398ab5288f45683e..ee2eec427889fb7846c83b22259caab4b52a16c5 100644
--- a/Framework/API/src/FrameworkManager.cpp
+++ b/Framework/API/src/FrameworkManager.cpp
@@ -425,4 +425,3 @@ void FrameworkManagerImpl::setupUsageReporting() {
} // namespace API
} // Namespace Mantid
-
diff --git a/Framework/API/src/FuncMinimizerFactory.cpp b/Framework/API/src/FuncMinimizerFactory.cpp
index 16cb39fb0e81ad13b973b675e3237f6aa3c3a950..0ce1a3379385a7517bf3302ed3a36ad832cb9725 100644
--- a/Framework/API/src/FuncMinimizerFactory.cpp
+++ b/Framework/API/src/FuncMinimizerFactory.cpp
@@ -60,4 +60,3 @@ FuncMinimizerFactoryImpl::createMinimizer(const std::string &str) const {
} // namespace API
} // namespace Mantid
-
diff --git a/Framework/API/src/ImplicitFunctionFactory.cpp b/Framework/API/src/ImplicitFunctionFactory.cpp
index d19a9d79fd6a02c6ff0e6e16737c591f3053087e..7d4c0360f0927c8613fe093313c0d5ce66b1e8c9 100644
--- a/Framework/API/src/ImplicitFunctionFactory.cpp
+++ b/Framework/API/src/ImplicitFunctionFactory.cpp
@@ -49,6 +49,5 @@ ImplicitFunctionFactoryImpl::createUnwrapped(
funcParser->createFunctionBuilder(pInstructionsXML));
return functionBuilder->create();
}
-
}
}
diff --git a/Framework/API/src/ImplicitFunctionParameterParserFactory.cpp b/Framework/API/src/ImplicitFunctionParameterParserFactory.cpp
index 47d231ac62817d648f23896174d2a40627f3ce49..90261e36d85b66c051654a51a810a0e38979b79b 100644
--- a/Framework/API/src/ImplicitFunctionParameterParserFactory.cpp
+++ b/Framework/API/src/ImplicitFunctionParameterParserFactory.cpp
@@ -41,6 +41,5 @@ ImplicitFunctionParameterParser *ImplicitFunctionParameterParserFactoryImpl::
}
return paramParser;
}
-
}
}
diff --git a/Framework/API/src/ImplicitFunctionParserFactory.cpp b/Framework/API/src/ImplicitFunctionParserFactory.cpp
index 52c080486e32ecc7dfc1283b52329b5498865ebb..9a13f894941560ad6e748903857b93a2fa91e4ef 100644
--- a/Framework/API/src/ImplicitFunctionParserFactory.cpp
+++ b/Framework/API/src/ImplicitFunctionParserFactory.cpp
@@ -71,6 +71,5 @@ ImplicitFunctionParserFactoryImpl::createImplicitFunctionParserFromXML(
return createImplicitFunctionParserFromXML(pRootElem);
}
-
}
}
diff --git a/Framework/API/src/WorkspaceProperty.cpp b/Framework/API/src/WorkspaceProperty.cpp
index f15d330c72c2ef92ca1c9b5e0e4fe87a99f66d6e..7284be35e7295e92e9817ebe53f17d798499c33a 100644
--- a/Framework/API/src/WorkspaceProperty.cpp
+++ b/Framework/API/src/WorkspaceProperty.cpp
@@ -9,18 +9,18 @@
namespace Mantid {
namespace API {
///@cond TEMPLATE
-template class MANTID_API_DLL Mantid::API::WorkspaceProperty<
- Mantid::API::Workspace>;
-template class MANTID_API_DLL Mantid::API::WorkspaceProperty<
- Mantid::API::IEventWorkspace>;
-template class MANTID_API_DLL Mantid::API::WorkspaceProperty<
- Mantid::API::IMDEventWorkspace>;
-template class MANTID_API_DLL Mantid::API::WorkspaceProperty<
- Mantid::API::IMDWorkspace>;
-template class MANTID_API_DLL Mantid::API::WorkspaceProperty<
- Mantid::API::MatrixWorkspace>;
-template class MANTID_API_DLL Mantid::API::WorkspaceProperty<
- Mantid::API::ITableWorkspace>;
+template class MANTID_API_DLL
+ Mantid::API::WorkspaceProperty<Mantid::API::Workspace>;
+template class MANTID_API_DLL
+ Mantid::API::WorkspaceProperty<Mantid::API::IEventWorkspace>;
+template class MANTID_API_DLL
+ Mantid::API::WorkspaceProperty<Mantid::API::IMDEventWorkspace>;
+template class MANTID_API_DLL
+ Mantid::API::WorkspaceProperty<Mantid::API::IMDWorkspace>;
+template class MANTID_API_DLL
+ Mantid::API::WorkspaceProperty<Mantid::API::MatrixWorkspace>;
+template class MANTID_API_DLL
+ Mantid::API::WorkspaceProperty<Mantid::API::ITableWorkspace>;
///@endcond TEMPLATE
} // namespace API
} // namespace Mantid
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h b/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h
index 058ddb006ef5666ec0a699ef86f226f4e81c2acf..2bad03cb31849bf534038eb558f0b49180688af7 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDEventFactory.h
@@ -139,7 +139,6 @@ private:
* DO NOT EDIT!
*/
-
/** Macro that makes it possible to call a templated method for
* a MDEventWorkspace using a IMDEventWorkspace_sptr as the input.
*
@@ -147,48 +146,99 @@ private:
* @param workspace :: IMDEventWorkspace_sptr input workspace.
*/
-#define CALL_MDEVENT_FUNCTION(funcname, workspace) \
-{ \
-MDEventWorkspace<MDLeanEvent<1>, 1>::sptr MDEW_MDLEANEVENT_1 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<1>, 1> >(workspace); \
-if (MDEW_MDLEANEVENT_1) funcname<MDLeanEvent<1>, 1>(MDEW_MDLEANEVENT_1); \
- MDEventWorkspace<MDLeanEvent<2>, 2>::sptr MDEW_MDLEANEVENT_2 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<2>, 2> >(workspace); \
-if (MDEW_MDLEANEVENT_2) funcname<MDLeanEvent<2>, 2>(MDEW_MDLEANEVENT_2); \
- MDEventWorkspace<MDLeanEvent<3>, 3>::sptr MDEW_MDLEANEVENT_3 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<3>, 3> >(workspace); \
-if (MDEW_MDLEANEVENT_3) funcname<MDLeanEvent<3>, 3>(MDEW_MDLEANEVENT_3); \
- MDEventWorkspace<MDLeanEvent<4>, 4>::sptr MDEW_MDLEANEVENT_4 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<4>, 4> >(workspace); \
-if (MDEW_MDLEANEVENT_4) funcname<MDLeanEvent<4>, 4>(MDEW_MDLEANEVENT_4); \
- MDEventWorkspace<MDLeanEvent<5>, 5>::sptr MDEW_MDLEANEVENT_5 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<5>, 5> >(workspace); \
-if (MDEW_MDLEANEVENT_5) funcname<MDLeanEvent<5>, 5>(MDEW_MDLEANEVENT_5); \
- MDEventWorkspace<MDLeanEvent<6>, 6>::sptr MDEW_MDLEANEVENT_6 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<6>, 6> >(workspace); \
-if (MDEW_MDLEANEVENT_6) funcname<MDLeanEvent<6>, 6>(MDEW_MDLEANEVENT_6); \
- MDEventWorkspace<MDLeanEvent<7>, 7>::sptr MDEW_MDLEANEVENT_7 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<7>, 7> >(workspace); \
-if (MDEW_MDLEANEVENT_7) funcname<MDLeanEvent<7>, 7>(MDEW_MDLEANEVENT_7); \
- MDEventWorkspace<MDLeanEvent<8>, 8>::sptr MDEW_MDLEANEVENT_8 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<8>, 8> >(workspace); \
-if (MDEW_MDLEANEVENT_8) funcname<MDLeanEvent<8>, 8>(MDEW_MDLEANEVENT_8); \
- MDEventWorkspace<MDLeanEvent<9>, 9>::sptr MDEW_MDLEANEVENT_9 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<9>, 9> >(workspace); \
-if (MDEW_MDLEANEVENT_9) funcname<MDLeanEvent<9>, 9>(MDEW_MDLEANEVENT_9); \
- MDEventWorkspace<MDEvent<1>, 1>::sptr MDEW_MDEVENT_1 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<1>, 1> >(workspace); \
-if (MDEW_MDEVENT_1) funcname<MDEvent<1>, 1>(MDEW_MDEVENT_1); \
- MDEventWorkspace<MDEvent<2>, 2>::sptr MDEW_MDEVENT_2 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<2>, 2> >(workspace); \
-if (MDEW_MDEVENT_2) funcname<MDEvent<2>, 2>(MDEW_MDEVENT_2); \
- MDEventWorkspace<MDEvent<3>, 3>::sptr MDEW_MDEVENT_3 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<3>, 3> >(workspace); \
-if (MDEW_MDEVENT_3) funcname<MDEvent<3>, 3>(MDEW_MDEVENT_3); \
- MDEventWorkspace<MDEvent<4>, 4>::sptr MDEW_MDEVENT_4 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<4>, 4> >(workspace); \
-if (MDEW_MDEVENT_4) funcname<MDEvent<4>, 4>(MDEW_MDEVENT_4); \
- MDEventWorkspace<MDEvent<5>, 5>::sptr MDEW_MDEVENT_5 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<5>, 5> >(workspace); \
-if (MDEW_MDEVENT_5) funcname<MDEvent<5>, 5>(MDEW_MDEVENT_5); \
- MDEventWorkspace<MDEvent<6>, 6>::sptr MDEW_MDEVENT_6 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<6>, 6> >(workspace); \
-if (MDEW_MDEVENT_6) funcname<MDEvent<6>, 6>(MDEW_MDEVENT_6); \
- MDEventWorkspace<MDEvent<7>, 7>::sptr MDEW_MDEVENT_7 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<7>, 7> >(workspace); \
-if (MDEW_MDEVENT_7) funcname<MDEvent<7>, 7>(MDEW_MDEVENT_7); \
- MDEventWorkspace<MDEvent<8>, 8>::sptr MDEW_MDEVENT_8 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<8>, 8> >(workspace); \
-if (MDEW_MDEVENT_8) funcname<MDEvent<8>, 8>(MDEW_MDEVENT_8); \
- MDEventWorkspace<MDEvent<9>, 9>::sptr MDEW_MDEVENT_9 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<9>, 9> >(workspace); \
-if (MDEW_MDEVENT_9) funcname<MDEvent<9>, 9>(MDEW_MDEVENT_9); \
- }
-
-
-
+#define CALL_MDEVENT_FUNCTION(funcname, workspace) \
+ { \
+ MDEventWorkspace<MDLeanEvent<1>, 1>::sptr MDEW_MDLEANEVENT_1 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<1>, 1>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_1) \
+ funcname<MDLeanEvent<1>, 1>(MDEW_MDLEANEVENT_1); \
+ MDEventWorkspace<MDLeanEvent<2>, 2>::sptr MDEW_MDLEANEVENT_2 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<2>, 2>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_2) \
+ funcname<MDLeanEvent<2>, 2>(MDEW_MDLEANEVENT_2); \
+ MDEventWorkspace<MDLeanEvent<3>, 3>::sptr MDEW_MDLEANEVENT_3 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<3>, 3>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_3) \
+ funcname<MDLeanEvent<3>, 3>(MDEW_MDLEANEVENT_3); \
+ MDEventWorkspace<MDLeanEvent<4>, 4>::sptr MDEW_MDLEANEVENT_4 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<4>, 4>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_4) \
+ funcname<MDLeanEvent<4>, 4>(MDEW_MDLEANEVENT_4); \
+ MDEventWorkspace<MDLeanEvent<5>, 5>::sptr MDEW_MDLEANEVENT_5 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<5>, 5>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_5) \
+ funcname<MDLeanEvent<5>, 5>(MDEW_MDLEANEVENT_5); \
+ MDEventWorkspace<MDLeanEvent<6>, 6>::sptr MDEW_MDLEANEVENT_6 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<6>, 6>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_6) \
+ funcname<MDLeanEvent<6>, 6>(MDEW_MDLEANEVENT_6); \
+ MDEventWorkspace<MDLeanEvent<7>, 7>::sptr MDEW_MDLEANEVENT_7 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<7>, 7>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_7) \
+ funcname<MDLeanEvent<7>, 7>(MDEW_MDLEANEVENT_7); \
+ MDEventWorkspace<MDLeanEvent<8>, 8>::sptr MDEW_MDLEANEVENT_8 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<8>, 8>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_8) \
+ funcname<MDLeanEvent<8>, 8>(MDEW_MDLEANEVENT_8); \
+ MDEventWorkspace<MDLeanEvent<9>, 9>::sptr MDEW_MDLEANEVENT_9 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<9>, 9>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_9) \
+ funcname<MDLeanEvent<9>, 9>(MDEW_MDLEANEVENT_9); \
+ MDEventWorkspace<MDEvent<1>, 1>::sptr MDEW_MDEVENT_1 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<1>, 1>>( \
+ workspace); \
+ if (MDEW_MDEVENT_1) \
+ funcname<MDEvent<1>, 1>(MDEW_MDEVENT_1); \
+ MDEventWorkspace<MDEvent<2>, 2>::sptr MDEW_MDEVENT_2 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<2>, 2>>( \
+ workspace); \
+ if (MDEW_MDEVENT_2) \
+ funcname<MDEvent<2>, 2>(MDEW_MDEVENT_2); \
+ MDEventWorkspace<MDEvent<3>, 3>::sptr MDEW_MDEVENT_3 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<3>, 3>>( \
+ workspace); \
+ if (MDEW_MDEVENT_3) \
+ funcname<MDEvent<3>, 3>(MDEW_MDEVENT_3); \
+ MDEventWorkspace<MDEvent<4>, 4>::sptr MDEW_MDEVENT_4 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<4>, 4>>( \
+ workspace); \
+ if (MDEW_MDEVENT_4) \
+ funcname<MDEvent<4>, 4>(MDEW_MDEVENT_4); \
+ MDEventWorkspace<MDEvent<5>, 5>::sptr MDEW_MDEVENT_5 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<5>, 5>>( \
+ workspace); \
+ if (MDEW_MDEVENT_5) \
+ funcname<MDEvent<5>, 5>(MDEW_MDEVENT_5); \
+ MDEventWorkspace<MDEvent<6>, 6>::sptr MDEW_MDEVENT_6 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<6>, 6>>( \
+ workspace); \
+ if (MDEW_MDEVENT_6) \
+ funcname<MDEvent<6>, 6>(MDEW_MDEVENT_6); \
+ MDEventWorkspace<MDEvent<7>, 7>::sptr MDEW_MDEVENT_7 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<7>, 7>>( \
+ workspace); \
+ if (MDEW_MDEVENT_7) \
+ funcname<MDEvent<7>, 7>(MDEW_MDEVENT_7); \
+ MDEventWorkspace<MDEvent<8>, 8>::sptr MDEW_MDEVENT_8 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<8>, 8>>( \
+ workspace); \
+ if (MDEW_MDEVENT_8) \
+ funcname<MDEvent<8>, 8>(MDEW_MDEVENT_8); \
+ MDEventWorkspace<MDEvent<9>, 9>::sptr MDEW_MDEVENT_9 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<9>, 9>>( \
+ workspace); \
+ if (MDEW_MDEVENT_9) \
+ funcname<MDEvent<9>, 9>(MDEW_MDEVENT_9); \
+ }
/** Macro that makes it possible to call a templated method for
* a MDEventWorkspace using a IMDEventWorkspace_sptr as the input.
@@ -197,40 +247,79 @@ if (MDEW_MDEVENT_9) funcname<MDEvent<9>, 9>(MDEW_MDEVENT_9); \
* @param workspace :: IMDEventWorkspace_sptr input workspace.
*/
-#define CALL_MDEVENT_FUNCTION3(funcname, workspace) \
-{ \
-MDEventWorkspace<MDLeanEvent<3>, 3>::sptr MDEW_MDLEANEVENT_3 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<3>, 3> >(workspace); \
-if (MDEW_MDLEANEVENT_3) funcname<MDLeanEvent<3>, 3>(MDEW_MDLEANEVENT_3); \
- MDEventWorkspace<MDLeanEvent<4>, 4>::sptr MDEW_MDLEANEVENT_4 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<4>, 4> >(workspace); \
-if (MDEW_MDLEANEVENT_4) funcname<MDLeanEvent<4>, 4>(MDEW_MDLEANEVENT_4); \
- MDEventWorkspace<MDLeanEvent<5>, 5>::sptr MDEW_MDLEANEVENT_5 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<5>, 5> >(workspace); \
-if (MDEW_MDLEANEVENT_5) funcname<MDLeanEvent<5>, 5>(MDEW_MDLEANEVENT_5); \
- MDEventWorkspace<MDLeanEvent<6>, 6>::sptr MDEW_MDLEANEVENT_6 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<6>, 6> >(workspace); \
-if (MDEW_MDLEANEVENT_6) funcname<MDLeanEvent<6>, 6>(MDEW_MDLEANEVENT_6); \
- MDEventWorkspace<MDLeanEvent<7>, 7>::sptr MDEW_MDLEANEVENT_7 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<7>, 7> >(workspace); \
-if (MDEW_MDLEANEVENT_7) funcname<MDLeanEvent<7>, 7>(MDEW_MDLEANEVENT_7); \
- MDEventWorkspace<MDLeanEvent<8>, 8>::sptr MDEW_MDLEANEVENT_8 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<8>, 8> >(workspace); \
-if (MDEW_MDLEANEVENT_8) funcname<MDLeanEvent<8>, 8>(MDEW_MDLEANEVENT_8); \
- MDEventWorkspace<MDLeanEvent<9>, 9>::sptr MDEW_MDLEANEVENT_9 = boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<9>, 9> >(workspace); \
-if (MDEW_MDLEANEVENT_9) funcname<MDLeanEvent<9>, 9>(MDEW_MDLEANEVENT_9); \
- MDEventWorkspace<MDEvent<3>, 3>::sptr MDEW_MDEVENT_3 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<3>, 3> >(workspace); \
-if (MDEW_MDEVENT_3) funcname<MDEvent<3>, 3>(MDEW_MDEVENT_3); \
- MDEventWorkspace<MDEvent<4>, 4>::sptr MDEW_MDEVENT_4 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<4>, 4> >(workspace); \
-if (MDEW_MDEVENT_4) funcname<MDEvent<4>, 4>(MDEW_MDEVENT_4); \
- MDEventWorkspace<MDEvent<5>, 5>::sptr MDEW_MDEVENT_5 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<5>, 5> >(workspace); \
-if (MDEW_MDEVENT_5) funcname<MDEvent<5>, 5>(MDEW_MDEVENT_5); \
- MDEventWorkspace<MDEvent<6>, 6>::sptr MDEW_MDEVENT_6 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<6>, 6> >(workspace); \
-if (MDEW_MDEVENT_6) funcname<MDEvent<6>, 6>(MDEW_MDEVENT_6); \
- MDEventWorkspace<MDEvent<7>, 7>::sptr MDEW_MDEVENT_7 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<7>, 7> >(workspace); \
-if (MDEW_MDEVENT_7) funcname<MDEvent<7>, 7>(MDEW_MDEVENT_7); \
- MDEventWorkspace<MDEvent<8>, 8>::sptr MDEW_MDEVENT_8 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<8>, 8> >(workspace); \
-if (MDEW_MDEVENT_8) funcname<MDEvent<8>, 8>(MDEW_MDEVENT_8); \
- MDEventWorkspace<MDEvent<9>, 9>::sptr MDEW_MDEVENT_9 = boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<9>, 9> >(workspace); \
-if (MDEW_MDEVENT_9) funcname<MDEvent<9>, 9>(MDEW_MDEVENT_9); \
- }
-
-
-
+#define CALL_MDEVENT_FUNCTION3(funcname, workspace) \
+ { \
+ MDEventWorkspace<MDLeanEvent<3>, 3>::sptr MDEW_MDLEANEVENT_3 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<3>, 3>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_3) \
+ funcname<MDLeanEvent<3>, 3>(MDEW_MDLEANEVENT_3); \
+ MDEventWorkspace<MDLeanEvent<4>, 4>::sptr MDEW_MDLEANEVENT_4 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<4>, 4>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_4) \
+ funcname<MDLeanEvent<4>, 4>(MDEW_MDLEANEVENT_4); \
+ MDEventWorkspace<MDLeanEvent<5>, 5>::sptr MDEW_MDLEANEVENT_5 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<5>, 5>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_5) \
+ funcname<MDLeanEvent<5>, 5>(MDEW_MDLEANEVENT_5); \
+ MDEventWorkspace<MDLeanEvent<6>, 6>::sptr MDEW_MDLEANEVENT_6 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<6>, 6>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_6) \
+ funcname<MDLeanEvent<6>, 6>(MDEW_MDLEANEVENT_6); \
+ MDEventWorkspace<MDLeanEvent<7>, 7>::sptr MDEW_MDLEANEVENT_7 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<7>, 7>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_7) \
+ funcname<MDLeanEvent<7>, 7>(MDEW_MDLEANEVENT_7); \
+ MDEventWorkspace<MDLeanEvent<8>, 8>::sptr MDEW_MDLEANEVENT_8 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<8>, 8>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_8) \
+ funcname<MDLeanEvent<8>, 8>(MDEW_MDLEANEVENT_8); \
+ MDEventWorkspace<MDLeanEvent<9>, 9>::sptr MDEW_MDLEANEVENT_9 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDLeanEvent<9>, 9>>( \
+ workspace); \
+ if (MDEW_MDLEANEVENT_9) \
+ funcname<MDLeanEvent<9>, 9>(MDEW_MDLEANEVENT_9); \
+ MDEventWorkspace<MDEvent<3>, 3>::sptr MDEW_MDEVENT_3 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<3>, 3>>( \
+ workspace); \
+ if (MDEW_MDEVENT_3) \
+ funcname<MDEvent<3>, 3>(MDEW_MDEVENT_3); \
+ MDEventWorkspace<MDEvent<4>, 4>::sptr MDEW_MDEVENT_4 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<4>, 4>>( \
+ workspace); \
+ if (MDEW_MDEVENT_4) \
+ funcname<MDEvent<4>, 4>(MDEW_MDEVENT_4); \
+ MDEventWorkspace<MDEvent<5>, 5>::sptr MDEW_MDEVENT_5 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<5>, 5>>( \
+ workspace); \
+ if (MDEW_MDEVENT_5) \
+ funcname<MDEvent<5>, 5>(MDEW_MDEVENT_5); \
+ MDEventWorkspace<MDEvent<6>, 6>::sptr MDEW_MDEVENT_6 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<6>, 6>>( \
+ workspace); \
+ if (MDEW_MDEVENT_6) \
+ funcname<MDEvent<6>, 6>(MDEW_MDEVENT_6); \
+ MDEventWorkspace<MDEvent<7>, 7>::sptr MDEW_MDEVENT_7 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<7>, 7>>( \
+ workspace); \
+ if (MDEW_MDEVENT_7) \
+ funcname<MDEvent<7>, 7>(MDEW_MDEVENT_7); \
+ MDEventWorkspace<MDEvent<8>, 8>::sptr MDEW_MDEVENT_8 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<8>, 8>>( \
+ workspace); \
+ if (MDEW_MDEVENT_8) \
+ funcname<MDEvent<8>, 8>(MDEW_MDEVENT_8); \
+ MDEventWorkspace<MDEvent<9>, 9>::sptr MDEW_MDEVENT_9 = \
+ boost::dynamic_pointer_cast<MDEventWorkspace<MDEvent<9>, 9>>( \
+ workspace); \
+ if (MDEW_MDEVENT_9) \
+ funcname<MDEvent<9>, 9>(MDEW_MDEVENT_9); \
+ }
/** Macro that makes it possible to call a templated method for
* a MDEventWorkspace using a IMDEventWorkspace_sptr as the input.
@@ -239,257 +328,297 @@ if (MDEW_MDEVENT_9) funcname<MDEvent<9>, 9>(MDEW_MDEVENT_9); \
* @param workspace :: IMDEventWorkspace_sptr input workspace.
*/
-#define CONST_CALL_MDEVENT_FUNCTION(funcname, workspace) \
-{ \
-const MDEventWorkspace<MDLeanEvent<1>, 1>::sptr CONST_MDEW_MDLEANEVENT_1 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<1>, 1> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_1) funcname<MDLeanEvent<1>, 1>(CONST_MDEW_MDLEANEVENT_1); \
- const MDEventWorkspace<MDLeanEvent<2>, 2>::sptr CONST_MDEW_MDLEANEVENT_2 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<2>, 2> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_2) funcname<MDLeanEvent<2>, 2>(CONST_MDEW_MDLEANEVENT_2); \
- const MDEventWorkspace<MDLeanEvent<3>, 3>::sptr CONST_MDEW_MDLEANEVENT_3 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<3>, 3> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_3) funcname<MDLeanEvent<3>, 3>(CONST_MDEW_MDLEANEVENT_3); \
- const MDEventWorkspace<MDLeanEvent<4>, 4>::sptr CONST_MDEW_MDLEANEVENT_4 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<4>, 4> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_4) funcname<MDLeanEvent<4>, 4>(CONST_MDEW_MDLEANEVENT_4); \
- const MDEventWorkspace<MDLeanEvent<5>, 5>::sptr CONST_MDEW_MDLEANEVENT_5 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<5>, 5> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_5) funcname<MDLeanEvent<5>, 5>(CONST_MDEW_MDLEANEVENT_5); \
- const MDEventWorkspace<MDLeanEvent<6>, 6>::sptr CONST_MDEW_MDLEANEVENT_6 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<6>, 6> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_6) funcname<MDLeanEvent<6>, 6>(CONST_MDEW_MDLEANEVENT_6); \
- const MDEventWorkspace<MDLeanEvent<7>, 7>::sptr CONST_MDEW_MDLEANEVENT_7 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<7>, 7> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_7) funcname<MDLeanEvent<7>, 7>(CONST_MDEW_MDLEANEVENT_7); \
- const MDEventWorkspace<MDLeanEvent<8>, 8>::sptr CONST_MDEW_MDLEANEVENT_8 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<8>, 8> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_8) funcname<MDLeanEvent<8>, 8>(CONST_MDEW_MDLEANEVENT_8); \
- const MDEventWorkspace<MDLeanEvent<9>, 9>::sptr CONST_MDEW_MDLEANEVENT_9 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDLeanEvent<9>, 9> >(workspace); \
-if (CONST_MDEW_MDLEANEVENT_9) funcname<MDLeanEvent<9>, 9>(CONST_MDEW_MDLEANEVENT_9); \
- const MDEventWorkspace<MDEvent<1>, 1>::sptr CONST_MDEW_MDEVENT_1 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<1>, 1> >(workspace); \
-if (CONST_MDEW_MDEVENT_1) funcname<MDEvent<1>, 1>(CONST_MDEW_MDEVENT_1); \
- const MDEventWorkspace<MDEvent<2>, 2>::sptr CONST_MDEW_MDEVENT_2 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<2>, 2> >(workspace); \
-if (CONST_MDEW_MDEVENT_2) funcname<MDEvent<2>, 2>(CONST_MDEW_MDEVENT_2); \
- const MDEventWorkspace<MDEvent<3>, 3>::sptr CONST_MDEW_MDEVENT_3 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<3>, 3> >(workspace); \
-if (CONST_MDEW_MDEVENT_3) funcname<MDEvent<3>, 3>(CONST_MDEW_MDEVENT_3); \
- const MDEventWorkspace<MDEvent<4>, 4>::sptr CONST_MDEW_MDEVENT_4 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<4>, 4> >(workspace); \
-if (CONST_MDEW_MDEVENT_4) funcname<MDEvent<4>, 4>(CONST_MDEW_MDEVENT_4); \
- const MDEventWorkspace<MDEvent<5>, 5>::sptr CONST_MDEW_MDEVENT_5 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<5>, 5> >(workspace); \
-if (CONST_MDEW_MDEVENT_5) funcname<MDEvent<5>, 5>(CONST_MDEW_MDEVENT_5); \
- const MDEventWorkspace<MDEvent<6>, 6>::sptr CONST_MDEW_MDEVENT_6 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<6>, 6> >(workspace); \
-if (CONST_MDEW_MDEVENT_6) funcname<MDEvent<6>, 6>(CONST_MDEW_MDEVENT_6); \
- const MDEventWorkspace<MDEvent<7>, 7>::sptr CONST_MDEW_MDEVENT_7 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<7>, 7> >(workspace); \
-if (CONST_MDEW_MDEVENT_7) funcname<MDEvent<7>, 7>(CONST_MDEW_MDEVENT_7); \
- const MDEventWorkspace<MDEvent<8>, 8>::sptr CONST_MDEW_MDEVENT_8 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<8>, 8> >(workspace); \
-if (CONST_MDEW_MDEVENT_8) funcname<MDEvent<8>, 8>(CONST_MDEW_MDEVENT_8); \
- const MDEventWorkspace<MDEvent<9>, 9>::sptr CONST_MDEW_MDEVENT_9 = boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<9>, 9> >(workspace); \
-if (CONST_MDEW_MDEVENT_9) funcname<MDEvent<9>, 9>(CONST_MDEW_MDEVENT_9); \
- }
-
-
-
-
-
+#define CONST_CALL_MDEVENT_FUNCTION(funcname, workspace) \
+ { \
+ const MDEventWorkspace<MDLeanEvent<1>, 1>::sptr CONST_MDEW_MDLEANEVENT_1 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<1>, 1>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_1) \
+ funcname<MDLeanEvent<1>, 1>(CONST_MDEW_MDLEANEVENT_1); \
+ const MDEventWorkspace<MDLeanEvent<2>, 2>::sptr CONST_MDEW_MDLEANEVENT_2 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<2>, 2>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_2) \
+ funcname<MDLeanEvent<2>, 2>(CONST_MDEW_MDLEANEVENT_2); \
+ const MDEventWorkspace<MDLeanEvent<3>, 3>::sptr CONST_MDEW_MDLEANEVENT_3 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<3>, 3>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_3) \
+ funcname<MDLeanEvent<3>, 3>(CONST_MDEW_MDLEANEVENT_3); \
+ const MDEventWorkspace<MDLeanEvent<4>, 4>::sptr CONST_MDEW_MDLEANEVENT_4 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<4>, 4>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_4) \
+ funcname<MDLeanEvent<4>, 4>(CONST_MDEW_MDLEANEVENT_4); \
+ const MDEventWorkspace<MDLeanEvent<5>, 5>::sptr CONST_MDEW_MDLEANEVENT_5 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<5>, 5>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_5) \
+ funcname<MDLeanEvent<5>, 5>(CONST_MDEW_MDLEANEVENT_5); \
+ const MDEventWorkspace<MDLeanEvent<6>, 6>::sptr CONST_MDEW_MDLEANEVENT_6 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<6>, 6>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_6) \
+ funcname<MDLeanEvent<6>, 6>(CONST_MDEW_MDLEANEVENT_6); \
+ const MDEventWorkspace<MDLeanEvent<7>, 7>::sptr CONST_MDEW_MDLEANEVENT_7 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<7>, 7>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_7) \
+ funcname<MDLeanEvent<7>, 7>(CONST_MDEW_MDLEANEVENT_7); \
+ const MDEventWorkspace<MDLeanEvent<8>, 8>::sptr CONST_MDEW_MDLEANEVENT_8 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<8>, 8>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_8) \
+ funcname<MDLeanEvent<8>, 8>(CONST_MDEW_MDLEANEVENT_8); \
+ const MDEventWorkspace<MDLeanEvent<9>, 9>::sptr CONST_MDEW_MDLEANEVENT_9 = \
+ boost::dynamic_pointer_cast< \
+ const MDEventWorkspace<MDLeanEvent<9>, 9>>(workspace); \
+ if (CONST_MDEW_MDLEANEVENT_9) \
+ funcname<MDLeanEvent<9>, 9>(CONST_MDEW_MDLEANEVENT_9); \
+ const MDEventWorkspace<MDEvent<1>, 1>::sptr CONST_MDEW_MDEVENT_1 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<1>, 1>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_1) \
+ funcname<MDEvent<1>, 1>(CONST_MDEW_MDEVENT_1); \
+ const MDEventWorkspace<MDEvent<2>, 2>::sptr CONST_MDEW_MDEVENT_2 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<2>, 2>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_2) \
+ funcname<MDEvent<2>, 2>(CONST_MDEW_MDEVENT_2); \
+ const MDEventWorkspace<MDEvent<3>, 3>::sptr CONST_MDEW_MDEVENT_3 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<3>, 3>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_3) \
+ funcname<MDEvent<3>, 3>(CONST_MDEW_MDEVENT_3); \
+ const MDEventWorkspace<MDEvent<4>, 4>::sptr CONST_MDEW_MDEVENT_4 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<4>, 4>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_4) \
+ funcname<MDEvent<4>, 4>(CONST_MDEW_MDEVENT_4); \
+ const MDEventWorkspace<MDEvent<5>, 5>::sptr CONST_MDEW_MDEVENT_5 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<5>, 5>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_5) \
+ funcname<MDEvent<5>, 5>(CONST_MDEW_MDEVENT_5); \
+ const MDEventWorkspace<MDEvent<6>, 6>::sptr CONST_MDEW_MDEVENT_6 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<6>, 6>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_6) \
+ funcname<MDEvent<6>, 6>(CONST_MDEW_MDEVENT_6); \
+ const MDEventWorkspace<MDEvent<7>, 7>::sptr CONST_MDEW_MDEVENT_7 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<7>, 7>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_7) \
+ funcname<MDEvent<7>, 7>(CONST_MDEW_MDEVENT_7); \
+ const MDEventWorkspace<MDEvent<8>, 8>::sptr CONST_MDEW_MDEVENT_8 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<8>, 8>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_8) \
+ funcname<MDEvent<8>, 8>(CONST_MDEW_MDEVENT_8); \
+ const MDEventWorkspace<MDEvent<9>, 9>::sptr CONST_MDEW_MDEVENT_9 = \
+ boost::dynamic_pointer_cast<const MDEventWorkspace<MDEvent<9>, 9>>( \
+ workspace); \
+ if (CONST_MDEW_MDEVENT_9) \
+ funcname<MDEvent<9>, 9>(CONST_MDEW_MDEVENT_9); \
+ }
// ------------- Typedefs for MDBox ------------------
-/// Typedef for a MDBox with 1 dimension
- typedef MDBox<MDLeanEvent<1>, 1> MDBox1Lean;
-/// Typedef for a MDBox with 2 dimensions
- typedef MDBox<MDLeanEvent<2>, 2> MDBox2Lean;
-/// Typedef for a MDBox with 3 dimensions
- typedef MDBox<MDLeanEvent<3>, 3> MDBox3Lean;
-/// Typedef for a MDBox with 4 dimensions
- typedef MDBox<MDLeanEvent<4>, 4> MDBox4Lean;
-/// Typedef for a MDBox with 5 dimensions
- typedef MDBox<MDLeanEvent<5>, 5> MDBox5Lean;
-/// Typedef for a MDBox with 6 dimensions
- typedef MDBox<MDLeanEvent<6>, 6> MDBox6Lean;
-/// Typedef for a MDBox with 7 dimensions
- typedef MDBox<MDLeanEvent<7>, 7> MDBox7Lean;
-/// Typedef for a MDBox with 8 dimensions
- typedef MDBox<MDLeanEvent<8>, 8> MDBox8Lean;
-/// Typedef for a MDBox with 9 dimensions
- typedef MDBox<MDLeanEvent<9>, 9> MDBox9Lean;
-/// Typedef for a MDBox with 1 dimension
+/// Typedef for a MDBox with 1 dimension
+typedef MDBox<MDLeanEvent<1>, 1> MDBox1Lean;
+/// Typedef for a MDBox with 2 dimensions
+typedef MDBox<MDLeanEvent<2>, 2> MDBox2Lean;
+/// Typedef for a MDBox with 3 dimensions
+typedef MDBox<MDLeanEvent<3>, 3> MDBox3Lean;
+/// Typedef for a MDBox with 4 dimensions
+typedef MDBox<MDLeanEvent<4>, 4> MDBox4Lean;
+/// Typedef for a MDBox with 5 dimensions
+typedef MDBox<MDLeanEvent<5>, 5> MDBox5Lean;
+/// Typedef for a MDBox with 6 dimensions
+typedef MDBox<MDLeanEvent<6>, 6> MDBox6Lean;
+/// Typedef for a MDBox with 7 dimensions
+typedef MDBox<MDLeanEvent<7>, 7> MDBox7Lean;
+/// Typedef for a MDBox with 8 dimensions
+typedef MDBox<MDLeanEvent<8>, 8> MDBox8Lean;
+/// Typedef for a MDBox with 9 dimensions
+typedef MDBox<MDLeanEvent<9>, 9> MDBox9Lean;
+/// Typedef for a MDBox with 1 dimension
typedef MDBox<MDEvent<1>, 1> MDBox1;
-/// Typedef for a MDBox with 2 dimensions
+/// Typedef for a MDBox with 2 dimensions
typedef MDBox<MDEvent<2>, 2> MDBox2;
-/// Typedef for a MDBox with 3 dimensions
+/// Typedef for a MDBox with 3 dimensions
typedef MDBox<MDEvent<3>, 3> MDBox3;
-/// Typedef for a MDBox with 4 dimensions
+/// Typedef for a MDBox with 4 dimensions
typedef MDBox<MDEvent<4>, 4> MDBox4;
-/// Typedef for a MDBox with 5 dimensions
+/// Typedef for a MDBox with 5 dimensions
typedef MDBox<MDEvent<5>, 5> MDBox5;
-/// Typedef for a MDBox with 6 dimensions
+/// Typedef for a MDBox with 6 dimensions
typedef MDBox<MDEvent<6>, 6> MDBox6;
-/// Typedef for a MDBox with 7 dimensions
+/// Typedef for a MDBox with 7 dimensions
typedef MDBox<MDEvent<7>, 7> MDBox7;
-/// Typedef for a MDBox with 8 dimensions
+/// Typedef for a MDBox with 8 dimensions
typedef MDBox<MDEvent<8>, 8> MDBox8;
-/// Typedef for a MDBox with 9 dimensions
+/// Typedef for a MDBox with 9 dimensions
typedef MDBox<MDEvent<9>, 9> MDBox9;
-
-
// ------------- Typedefs for MDBoxBase ------------------
-/// Typedef for a MDBoxBase with 1 dimension
- typedef MDBoxBase<MDLeanEvent<1>, 1> MDBoxBase1Lean;
-/// Typedef for a MDBoxBase with 2 dimensions
- typedef MDBoxBase<MDLeanEvent<2>, 2> MDBoxBase2Lean;
-/// Typedef for a MDBoxBase with 3 dimensions
- typedef MDBoxBase<MDLeanEvent<3>, 3> MDBoxBase3Lean;
-/// Typedef for a MDBoxBase with 4 dimensions
- typedef MDBoxBase<MDLeanEvent<4>, 4> MDBoxBase4Lean;
-/// Typedef for a MDBoxBase with 5 dimensions
- typedef MDBoxBase<MDLeanEvent<5>, 5> MDBoxBase5Lean;
-/// Typedef for a MDBoxBase with 6 dimensions
- typedef MDBoxBase<MDLeanEvent<6>, 6> MDBoxBase6Lean;
-/// Typedef for a MDBoxBase with 7 dimensions
- typedef MDBoxBase<MDLeanEvent<7>, 7> MDBoxBase7Lean;
-/// Typedef for a MDBoxBase with 8 dimensions
- typedef MDBoxBase<MDLeanEvent<8>, 8> MDBoxBase8Lean;
-/// Typedef for a MDBoxBase with 9 dimensions
- typedef MDBoxBase<MDLeanEvent<9>, 9> MDBoxBase9Lean;
-/// Typedef for a MDBoxBase with 1 dimension
+/// Typedef for a MDBoxBase with 1 dimension
+typedef MDBoxBase<MDLeanEvent<1>, 1> MDBoxBase1Lean;
+/// Typedef for a MDBoxBase with 2 dimensions
+typedef MDBoxBase<MDLeanEvent<2>, 2> MDBoxBase2Lean;
+/// Typedef for a MDBoxBase with 3 dimensions
+typedef MDBoxBase<MDLeanEvent<3>, 3> MDBoxBase3Lean;
+/// Typedef for a MDBoxBase with 4 dimensions
+typedef MDBoxBase<MDLeanEvent<4>, 4> MDBoxBase4Lean;
+/// Typedef for a MDBoxBase with 5 dimensions
+typedef MDBoxBase<MDLeanEvent<5>, 5> MDBoxBase5Lean;
+/// Typedef for a MDBoxBase with 6 dimensions
+typedef MDBoxBase<MDLeanEvent<6>, 6> MDBoxBase6Lean;
+/// Typedef for a MDBoxBase with 7 dimensions
+typedef MDBoxBase<MDLeanEvent<7>, 7> MDBoxBase7Lean;
+/// Typedef for a MDBoxBase with 8 dimensions
+typedef MDBoxBase<MDLeanEvent<8>, 8> MDBoxBase8Lean;
+/// Typedef for a MDBoxBase with 9 dimensions
+typedef MDBoxBase<MDLeanEvent<9>, 9> MDBoxBase9Lean;
+/// Typedef for a MDBoxBase with 1 dimension
typedef MDBoxBase<MDEvent<1>, 1> MDBoxBase1;
-/// Typedef for a MDBoxBase with 2 dimensions
+/// Typedef for a MDBoxBase with 2 dimensions
typedef MDBoxBase<MDEvent<2>, 2> MDBoxBase2;
-/// Typedef for a MDBoxBase with 3 dimensions
+/// Typedef for a MDBoxBase with 3 dimensions
typedef MDBoxBase<MDEvent<3>, 3> MDBoxBase3;
-/// Typedef for a MDBoxBase with 4 dimensions
+/// Typedef for a MDBoxBase with 4 dimensions
typedef MDBoxBase<MDEvent<4>, 4> MDBoxBase4;
-/// Typedef for a MDBoxBase with 5 dimensions
+/// Typedef for a MDBoxBase with 5 dimensions
typedef MDBoxBase<MDEvent<5>, 5> MDBoxBase5;
-/// Typedef for a MDBoxBase with 6 dimensions
+/// Typedef for a MDBoxBase with 6 dimensions
typedef MDBoxBase<MDEvent<6>, 6> MDBoxBase6;
-/// Typedef for a MDBoxBase with 7 dimensions
+/// Typedef for a MDBoxBase with 7 dimensions
typedef MDBoxBase<MDEvent<7>, 7> MDBoxBase7;
-/// Typedef for a MDBoxBase with 8 dimensions
+/// Typedef for a MDBoxBase with 8 dimensions
typedef MDBoxBase<MDEvent<8>, 8> MDBoxBase8;
-/// Typedef for a MDBoxBase with 9 dimensions
+/// Typedef for a MDBoxBase with 9 dimensions
typedef MDBoxBase<MDEvent<9>, 9> MDBoxBase9;
-
-
// ------------- Typedefs for MDGridBox ------------------
-/// Typedef for a MDGridBox with 1 dimension
- typedef MDGridBox<MDLeanEvent<1>, 1> MDGridBox1Lean;
-/// Typedef for a MDGridBox with 2 dimensions
- typedef MDGridBox<MDLeanEvent<2>, 2> MDGridBox2Lean;
-/// Typedef for a MDGridBox with 3 dimensions
- typedef MDGridBox<MDLeanEvent<3>, 3> MDGridBox3Lean;
-/// Typedef for a MDGridBox with 4 dimensions
- typedef MDGridBox<MDLeanEvent<4>, 4> MDGridBox4Lean;
-/// Typedef for a MDGridBox with 5 dimensions
- typedef MDGridBox<MDLeanEvent<5>, 5> MDGridBox5Lean;
-/// Typedef for a MDGridBox with 6 dimensions
- typedef MDGridBox<MDLeanEvent<6>, 6> MDGridBox6Lean;
-/// Typedef for a MDGridBox with 7 dimensions
- typedef MDGridBox<MDLeanEvent<7>, 7> MDGridBox7Lean;
-/// Typedef for a MDGridBox with 8 dimensions
- typedef MDGridBox<MDLeanEvent<8>, 8> MDGridBox8Lean;
-/// Typedef for a MDGridBox with 9 dimensions
- typedef MDGridBox<MDLeanEvent<9>, 9> MDGridBox9Lean;
-/// Typedef for a MDGridBox with 1 dimension
+/// Typedef for a MDGridBox with 1 dimension
+typedef MDGridBox<MDLeanEvent<1>, 1> MDGridBox1Lean;
+/// Typedef for a MDGridBox with 2 dimensions
+typedef MDGridBox<MDLeanEvent<2>, 2> MDGridBox2Lean;
+/// Typedef for a MDGridBox with 3 dimensions
+typedef MDGridBox<MDLeanEvent<3>, 3> MDGridBox3Lean;
+/// Typedef for a MDGridBox with 4 dimensions
+typedef MDGridBox<MDLeanEvent<4>, 4> MDGridBox4Lean;
+/// Typedef for a MDGridBox with 5 dimensions
+typedef MDGridBox<MDLeanEvent<5>, 5> MDGridBox5Lean;
+/// Typedef for a MDGridBox with 6 dimensions
+typedef MDGridBox<MDLeanEvent<6>, 6> MDGridBox6Lean;
+/// Typedef for a MDGridBox with 7 dimensions
+typedef MDGridBox<MDLeanEvent<7>, 7> MDGridBox7Lean;
+/// Typedef for a MDGridBox with 8 dimensions
+typedef MDGridBox<MDLeanEvent<8>, 8> MDGridBox8Lean;
+/// Typedef for a MDGridBox with 9 dimensions
+typedef MDGridBox<MDLeanEvent<9>, 9> MDGridBox9Lean;
+/// Typedef for a MDGridBox with 1 dimension
typedef MDGridBox<MDEvent<1>, 1> MDGridBox1;
-/// Typedef for a MDGridBox with 2 dimensions
+/// Typedef for a MDGridBox with 2 dimensions
typedef MDGridBox<MDEvent<2>, 2> MDGridBox2;
-/// Typedef for a MDGridBox with 3 dimensions
+/// Typedef for a MDGridBox with 3 dimensions
typedef MDGridBox<MDEvent<3>, 3> MDGridBox3;
-/// Typedef for a MDGridBox with 4 dimensions
+/// Typedef for a MDGridBox with 4 dimensions
typedef MDGridBox<MDEvent<4>, 4> MDGridBox4;
-/// Typedef for a MDGridBox with 5 dimensions
+/// Typedef for a MDGridBox with 5 dimensions
typedef MDGridBox<MDEvent<5>, 5> MDGridBox5;
-/// Typedef for a MDGridBox with 6 dimensions
+/// Typedef for a MDGridBox with 6 dimensions
typedef MDGridBox<MDEvent<6>, 6> MDGridBox6;
-/// Typedef for a MDGridBox with 7 dimensions
+/// Typedef for a MDGridBox with 7 dimensions
typedef MDGridBox<MDEvent<7>, 7> MDGridBox7;
-/// Typedef for a MDGridBox with 8 dimensions
+/// Typedef for a MDGridBox with 8 dimensions
typedef MDGridBox<MDEvent<8>, 8> MDGridBox8;
-/// Typedef for a MDGridBox with 9 dimensions
+/// Typedef for a MDGridBox with 9 dimensions
typedef MDGridBox<MDEvent<9>, 9> MDGridBox9;
-
-
// ------------- Typedefs for MDEventWorkspace ------------------
-/// Typedef for a MDEventWorkspace with 1 dimension
- typedef MDEventWorkspace<MDLeanEvent<1>, 1> MDEventWorkspace1Lean;
-/// Typedef for a MDEventWorkspace with 2 dimensions
- typedef MDEventWorkspace<MDLeanEvent<2>, 2> MDEventWorkspace2Lean;
-/// Typedef for a MDEventWorkspace with 3 dimensions
- typedef MDEventWorkspace<MDLeanEvent<3>, 3> MDEventWorkspace3Lean;
-/// Typedef for a MDEventWorkspace with 4 dimensions
- typedef MDEventWorkspace<MDLeanEvent<4>, 4> MDEventWorkspace4Lean;
-/// Typedef for a MDEventWorkspace with 5 dimensions
- typedef MDEventWorkspace<MDLeanEvent<5>, 5> MDEventWorkspace5Lean;
-/// Typedef for a MDEventWorkspace with 6 dimensions
- typedef MDEventWorkspace<MDLeanEvent<6>, 6> MDEventWorkspace6Lean;
-/// Typedef for a MDEventWorkspace with 7 dimensions
- typedef MDEventWorkspace<MDLeanEvent<7>, 7> MDEventWorkspace7Lean;
-/// Typedef for a MDEventWorkspace with 8 dimensions
- typedef MDEventWorkspace<MDLeanEvent<8>, 8> MDEventWorkspace8Lean;
-/// Typedef for a MDEventWorkspace with 9 dimensions
- typedef MDEventWorkspace<MDLeanEvent<9>, 9> MDEventWorkspace9Lean;
-/// Typedef for a MDEventWorkspace with 1 dimension
+/// Typedef for a MDEventWorkspace with 1 dimension
+typedef MDEventWorkspace<MDLeanEvent<1>, 1> MDEventWorkspace1Lean;
+/// Typedef for a MDEventWorkspace with 2 dimensions
+typedef MDEventWorkspace<MDLeanEvent<2>, 2> MDEventWorkspace2Lean;
+/// Typedef for a MDEventWorkspace with 3 dimensions
+typedef MDEventWorkspace<MDLeanEvent<3>, 3> MDEventWorkspace3Lean;
+/// Typedef for a MDEventWorkspace with 4 dimensions
+typedef MDEventWorkspace<MDLeanEvent<4>, 4> MDEventWorkspace4Lean;
+/// Typedef for a MDEventWorkspace with 5 dimensions
+typedef MDEventWorkspace<MDLeanEvent<5>, 5> MDEventWorkspace5Lean;
+/// Typedef for a MDEventWorkspace with 6 dimensions
+typedef MDEventWorkspace<MDLeanEvent<6>, 6> MDEventWorkspace6Lean;
+/// Typedef for a MDEventWorkspace with 7 dimensions
+typedef MDEventWorkspace<MDLeanEvent<7>, 7> MDEventWorkspace7Lean;
+/// Typedef for a MDEventWorkspace with 8 dimensions
+typedef MDEventWorkspace<MDLeanEvent<8>, 8> MDEventWorkspace8Lean;
+/// Typedef for a MDEventWorkspace with 9 dimensions
+typedef MDEventWorkspace<MDLeanEvent<9>, 9> MDEventWorkspace9Lean;
+/// Typedef for a MDEventWorkspace with 1 dimension
typedef MDEventWorkspace<MDEvent<1>, 1> MDEventWorkspace1;
-/// Typedef for a MDEventWorkspace with 2 dimensions
+/// Typedef for a MDEventWorkspace with 2 dimensions
typedef MDEventWorkspace<MDEvent<2>, 2> MDEventWorkspace2;
-/// Typedef for a MDEventWorkspace with 3 dimensions
+/// Typedef for a MDEventWorkspace with 3 dimensions
typedef MDEventWorkspace<MDEvent<3>, 3> MDEventWorkspace3;
-/// Typedef for a MDEventWorkspace with 4 dimensions
+/// Typedef for a MDEventWorkspace with 4 dimensions
typedef MDEventWorkspace<MDEvent<4>, 4> MDEventWorkspace4;
-/// Typedef for a MDEventWorkspace with 5 dimensions
+/// Typedef for a MDEventWorkspace with 5 dimensions
typedef MDEventWorkspace<MDEvent<5>, 5> MDEventWorkspace5;
-/// Typedef for a MDEventWorkspace with 6 dimensions
+/// Typedef for a MDEventWorkspace with 6 dimensions
typedef MDEventWorkspace<MDEvent<6>, 6> MDEventWorkspace6;
-/// Typedef for a MDEventWorkspace with 7 dimensions
+/// Typedef for a MDEventWorkspace with 7 dimensions
typedef MDEventWorkspace<MDEvent<7>, 7> MDEventWorkspace7;
-/// Typedef for a MDEventWorkspace with 8 dimensions
+/// Typedef for a MDEventWorkspace with 8 dimensions
typedef MDEventWorkspace<MDEvent<8>, 8> MDEventWorkspace8;
-/// Typedef for a MDEventWorkspace with 9 dimensions
+/// Typedef for a MDEventWorkspace with 9 dimensions
typedef MDEventWorkspace<MDEvent<9>, 9> MDEventWorkspace9;
-
-
// ------------- Typedefs for MDBin ------------------
-/// Typedef for a MDBin with 1 dimension
- typedef MDBin<MDLeanEvent<1>, 1> MDBin1Lean;
-/// Typedef for a MDBin with 2 dimensions
- typedef MDBin<MDLeanEvent<2>, 2> MDBin2Lean;
-/// Typedef for a MDBin with 3 dimensions
- typedef MDBin<MDLeanEvent<3>, 3> MDBin3Lean;
-/// Typedef for a MDBin with 4 dimensions
- typedef MDBin<MDLeanEvent<4>, 4> MDBin4Lean;
-/// Typedef for a MDBin with 5 dimensions
- typedef MDBin<MDLeanEvent<5>, 5> MDBin5Lean;
-/// Typedef for a MDBin with 6 dimensions
- typedef MDBin<MDLeanEvent<6>, 6> MDBin6Lean;
-/// Typedef for a MDBin with 7 dimensions
- typedef MDBin<MDLeanEvent<7>, 7> MDBin7Lean;
-/// Typedef for a MDBin with 8 dimensions
- typedef MDBin<MDLeanEvent<8>, 8> MDBin8Lean;
-/// Typedef for a MDBin with 9 dimensions
- typedef MDBin<MDLeanEvent<9>, 9> MDBin9Lean;
-/// Typedef for a MDBin with 1 dimension
+/// Typedef for a MDBin with 1 dimension
+typedef MDBin<MDLeanEvent<1>, 1> MDBin1Lean;
+/// Typedef for a MDBin with 2 dimensions
+typedef MDBin<MDLeanEvent<2>, 2> MDBin2Lean;
+/// Typedef for a MDBin with 3 dimensions
+typedef MDBin<MDLeanEvent<3>, 3> MDBin3Lean;
+/// Typedef for a MDBin with 4 dimensions
+typedef MDBin<MDLeanEvent<4>, 4> MDBin4Lean;
+/// Typedef for a MDBin with 5 dimensions
+typedef MDBin<MDLeanEvent<5>, 5> MDBin5Lean;
+/// Typedef for a MDBin with 6 dimensions
+typedef MDBin<MDLeanEvent<6>, 6> MDBin6Lean;
+/// Typedef for a MDBin with 7 dimensions
+typedef MDBin<MDLeanEvent<7>, 7> MDBin7Lean;
+/// Typedef for a MDBin with 8 dimensions
+typedef MDBin<MDLeanEvent<8>, 8> MDBin8Lean;
+/// Typedef for a MDBin with 9 dimensions
+typedef MDBin<MDLeanEvent<9>, 9> MDBin9Lean;
+/// Typedef for a MDBin with 1 dimension
typedef MDBin<MDEvent<1>, 1> MDBin1;
-/// Typedef for a MDBin with 2 dimensions
+/// Typedef for a MDBin with 2 dimensions
typedef MDBin<MDEvent<2>, 2> MDBin2;
-/// Typedef for a MDBin with 3 dimensions
+/// Typedef for a MDBin with 3 dimensions
typedef MDBin<MDEvent<3>, 3> MDBin3;
-/// Typedef for a MDBin with 4 dimensions
+/// Typedef for a MDBin with 4 dimensions
typedef MDBin<MDEvent<4>, 4> MDBin4;
-/// Typedef for a MDBin with 5 dimensions
+/// Typedef for a MDBin with 5 dimensions
typedef MDBin<MDEvent<5>, 5> MDBin5;
-/// Typedef for a MDBin with 6 dimensions
+/// Typedef for a MDBin with 6 dimensions
typedef MDBin<MDEvent<6>, 6> MDBin6;
-/// Typedef for a MDBin with 7 dimensions
+/// Typedef for a MDBin with 7 dimensions
typedef MDBin<MDEvent<7>, 7> MDBin7;
-/// Typedef for a MDBin with 8 dimensions
+/// Typedef for a MDBin with 8 dimensions
typedef MDBin<MDEvent<8>, 8> MDBin8;
-/// Typedef for a MDBin with 9 dimensions
+/// Typedef for a MDBin with 9 dimensions
typedef MDBin<MDEvent<9>, 9> MDBin9;
-
-
-/* CODE ABOWE WAS AUTO-GENERATED BY generate_mdevent_declarations.py - DO NOT EDIT! */
+/* CODE ABOWE WAS AUTO-GENERATED BY generate_mdevent_declarations.py - DO NOT
+ * EDIT! */
//### END AUTO-GENERATED CODE
//##################################################################
@@ -498,5 +627,3 @@ typedef MDBin<MDEvent<9>, 9> MDBin9;
} // namespace DataObjects
#endif /* MANTID_DATAOBJECTS_MDEVENTFACTORY_H_ */
-
-
diff --git a/Framework/DataObjects/src/EventWorkspace.cpp b/Framework/DataObjects/src/EventWorkspace.cpp
index 021c9714a99558ccd14cecbc1df1cf32c294e4f4..b9300d5c5486f6a8dbfc50cb741000881ff328ed 100644
--- a/Framework/DataObjects/src/EventWorkspace.cpp
+++ b/Framework/DataObjects/src/EventWorkspace.cpp
@@ -929,8 +929,8 @@ void EventWorkspace::getIntegratedSpectra(std::vector<double> &out,
} // namespace Mantid
///\cond TEMPLATE
-template class DLLExport Mantid::API::WorkspaceProperty<
- Mantid::DataObjects::EventWorkspace>;
+template class DLLExport
+ Mantid::API::WorkspaceProperty<Mantid::DataObjects::EventWorkspace>;
namespace Mantid {
namespace Kernel {
diff --git a/Framework/DataObjects/src/MDEventFactory.cpp b/Framework/DataObjects/src/MDEventFactory.cpp
index bacb5b96515ca0ce106dc48aee894ba8d19e946b..7d61b9210739894d1a30f3df4e92fdbd7e7d29dd 100644
--- a/Framework/DataObjects/src/MDEventFactory.cpp
+++ b/Framework/DataObjects/src/MDEventFactory.cpp
@@ -32,153 +32,147 @@ namespace DataObjects {
*/
// Instantiations for MDLeanEvent
- template class DLLExport MDLeanEvent<1>;
- template class DLLExport MDLeanEvent<2>;
- template class DLLExport MDLeanEvent<3>;
- template class DLLExport MDLeanEvent<4>;
- template class DLLExport MDLeanEvent<5>;
- template class DLLExport MDLeanEvent<6>;
- template class DLLExport MDLeanEvent<7>;
- template class DLLExport MDLeanEvent<8>;
- template class DLLExport MDLeanEvent<9>;
+template class DLLExport MDLeanEvent<1>;
+template class DLLExport MDLeanEvent<2>;
+template class DLLExport MDLeanEvent<3>;
+template class DLLExport MDLeanEvent<4>;
+template class DLLExport MDLeanEvent<5>;
+template class DLLExport MDLeanEvent<6>;
+template class DLLExport MDLeanEvent<7>;
+template class DLLExport MDLeanEvent<8>;
+template class DLLExport MDLeanEvent<9>;
// Instantiations for MDEvent
- template class DLLExport MDEvent<1>;
- template class DLLExport MDEvent<2>;
- template class DLLExport MDEvent<3>;
- template class DLLExport MDEvent<4>;
- template class DLLExport MDEvent<5>;
- template class DLLExport MDEvent<6>;
- template class DLLExport MDEvent<7>;
- template class DLLExport MDEvent<8>;
- template class DLLExport MDEvent<9>;
+template class DLLExport MDEvent<1>;
+template class DLLExport MDEvent<2>;
+template class DLLExport MDEvent<3>;
+template class DLLExport MDEvent<4>;
+template class DLLExport MDEvent<5>;
+template class DLLExport MDEvent<6>;
+template class DLLExport MDEvent<7>;
+template class DLLExport MDEvent<8>;
+template class DLLExport MDEvent<9>;
// Instantiations for MDBoxBase
- template class DLLExport MDBoxBase<MDLeanEvent<1>, 1>;
- template class DLLExport MDBoxBase<MDLeanEvent<2>, 2>;
- template class DLLExport MDBoxBase<MDLeanEvent<3>, 3>;
- template class DLLExport MDBoxBase<MDLeanEvent<4>, 4>;
- template class DLLExport MDBoxBase<MDLeanEvent<5>, 5>;
- template class DLLExport MDBoxBase<MDLeanEvent<6>, 6>;
- template class DLLExport MDBoxBase<MDLeanEvent<7>, 7>;
- template class DLLExport MDBoxBase<MDLeanEvent<8>, 8>;
- template class DLLExport MDBoxBase<MDLeanEvent<9>, 9>;
- template class DLLExport MDBoxBase<MDEvent<1>, 1>;
- template class DLLExport MDBoxBase<MDEvent<2>, 2>;
- template class DLLExport MDBoxBase<MDEvent<3>, 3>;
- template class DLLExport MDBoxBase<MDEvent<4>, 4>;
- template class DLLExport MDBoxBase<MDEvent<5>, 5>;
- template class DLLExport MDBoxBase<MDEvent<6>, 6>;
- template class DLLExport MDBoxBase<MDEvent<7>, 7>;
- template class DLLExport MDBoxBase<MDEvent<8>, 8>;
- template class DLLExport MDBoxBase<MDEvent<9>, 9>;
+template class DLLExport MDBoxBase<MDLeanEvent<1>, 1>;
+template class DLLExport MDBoxBase<MDLeanEvent<2>, 2>;
+template class DLLExport MDBoxBase<MDLeanEvent<3>, 3>;
+template class DLLExport MDBoxBase<MDLeanEvent<4>, 4>;
+template class DLLExport MDBoxBase<MDLeanEvent<5>, 5>;
+template class DLLExport MDBoxBase<MDLeanEvent<6>, 6>;
+template class DLLExport MDBoxBase<MDLeanEvent<7>, 7>;
+template class DLLExport MDBoxBase<MDLeanEvent<8>, 8>;
+template class DLLExport MDBoxBase<MDLeanEvent<9>, 9>;
+template class DLLExport MDBoxBase<MDEvent<1>, 1>;
+template class DLLExport MDBoxBase<MDEvent<2>, 2>;
+template class DLLExport MDBoxBase<MDEvent<3>, 3>;
+template class DLLExport MDBoxBase<MDEvent<4>, 4>;
+template class DLLExport MDBoxBase<MDEvent<5>, 5>;
+template class DLLExport MDBoxBase<MDEvent<6>, 6>;
+template class DLLExport MDBoxBase<MDEvent<7>, 7>;
+template class DLLExport MDBoxBase<MDEvent<8>, 8>;
+template class DLLExport MDBoxBase<MDEvent<9>, 9>;
-
// Instantiations for MDBox
- template class DLLExport MDBox<MDLeanEvent<1>, 1>;
- template class DLLExport MDBox<MDLeanEvent<2>, 2>;
- template class DLLExport MDBox<MDLeanEvent<3>, 3>;
- template class DLLExport MDBox<MDLeanEvent<4>, 4>;
- template class DLLExport MDBox<MDLeanEvent<5>, 5>;
- template class DLLExport MDBox<MDLeanEvent<6>, 6>;
- template class DLLExport MDBox<MDLeanEvent<7>, 7>;
- template class DLLExport MDBox<MDLeanEvent<8>, 8>;
- template class DLLExport MDBox<MDLeanEvent<9>, 9>;
- template class DLLExport MDBox<MDEvent<1>, 1>;
- template class DLLExport MDBox<MDEvent<2>, 2>;
- template class DLLExport MDBox<MDEvent<3>, 3>;
- template class DLLExport MDBox<MDEvent<4>, 4>;
- template class DLLExport MDBox<MDEvent<5>, 5>;
- template class DLLExport MDBox<MDEvent<6>, 6>;
- template class DLLExport MDBox<MDEvent<7>, 7>;
- template class DLLExport MDBox<MDEvent<8>, 8>;
- template class DLLExport MDBox<MDEvent<9>, 9>;
+template class DLLExport MDBox<MDLeanEvent<1>, 1>;
+template class DLLExport MDBox<MDLeanEvent<2>, 2>;
+template class DLLExport MDBox<MDLeanEvent<3>, 3>;
+template class DLLExport MDBox<MDLeanEvent<4>, 4>;
+template class DLLExport MDBox<MDLeanEvent<5>, 5>;
+template class DLLExport MDBox<MDLeanEvent<6>, 6>;
+template class DLLExport MDBox<MDLeanEvent<7>, 7>;
+template class DLLExport MDBox<MDLeanEvent<8>, 8>;
+template class DLLExport MDBox<MDLeanEvent<9>, 9>;
+template class DLLExport MDBox<MDEvent<1>, 1>;
+template class DLLExport MDBox<MDEvent<2>, 2>;
+template class DLLExport MDBox<MDEvent<3>, 3>;
+template class DLLExport MDBox<MDEvent<4>, 4>;
+template class DLLExport MDBox<MDEvent<5>, 5>;
+template class DLLExport MDBox<MDEvent<6>, 6>;
+template class DLLExport MDBox<MDEvent<7>, 7>;
+template class DLLExport MDBox<MDEvent<8>, 8>;
+template class DLLExport MDBox<MDEvent<9>, 9>;
-
// Instantiations for MDEventWorkspace
- template class DLLExport MDEventWorkspace<MDLeanEvent<1>, 1>;
- template class DLLExport MDEventWorkspace<MDLeanEvent<2>, 2>;
- template class DLLExport MDEventWorkspace<MDLeanEvent<3>, 3>;
- template class DLLExport MDEventWorkspace<MDLeanEvent<4>, 4>;
- template class DLLExport MDEventWorkspace<MDLeanEvent<5>, 5>;
- template class DLLExport MDEventWorkspace<MDLeanEvent<6>, 6>;
- template class DLLExport MDEventWorkspace<MDLeanEvent<7>, 7>;
- template class DLLExport MDEventWorkspace<MDLeanEvent<8>, 8>;
- template class DLLExport MDEventWorkspace<MDLeanEvent<9>, 9>;
- template class DLLExport MDEventWorkspace<MDEvent<1>, 1>;
- template class DLLExport MDEventWorkspace<MDEvent<2>, 2>;
- template class DLLExport MDEventWorkspace<MDEvent<3>, 3>;
- template class DLLExport MDEventWorkspace<MDEvent<4>, 4>;
- template class DLLExport MDEventWorkspace<MDEvent<5>, 5>;
- template class DLLExport MDEventWorkspace<MDEvent<6>, 6>;
- template class DLLExport MDEventWorkspace<MDEvent<7>, 7>;
- template class DLLExport MDEventWorkspace<MDEvent<8>, 8>;
- template class DLLExport MDEventWorkspace<MDEvent<9>, 9>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<1>, 1>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<2>, 2>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<3>, 3>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<4>, 4>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<5>, 5>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<6>, 6>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<7>, 7>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<8>, 8>;
+template class DLLExport MDEventWorkspace<MDLeanEvent<9>, 9>;
+template class DLLExport MDEventWorkspace<MDEvent<1>, 1>;
+template class DLLExport MDEventWorkspace<MDEvent<2>, 2>;
+template class DLLExport MDEventWorkspace<MDEvent<3>, 3>;
+template class DLLExport MDEventWorkspace<MDEvent<4>, 4>;
+template class DLLExport MDEventWorkspace<MDEvent<5>, 5>;
+template class DLLExport MDEventWorkspace<MDEvent<6>, 6>;
+template class DLLExport MDEventWorkspace<MDEvent<7>, 7>;
+template class DLLExport MDEventWorkspace<MDEvent<8>, 8>;
+template class DLLExport MDEventWorkspace<MDEvent<9>, 9>;
-
// Instantiations for MDGridBox
- template class DLLExport MDGridBox<MDLeanEvent<1>, 1>;
- template class DLLExport MDGridBox<MDLeanEvent<2>, 2>;
- template class DLLExport MDGridBox<MDLeanEvent<3>, 3>;
- template class DLLExport MDGridBox<MDLeanEvent<4>, 4>;
- template class DLLExport MDGridBox<MDLeanEvent<5>, 5>;
- template class DLLExport MDGridBox<MDLeanEvent<6>, 6>;
- template class DLLExport MDGridBox<MDLeanEvent<7>, 7>;
- template class DLLExport MDGridBox<MDLeanEvent<8>, 8>;
- template class DLLExport MDGridBox<MDLeanEvent<9>, 9>;
- template class DLLExport MDGridBox<MDEvent<1>, 1>;
- template class DLLExport MDGridBox<MDEvent<2>, 2>;
- template class DLLExport MDGridBox<MDEvent<3>, 3>;
- template class DLLExport MDGridBox<MDEvent<4>, 4>;
- template class DLLExport MDGridBox<MDEvent<5>, 5>;
- template class DLLExport MDGridBox<MDEvent<6>, 6>;
- template class DLLExport MDGridBox<MDEvent<7>, 7>;
- template class DLLExport MDGridBox<MDEvent<8>, 8>;
- template class DLLExport MDGridBox<MDEvent<9>, 9>;
+template class DLLExport MDGridBox<MDLeanEvent<1>, 1>;
+template class DLLExport MDGridBox<MDLeanEvent<2>, 2>;
+template class DLLExport MDGridBox<MDLeanEvent<3>, 3>;
+template class DLLExport MDGridBox<MDLeanEvent<4>, 4>;
+template class DLLExport MDGridBox<MDLeanEvent<5>, 5>;
+template class DLLExport MDGridBox<MDLeanEvent<6>, 6>;
+template class DLLExport MDGridBox<MDLeanEvent<7>, 7>;
+template class DLLExport MDGridBox<MDLeanEvent<8>, 8>;
+template class DLLExport MDGridBox<MDLeanEvent<9>, 9>;
+template class DLLExport MDGridBox<MDEvent<1>, 1>;
+template class DLLExport MDGridBox<MDEvent<2>, 2>;
+template class DLLExport MDGridBox<MDEvent<3>, 3>;
+template class DLLExport MDGridBox<MDEvent<4>, 4>;
+template class DLLExport MDGridBox<MDEvent<5>, 5>;
+template class DLLExport MDGridBox<MDEvent<6>, 6>;
+template class DLLExport MDGridBox<MDEvent<7>, 7>;
+template class DLLExport MDGridBox<MDEvent<8>, 8>;
+template class DLLExport MDGridBox<MDEvent<9>, 9>;
-
// Instantiations for MDBin
- template class DLLExport MDBin<MDLeanEvent<1>, 1>;
- template class DLLExport MDBin<MDLeanEvent<2>, 2>;
- template class DLLExport MDBin<MDLeanEvent<3>, 3>;
- template class DLLExport MDBin<MDLeanEvent<4>, 4>;
- template class DLLExport MDBin<MDLeanEvent<5>, 5>;
- template class DLLExport MDBin<MDLeanEvent<6>, 6>;
- template class DLLExport MDBin<MDLeanEvent<7>, 7>;
- template class DLLExport MDBin<MDLeanEvent<8>, 8>;
- template class DLLExport MDBin<MDLeanEvent<9>, 9>;
- template class DLLExport MDBin<MDEvent<1>, 1>;
- template class DLLExport MDBin<MDEvent<2>, 2>;
- template class DLLExport MDBin<MDEvent<3>, 3>;
- template class DLLExport MDBin<MDEvent<4>, 4>;
- template class DLLExport MDBin<MDEvent<5>, 5>;
- template class DLLExport MDBin<MDEvent<6>, 6>;
- template class DLLExport MDBin<MDEvent<7>, 7>;
- template class DLLExport MDBin<MDEvent<8>, 8>;
- template class DLLExport MDBin<MDEvent<9>, 9>;
+template class DLLExport MDBin<MDLeanEvent<1>, 1>;
+template class DLLExport MDBin<MDLeanEvent<2>, 2>;
+template class DLLExport MDBin<MDLeanEvent<3>, 3>;
+template class DLLExport MDBin<MDLeanEvent<4>, 4>;
+template class DLLExport MDBin<MDLeanEvent<5>, 5>;
+template class DLLExport MDBin<MDLeanEvent<6>, 6>;
+template class DLLExport MDBin<MDLeanEvent<7>, 7>;
+template class DLLExport MDBin<MDLeanEvent<8>, 8>;
+template class DLLExport MDBin<MDLeanEvent<9>, 9>;
+template class DLLExport MDBin<MDEvent<1>, 1>;
+template class DLLExport MDBin<MDEvent<2>, 2>;
+template class DLLExport MDBin<MDEvent<3>, 3>;
+template class DLLExport MDBin<MDEvent<4>, 4>;
+template class DLLExport MDBin<MDEvent<5>, 5>;
+template class DLLExport MDBin<MDEvent<6>, 6>;
+template class DLLExport MDBin<MDEvent<7>, 7>;
+template class DLLExport MDBin<MDEvent<8>, 8>;
+template class DLLExport MDBin<MDEvent<9>, 9>;
-
// Instantiations for MDBoxIterator
- template class DLLExport MDBoxIterator<MDLeanEvent<1>, 1>;
- template class DLLExport MDBoxIterator<MDLeanEvent<2>, 2>;
- template class DLLExport MDBoxIterator<MDLeanEvent<3>, 3>;
- template class DLLExport MDBoxIterator<MDLeanEvent<4>, 4>;
- template class DLLExport MDBoxIterator<MDLeanEvent<5>, 5>;
- template class DLLExport MDBoxIterator<MDLeanEvent<6>, 6>;
- template class DLLExport MDBoxIterator<MDLeanEvent<7>, 7>;
- template class DLLExport MDBoxIterator<MDLeanEvent<8>, 8>;
- template class DLLExport MDBoxIterator<MDLeanEvent<9>, 9>;
- template class DLLExport MDBoxIterator<MDEvent<1>, 1>;
- template class DLLExport MDBoxIterator<MDEvent<2>, 2>;
- template class DLLExport MDBoxIterator<MDEvent<3>, 3>;
- template class DLLExport MDBoxIterator<MDEvent<4>, 4>;
- template class DLLExport MDBoxIterator<MDEvent<5>, 5>;
- template class DLLExport MDBoxIterator<MDEvent<6>, 6>;
- template class DLLExport MDBoxIterator<MDEvent<7>, 7>;
- template class DLLExport MDBoxIterator<MDEvent<8>, 8>;
- template class DLLExport MDBoxIterator<MDEvent<9>, 9>;
+template class DLLExport MDBoxIterator<MDLeanEvent<1>, 1>;
+template class DLLExport MDBoxIterator<MDLeanEvent<2>, 2>;
+template class DLLExport MDBoxIterator<MDLeanEvent<3>, 3>;
+template class DLLExport MDBoxIterator<MDLeanEvent<4>, 4>;
+template class DLLExport MDBoxIterator<MDLeanEvent<5>, 5>;
+template class DLLExport MDBoxIterator<MDLeanEvent<6>, 6>;
+template class DLLExport MDBoxIterator<MDLeanEvent<7>, 7>;
+template class DLLExport MDBoxIterator<MDLeanEvent<8>, 8>;
+template class DLLExport MDBoxIterator<MDLeanEvent<9>, 9>;
+template class DLLExport MDBoxIterator<MDEvent<1>, 1>;
+template class DLLExport MDBoxIterator<MDEvent<2>, 2>;
+template class DLLExport MDBoxIterator<MDEvent<3>, 3>;
+template class DLLExport MDBoxIterator<MDEvent<4>, 4>;
+template class DLLExport MDBoxIterator<MDEvent<5>, 5>;
+template class DLLExport MDBoxIterator<MDEvent<6>, 6>;
+template class DLLExport MDBoxIterator<MDEvent<7>, 7>;
+template class DLLExport MDBoxIterator<MDEvent<8>, 8>;
+template class DLLExport MDBoxIterator<MDEvent<9>, 9>;
-
-
-/* CODE ABOWE WAS AUTO-GENERATED BY generate_mdevent_declarations.py - DO NOT EDIT! */
+/* CODE ABOWE WAS AUTO-GENERATED BY generate_mdevent_declarations.py - DO NOT
+ * EDIT! */
//### END AUTO-GENERATED CODE
//##################################################################
@@ -444,5 +438,3 @@ LOOP<MDEventFactory::MAX_MD_DIMENSIONS_NUM> MDEventFactory::CODE_GENERATOR;
} // namespace Mantid
} // namespace DataObjects
-
-
diff --git a/Framework/DataObjects/src/Workspace2D.cpp b/Framework/DataObjects/src/Workspace2D.cpp
index ee2b08bab992d39c0eb17676aa74be64f5aee9c4..0d3a0cad0203382ca646cf26239bd816eb74247b 100644
--- a/Framework/DataObjects/src/Workspace2D.cpp
+++ b/Framework/DataObjects/src/Workspace2D.cpp
@@ -324,8 +324,8 @@ void Workspace2D::generateHistogram(const std::size_t index, const MantidVec &X,
} // NamespaceMantid
///\cond TEMPLATE
-template class DLLExport Mantid::API::WorkspaceProperty<
- Mantid::DataObjects::Workspace2D>;
+template class DLLExport
+ Mantid::API::WorkspaceProperty<Mantid::DataObjects::Workspace2D>;
namespace Mantid {
namespace Kernel {
diff --git a/Framework/DataObjects/src/WorkspaceSingleValue.cpp b/Framework/DataObjects/src/WorkspaceSingleValue.cpp
index 28bb85961c918b2f26fcac528457d3578bb029f0..1773a3717ced02470ba8edda7a3813d794a4eb4f 100644
--- a/Framework/DataObjects/src/WorkspaceSingleValue.cpp
+++ b/Framework/DataObjects/src/WorkspaceSingleValue.cpp
@@ -75,8 +75,8 @@ size_t WorkspaceSingleValue::getNumDims() const { return 0; }
///\cond TEMPLATE
-template class DLLExport Mantid::API::WorkspaceProperty<
- Mantid::DataObjects::WorkspaceSingleValue>;
+template class DLLExport
+ Mantid::API::WorkspaceProperty<Mantid::DataObjects::WorkspaceSingleValue>;
namespace Mantid {
namespace Kernel {
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
index 7feacfdeb82aa5bf4cba184475d4e03b3077c012..a9782105dc3dc6b7f1b78931580ca5d323dcc5f9 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/BraggScattererFactory.h
@@ -93,8 +93,8 @@ typedef Mantid::Kernel::SingletonHolder<BraggScattererFactoryImpl>
namespace Mantid {
namespace Kernel {
-EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL
- Mantid::Kernel::SingletonHolder<Mantid::Geometry::BraggScattererFactoryImpl>;
+EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::
+ SingletonHolder<Mantid::Geometry::BraggScattererFactoryImpl>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
index 025c21aafa041daa616e5db61674a50d69ac1736..85c03b85504d7b981875cee0339262179b378bc0 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/CenteringGroup.h
@@ -102,8 +102,8 @@ typedef Mantid::Kernel::SingletonHolder<CenteringGroupCreatorImpl>
namespace Mantid {
namespace Kernel {
-EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL
- Mantid::Kernel::SingletonHolder<Mantid::Geometry::CenteringGroupCreatorImpl>;
+EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::
+ SingletonHolder<Mantid::Geometry::CenteringGroupCreatorImpl>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
index b555b6d78f12122367df68ff96abbc6588a3d5bc..6e22e4a622a6bcb1ea75aaec3072cba60d138d72 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/PointGroupFactory.h
@@ -120,7 +120,6 @@ private:
boost::regex m_originChoiceRegex;
};
-
typedef Mantid::Kernel::SingletonHolder<PointGroupFactoryImpl>
PointGroupFactory;
@@ -129,7 +128,8 @@ typedef Mantid::Kernel::SingletonHolder<PointGroupFactoryImpl>
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::SingletonHolder<Mantid::Geometry::PointGroupFactoryImpl>;
+EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::Geometry::PointGroupFactoryImpl>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
index 3d69b0e0d9d6949fa0a28e6faf1a00e86f684449..fd45198f439afd19a9be63a2f4e8d27661211ae1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SpaceGroupFactory.h
@@ -273,11 +273,11 @@ typedef Mantid::Kernel::SingletonHolder<SpaceGroupFactoryImpl>
namespace Mantid {
namespace Kernel {
-EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::SingletonHolder<Mantid::Geometry::SpaceGroupFactoryImpl>;
+EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL
+ Mantid::Kernel::SingletonHolder<Mantid::Geometry::SpaceGroupFactoryImpl>;
}
}
-
/* Macros for compile time space group registration
*
* The macros are a bit different than in other factories,
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
index f2b7c008ef9f7d8517964673ee70607e1087b139..4af44420a09741af2002030201205ed4ba0c1de1 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryElementFactory.h
@@ -257,7 +257,6 @@ private:
friend struct Mantid::Kernel::CreateUsingNew<SymmetryElementFactoryImpl>;
};
-
typedef Mantid::Kernel::SingletonHolder<SymmetryElementFactoryImpl>
SymmetryElementFactory;
@@ -266,8 +265,8 @@ typedef Mantid::Kernel::SingletonHolder<SymmetryElementFactoryImpl>
namespace Mantid {
namespace Kernel {
-EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL
- Mantid::Kernel::SingletonHolder<Mantid::Geometry::SymmetryElementFactoryImpl>;
+EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::
+ SingletonHolder<Mantid::Geometry::SymmetryElementFactoryImpl>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
index 480efcae2bf2c9870d588f143db10c8cf67bd09e..e9fa3cb12dea67dcb9f6ee93cd271cdc4181e53f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
+++ b/Framework/Geometry/inc/MantidGeometry/Crystal/SymmetryOperationFactory.h
@@ -86,8 +86,8 @@ typedef Mantid::Kernel::SingletonHolder<SymmetryOperationFactoryImpl>
namespace Mantid {
namespace Kernel {
-EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL
- Mantid::Kernel::SingletonHolder<Mantid::Geometry::SymmetryOperationFactoryImpl>;
+EXTERN_MANTID_GEOMETRY template class MANTID_GEOMETRY_DLL Mantid::Kernel::
+ SingletonHolder<Mantid::Geometry::SymmetryOperationFactoryImpl>;
}
}
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
index 7d350f34c1b4320a35bdae697873a995c29025bd..47691bd996599d6d7fa30af9591a52b5c9e29099 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/Parameter.h
@@ -243,7 +243,7 @@ typedef ParameterType<double> ParameterDouble;
/// Parameter of type bool
typedef ParameterType<bool> ParameterBool;
/// Parameter of type std::string
-typedef ParameterType<std::string> ParameterString;
+typedef ParameterType<std::string> ParameterString;
/// Parameter of type V3D
typedef ParameterType<Kernel::V3D> ParameterV3D;
/// Parameter of type Quat
diff --git a/Framework/Geometry/src/Crystal/BraggScattererFactory.cpp b/Framework/Geometry/src/Crystal/BraggScattererFactory.cpp
index 45541df0c1e91b49d53092f962a5b1d46215238d..d873b535249ea0df0c2c5e3b505f3c8a76fd587b 100644
--- a/Framework/Geometry/src/Crystal/BraggScattererFactory.cpp
+++ b/Framework/Geometry/src/Crystal/BraggScattererFactory.cpp
@@ -38,4 +38,3 @@ BraggScattererFactoryImpl::BraggScattererFactoryImpl() {
} // namespace Geometry
} // namespace Mantid
-
diff --git a/Framework/Geometry/src/Crystal/PointGroupFactory.cpp b/Framework/Geometry/src/Crystal/PointGroupFactory.cpp
index 3a34ac5475c56467d64fd183562dd8ddb954c189..5c31b248192e2709745eaadef9fdbb4fdf5fdfc6 100644
--- a/Framework/Geometry/src/Crystal/PointGroupFactory.cpp
+++ b/Framework/Geometry/src/Crystal/PointGroupFactory.cpp
@@ -251,4 +251,3 @@ DECLARE_POINTGROUP("m-3m", "-z,-x,-y; -y,x,z; y,x,-z", "Cubic")
} // namespace Geometry
} // namespace Mantid
-
diff --git a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
index 736b93c7db634a6222de045bab983f6382a8164f..05081736046e55ef007c27b94c9a7aaf69ebc911 100644
--- a/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
+++ b/Framework/Kernel/inc/MantidKernel/ANN/ANN.h
@@ -98,7 +98,7 @@
#endif
#elif defined(__GNUC__)
#ifdef IN_MANTID_KERNEL
-#define DLL_API __attribute__ ((visibility ("default")))
+#define DLL_API __attribute__((visibility("default")))
#else
#define DLL_API
#endif
diff --git a/Framework/Kernel/inc/MantidKernel/ConfigService.h b/Framework/Kernel/inc/MantidKernel/ConfigService.h
index 7b1c490edc8e239d79f6d67a61ba4adcadcc0576..52fbee6f26e9c84207d25840c511e0e67c33929d 100644
--- a/Framework/Kernel/inc/MantidKernel/ConfigService.h
+++ b/Framework/Kernel/inc/MantidKernel/ConfigService.h
@@ -352,9 +352,9 @@ private:
std::vector<std::string> m_filterChannels;
};
-EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<ConfigServiceImpl>;
-typedef Mantid::Kernel::SingletonHolder<ConfigServiceImpl>
- ConfigService;
+EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL
+ Mantid::Kernel::SingletonHolder<ConfigServiceImpl>;
+typedef Mantid::Kernel::SingletonHolder<ConfigServiceImpl> ConfigService;
typedef Mantid::Kernel::ConfigServiceImpl::ValueChanged
ConfigValChangeNotification;
diff --git a/Framework/Kernel/inc/MantidKernel/LibraryManager.h b/Framework/Kernel/inc/MantidKernel/LibraryManager.h
index aa40347f6ddfb9b8f90b405a2a21ee32cbd49be1..ae95398fc06fc474f4788e348bdd699d4d528111 100644
--- a/Framework/Kernel/inc/MantidKernel/LibraryManager.h
+++ b/Framework/Kernel/inc/MantidKernel/LibraryManager.h
@@ -69,10 +69,9 @@ private:
OpenLibs;
};
-
-EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<LibraryManagerImpl>;
-typedef Mantid::Kernel::SingletonHolder<LibraryManagerImpl>
- LibraryManager;
+EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL
+ Mantid::Kernel::SingletonHolder<LibraryManagerImpl>;
+typedef Mantid::Kernel::SingletonHolder<LibraryManagerImpl> LibraryManager;
} // namespace Kernel
} // namespace Mantid
diff --git a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
index db4650b5dba1b4bdd807882bdff30026626cc636..6caae94d1fb16dc89a9d8ba82bc023a38a09730d 100644
--- a/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
+++ b/Framework/Kernel/inc/MantidKernel/PropertyManagerDataService.h
@@ -46,9 +46,10 @@ private:
~PropertyManagerDataServiceImpl() override = default;
};
-EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>;
-typedef Mantid::Kernel::SingletonHolder<
- PropertyManagerDataServiceImpl> PropertyManagerDataService;
+EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL
+ Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>;
+typedef Mantid::Kernel::SingletonHolder<PropertyManagerDataServiceImpl>
+ PropertyManagerDataService;
} // Namespace Kernel
} // Namespace Mantid
diff --git a/Framework/Kernel/inc/MantidKernel/System.h b/Framework/Kernel/inc/MantidKernel/System.h
index af29b1219b343ab3ecef5b843333c4f28c72dd33..f4cf3d4fedf5e970fe3081bd2c4212daf6f78932 100644
--- a/Framework/Kernel/inc/MantidKernel/System.h
+++ b/Framework/Kernel/inc/MantidKernel/System.h
@@ -61,7 +61,7 @@
#define DLLExport __declspec(dllexport)
#define DLLImport __declspec(dllimport)
#elif defined(__GNUC__)
-#define DLLExport __attribute__ ((visibility ("default")))
+#define DLLExport __attribute__((visibility("default")))
#define DLLImport
#else
#define DLLExport
diff --git a/Framework/Kernel/inc/MantidKernel/UnitFactory.h b/Framework/Kernel/inc/MantidKernel/UnitFactory.h
index 5bd573afbea040d958faf591d7419eb6440d666e..d8de9c7e8fa7cee1ce9d57baebd04564b0a8dd84 100644
--- a/Framework/Kernel/inc/MantidKernel/UnitFactory.h
+++ b/Framework/Kernel/inc/MantidKernel/UnitFactory.h
@@ -83,8 +83,8 @@ private:
~UnitFactoryImpl() override = default;
};
-
-EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL Mantid::Kernel::SingletonHolder<UnitFactoryImpl>;
+EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL
+ Mantid::Kernel::SingletonHolder<UnitFactoryImpl>;
typedef SingletonHolder<UnitFactoryImpl> UnitFactory;
diff --git a/Framework/Kernel/inc/MantidKernel/UsageService.h b/Framework/Kernel/inc/MantidKernel/UsageService.h
index 6592245cef650d5f4a0864b0d7e201ace372fd36..c1310ec69e5b7e5c0bd99d967963ffbd57b14357 100644
--- a/Framework/Kernel/inc/MantidKernel/UsageService.h
+++ b/Framework/Kernel/inc/MantidKernel/UsageService.h
@@ -137,11 +137,9 @@ private:
Poco::ActiveMethod<int, std::string, UsageServiceImpl> m_featureActiveMethod;
};
-
EXTERN_MANTID_KERNEL template class MANTID_KERNEL_DLL
- Mantid::Kernel::SingletonHolder<UsageServiceImpl>;
-typedef Mantid::Kernel::SingletonHolder<UsageServiceImpl>
- UsageService;
+ Mantid::Kernel::SingletonHolder<UsageServiceImpl>;
+typedef Mantid::Kernel::SingletonHolder<UsageServiceImpl> UsageService;
} // namespace Kernel
} // namespace Mantid
diff --git a/Framework/Kernel/src/TimeSeriesProperty.cpp b/Framework/Kernel/src/TimeSeriesProperty.cpp
index 43d8398d54ecde42778096f0a31e690ace303aa0..36f6bd07c229ebb5e318254a1884912ced16bf9a 100644
--- a/Framework/Kernel/src/TimeSeriesProperty.cpp
+++ b/Framework/Kernel/src/TimeSeriesProperty.cpp
@@ -2094,8 +2094,7 @@ TimeSeriesProperty<TYPE>::setValueFromProperty(const Property &right) {
/// @cond
// -------------------------- Macro to instantiation concrete types
// --------------------------------
-#define INSTANTIATE(TYPE) \
- template class TimeSeriesProperty<TYPE>;
+#define INSTANTIATE(TYPE) template class TimeSeriesProperty<TYPE>;
// -------------------------- Concrete instantiation
// -----------------------------------------------
diff --git a/Framework/Kernel/src/VMD.cpp b/Framework/Kernel/src/VMD.cpp
index 8164dd6c3236d2927b969e564b733456d1d7c7ee..2d0a526fff2e2208c0ecec8e172dff8271809b2f 100644
--- a/Framework/Kernel/src/VMD.cpp
+++ b/Framework/Kernel/src/VMD.cpp
@@ -5,7 +5,6 @@ using namespace Mantid::Kernel;
namespace Mantid {
namespace Kernel {
-
//-------------------------------------------------------------------------------------------------
/** Make an orthogonal system with 2 input 3D vectors.
* Currently only works in 3D!
@@ -121,7 +120,6 @@ VMDBase<TYPE>::getNormalVector(const std::vector<VMDBase<TYPE>> &vectors) {
template class MANTID_KERNEL_DLL VMDBase<double>;
template class MANTID_KERNEL_DLL VMDBase<float>;
-
/**
Prints a text representation of itself
@param os :: the Stream to output to
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfFactory.h
index ac2136c5223745b9022a42041bc19df4a0739836..bfe1777de9836966c00e43a674df35523bf9c337 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfFactory.h
@@ -118,7 +118,7 @@ typedef Kernel::SingletonHolder<MDTransfFactoryImpl> MDTransfFactory;
namespace Mantid {
namespace Kernel {
EXTERN_MANTID_MDALGORITHMS template class MANTID_MDALGORITHMS_DLL
- Mantid::Kernel::SingletonHolder<Mantid::MDAlgorithms::MDTransfFactoryImpl>;
+ Mantid::Kernel::SingletonHolder<Mantid::MDAlgorithms::MDTransfFactoryImpl>;
}
}
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
index e9a6146cd90a1b944c5a4fe92132f887381af07b..18c411cffe9073d70a0df91e4c27f102d16fdcc6 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h
@@ -65,14 +65,15 @@ private:
};
/// Typedef singleton instance to ForegroundFactory
-typedef Kernel::SingletonHolder<ForegroundModelFactoryImpl> ForegroundModelFactory;
+typedef Kernel::SingletonHolder<ForegroundModelFactoryImpl>
+ ForegroundModelFactory;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_MDALGORITHMS template class MANTID_MDALGORITHMS_DLL
- Kernel::SingletonHolder<Mantid::MDAlgorithms::ForegroundModelFactoryImpl>;
+EXTERN_MANTID_MDALGORITHMS template class MANTID_MDALGORITHMS_DLL
+ Kernel::SingletonHolder<Mantid::MDAlgorithms::ForegroundModelFactoryImpl>;
}
}
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
index 0576d374928e7ab2b91d04fcc43978a2037123d8..104df8efe99c2cefb300b73fd40c6668d17dc3b4 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h
@@ -64,15 +64,15 @@ private:
};
/// Typedef singleton instance to MDResolutionConvolutionFactory
-typedef Kernel::SingletonHolder<
- MDResolutionConvolutionFactoryImpl> MDResolutionConvolutionFactory;
+typedef Kernel::SingletonHolder<MDResolutionConvolutionFactoryImpl>
+ MDResolutionConvolutionFactory;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTID_MDALGORITHMS template class MANTID_MDALGORITHMS_DLL
- Kernel::SingletonHolder<Mantid::MDAlgorithms::MDResolutionConvolutionFactoryImpl>;
+EXTERN_MANTID_MDALGORITHMS template class MANTID_MDALGORITHMS_DLL Kernel::
+ SingletonHolder<Mantid::MDAlgorithms::MDResolutionConvolutionFactoryImpl>;
}
}
diff --git a/Framework/MDAlgorithms/src/Quantification/ForegroundModelFactory.cpp b/Framework/MDAlgorithms/src/Quantification/ForegroundModelFactory.cpp
index 4af524cf2778b956370593ec8ba5065c807564a3..5320932439df9c9dbb1b36ee205c629adb6f1b39 100644
--- a/Framework/MDAlgorithms/src/Quantification/ForegroundModelFactory.cpp
+++ b/Framework/MDAlgorithms/src/Quantification/ForegroundModelFactory.cpp
@@ -25,6 +25,5 @@ ForegroundModelFactoryImpl::createModel(const std::string &name,
fgModel->setFunctionUnderMinimization(fitFunction);
return fgModel;
}
-
}
}
diff --git a/Framework/MDAlgorithms/src/Quantification/MDResolutionConvolutionFactory.cpp b/Framework/MDAlgorithms/src/Quantification/MDResolutionConvolutionFactory.cpp
index a36bc17da096b61d816849438ebba140d625df9b..b01bbad62b5b8a6d4a722498abd1932d9daa2691 100644
--- a/Framework/MDAlgorithms/src/Quantification/MDResolutionConvolutionFactory.cpp
+++ b/Framework/MDAlgorithms/src/Quantification/MDResolutionConvolutionFactory.cpp
@@ -26,6 +26,5 @@ MDResolutionConvolution *MDResolutionConvolutionFactoryImpl::createConvolution(
convolution->initialize();
return convolution;
}
-
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h b/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
index 51d23382320fd3af7c94cc0c356b51657e438bfc..52c28ce400cf1b43e2c9a526ff3071ebca3f005b 100644
--- a/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
+++ b/MantidQt/API/inc/MantidQtAPI/AlgorithmInputHistory.h
@@ -96,13 +96,15 @@ private:
friend struct Mantid::Kernel::CreateUsingNew<AlgorithmInputHistoryImpl>;
};
-typedef Mantid::Kernel::SingletonHolder<AlgorithmInputHistoryImpl> AlgorithmInputHistory;
+typedef Mantid::Kernel::SingletonHolder<AlgorithmInputHistoryImpl>
+ AlgorithmInputHistory;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTIDQT_API template class EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<MantidQt::API::AlgorithmInputHistoryImpl>;
+EXTERN_MANTIDQT_API template class EXPORT_OPT_MANTIDQT_API
+ Mantid::Kernel::SingletonHolder<MantidQt::API::AlgorithmInputHistoryImpl>;
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h b/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
index a8e659054508a92764e3356b69eb42dcc4b9c3f4..ff9b7a0247a64fbca176a6110e23bee1335b5c8b 100644
--- a/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
+++ b/MantidQt/API/inc/MantidQtAPI/InterfaceFactory.h
@@ -69,10 +69,9 @@ private:
~AlgorithmDialogFactoryImpl() override = default;
};
-
/// The specific instantiation of the templated type
-typedef Mantid::Kernel::SingletonHolder<
- AlgorithmDialogFactoryImpl> AlgorithmDialogFactory;
+typedef Mantid::Kernel::SingletonHolder<AlgorithmDialogFactoryImpl>
+ AlgorithmDialogFactory;
/**
The UserSubWindowFactory is responsible for creating concrete instances of
@@ -181,17 +180,17 @@ void UserSubWindowFactoryImpl::saveAliasNames(const std::string &realName) {
}
/// The specific instantiation of the templated type
-typedef Mantid::Kernel::SingletonHolder<
- UserSubWindowFactoryImpl> UserSubWindowFactory;
+typedef Mantid::Kernel::SingletonHolder<UserSubWindowFactoryImpl>
+ UserSubWindowFactory;
}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTIDQT_API template class EXPORT_OPT_MANTIDQT_API
- Mantid::Kernel::SingletonHolder<MantidQt::API::AlgorithmDialogFactoryImpl>;
- EXTERN_MANTIDQT_API template class EXPORT_OPT_MANTIDQT_API
- Mantid::Kernel::SingletonHolder<MantidQt::API::UserSubWindowFactoryImpl>;
+EXTERN_MANTIDQT_API template class EXPORT_OPT_MANTIDQT_API
+ Mantid::Kernel::SingletonHolder<MantidQt::API::AlgorithmDialogFactoryImpl>;
+EXTERN_MANTIDQT_API template class EXPORT_OPT_MANTIDQT_API
+ Mantid::Kernel::SingletonHolder<MantidQt::API::UserSubWindowFactoryImpl>;
}
}
diff --git a/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h b/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
index e5e760650d4458d2bdca2a302c705fc397d9bb4a..37a55319fd9f312709a79c65825187f39af814c1 100644
--- a/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
+++ b/MantidQt/API/inc/MantidQtAPI/SelectionNotificationService.h
@@ -63,12 +63,14 @@ private:
SelectionNotificationServiceImpl>;
};
- typedef Mantid::Kernel::SingletonHolder<SelectionNotificationServiceImpl> SelectionNotificationService;
- }
+typedef Mantid::Kernel::SingletonHolder<SelectionNotificationServiceImpl>
+ SelectionNotificationService;
+}
}
namespace Mantid {
namespace Kernel {
- EXTERN_MANTIDQT_API template class EXPORT_OPT_MANTIDQT_API Mantid::Kernel::SingletonHolder<MantidQt::API::SelectionNotificationServiceImpl>;
+EXTERN_MANTIDQT_API template class EXPORT_OPT_MANTIDQT_API Mantid::Kernel::
+ SingletonHolder<MantidQt::API::SelectionNotificationServiceImpl>;
}
}
diff --git a/MantidQt/API/src/SelectionNotificationService.cpp b/MantidQt/API/src/SelectionNotificationService.cpp
index e85df02b85d868081383153607abc8cdb09d63fd..9fc1bea6be9fc8142bb71302609bd21519fbf71a 100644
--- a/MantidQt/API/src/SelectionNotificationService.cpp
+++ b/MantidQt/API/src/SelectionNotificationService.cpp
@@ -32,4 +32,3 @@ void SelectionNotificationServiceImpl::sendQPointSelection(bool lab_coords,
emit QPointSelection_signal(lab_coords, qx, qy, qz);
// std::cout << "QPointSelection_signal emitted" << std::endl;
}
-