diff --git a/Framework/API/inc/MantidAPI/IPeaksWorkspace.h b/Framework/API/inc/MantidAPI/IPeaksWorkspace.h
index 19cd52b20af66b3f076e817644a651cb01bad3bb..260c947c829dba9fa1a9555beb0577b52fca7a3d 100644
--- a/Framework/API/inc/MantidAPI/IPeaksWorkspace.h
+++ b/Framework/API/inc/MantidAPI/IPeaksWorkspace.h
@@ -50,9 +50,8 @@ class MANTID_API_DLL IPeaksWorkspace : public ITableWorkspace,
public:
/// Ctor
IPeaksWorkspace() : ITableWorkspace(), ExperimentInfo() {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
-}
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
+ }
/// Destructor
virtual ~IPeaksWorkspace();
diff --git a/Framework/API/src/IMDWorkspace.cpp b/Framework/API/src/IMDWorkspace.cpp
index c5a15240d0a142828da85ba3f42ea88f456db47f..b33db143febd8692c2cf8719d7e94b75c9d7da37 100644
--- a/Framework/API/src/IMDWorkspace.cpp
+++ b/Framework/API/src/IMDWorkspace.cpp
@@ -13,8 +13,7 @@ namespace API {
//-----------------------------------------------------------------------------------------------
/** Default constructor */
IMDWorkspace::IMDWorkspace() : Workspace(), Mantid::API::MDGeometry() {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
}
//-----------------------------------------------------------------------------------------------
diff --git a/Framework/DataObjects/src/Peak.cpp b/Framework/DataObjects/src/Peak.cpp
index 3a946dd996d1e1d9a7e97e5c650a976d5c22a889..cf0278eada96ee8fd03854a6c509e9f3511f7f7c 100644
--- a/Framework/DataObjects/src/Peak.cpp
+++ b/Framework/DataObjects/src/Peak.cpp
@@ -24,8 +24,9 @@ Peak::Peak()
m_finalEnergy(0.), m_GoniometerMatrix(3, 3, true),
m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0),
m_row(-1), m_col(-1), m_orig_H(0), m_orig_K(0), m_orig_L(0),
- m_peakShape(new NoShape) { convention =
- Kernel::ConfigService::Instance().getString("Q.convention");}
+ m_peakShape(new NoShape) {
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
+}
//----------------------------------------------------------------------------------------------
/** Constructor that uses the Q position of the peak (in the lab frame).
@@ -44,8 +45,7 @@ Peak::Peak(Geometry::Instrument_const_sptr m_inst,
m_binCount(0), m_GoniometerMatrix(3, 3, true),
m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakShape(new NoShape) {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
this->setInstrument(m_inst);
this->setQLabFrame(QLabFrame, detectorDistance);
}
@@ -71,8 +71,7 @@ Peak::Peak(Geometry::Instrument_const_sptr m_inst,
m_binCount(0), m_GoniometerMatrix(goniometer),
m_InverseGoniometerMatrix(goniometer), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakShape(new NoShape) {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8)
throw std::invalid_argument(
"Peak::ctor(): Goniometer matrix must non-singular.");
@@ -94,8 +93,7 @@ Peak::Peak(Geometry::Instrument_const_sptr m_inst, int m_detectorID,
m_binCount(0), m_GoniometerMatrix(3, 3, true),
m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakShape(new NoShape) {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
this->setInstrument(m_inst);
this->setDetectorID(m_detectorID);
this->setWavelength(m_Wavelength);
@@ -116,8 +114,7 @@ Peak::Peak(Geometry::Instrument_const_sptr m_inst, int m_detectorID,
m_sigmaIntensity(0), m_binCount(0), m_GoniometerMatrix(3, 3, true),
m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakShape(new NoShape) {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
this->setInstrument(m_inst);
this->setDetectorID(m_detectorID);
this->setWavelength(m_Wavelength);
@@ -140,8 +137,7 @@ Peak::Peak(Geometry::Instrument_const_sptr m_inst, int m_detectorID,
m_sigmaIntensity(0), m_binCount(0), m_GoniometerMatrix(goniometer),
m_InverseGoniometerMatrix(goniometer), m_runNumber(0), m_monitorCount(0),
m_orig_H(0), m_orig_K(0), m_orig_L(0), m_peakShape(new NoShape) {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8)
throw std::invalid_argument(
"Peak::ctor(): Goniometer matrix must non-singular.");
@@ -164,8 +160,7 @@ Peak::Peak(Geometry::Instrument_const_sptr m_inst, double scattering,
m_InverseGoniometerMatrix(3, 3, true), m_runNumber(0), m_monitorCount(0),
m_row(-1), m_col(-1), m_orig_H(0), m_orig_K(0), m_orig_L(0),
m_peakShape(new NoShape) {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
this->setInstrument(m_inst);
this->setWavelength(m_Wavelength);
m_detectorID = -1;
@@ -193,8 +188,9 @@ Peak::Peak(const Peak &other)
m_orig_L(other.m_orig_L), m_detIDs(other.m_detIDs),
m_peakShape(other.m_peakShape->clone())
-{ convention =
- Kernel::ConfigService::Instance().getString("Q.convention");}
+{
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
+}
//----------------------------------------------------------------------------------------------
/** Constructor making a Peak from IPeak interface
@@ -215,8 +211,7 @@ Peak::Peak(const Geometry::IPeak &ipeak)
m_monitorCount(ipeak.getMonitorCount()), m_row(ipeak.getRow()),
m_col(ipeak.getCol()), m_orig_H(0.), m_orig_K(0.), m_orig_L(0.),
m_peakShape(new NoShape) {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
if (fabs(m_InverseGoniometerMatrix.Invert()) < 1e-8)
throw std::invalid_argument(
"Peak::ctor(): Goniometer matrix must non-singular.");
diff --git a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
index ae7f835648b576fd9d5c46fe5fe52cdb3845d496..22f8c885aacd98429af5349af8be5307cb8e5912 100644
--- a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
+++ b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
@@ -167,8 +167,7 @@ void CalculateCoverageDGS::exec() {
// get the limits
Mantid::API::MatrixWorkspace_const_sptr inputWS =
getProperty("InputWorkspace");
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
// cache two theta and phi
auto instrument = inputWS->getInstrument();
std::vector<detid_t> detIDS = instrument->getDetectorIDs(true);
diff --git a/Framework/MDAlgorithms/src/LoadMD.cpp b/Framework/MDAlgorithms/src/LoadMD.cpp
index 7c41d4706bcb97ebfc1a4f35111ed80dc1cf4fba..e87ccb50a6dbb20e562aabb2e2f6bf2792660757 100644
--- a/Framework/MDAlgorithms/src/LoadMD.cpp
+++ b/Framework/MDAlgorithms/src/LoadMD.cpp
@@ -119,8 +119,7 @@ void LoadMD::init() {
*/
void LoadMD::exec() {
m_filename = getPropertyValue("Filename");
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
// Start loading
bool fileBacked = this->getProperty("FileBackEnd");
diff --git a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
index bf8b01b7c5eeb5939c53cfe9dd5698c4bcaa0dde..10b6c57f2245cb5d7d8b028e825c7bc82140d9db 100644
--- a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
+++ b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
@@ -108,8 +108,7 @@ void MDNormDirectSC::init() {
void MDNormDirectSC::exec() {
cacheInputs();
auto outputWS = binInputWS();
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
setProperty<Workspace_sptr>("OutputWorkspace", outputWS);
createNormalizationWS(*outputWS);
setProperty("OutputNormalizationWorkspace", m_normWS);
diff --git a/Framework/MDAlgorithms/src/MDNormSCD.cpp b/Framework/MDAlgorithms/src/MDNormSCD.cpp
index 5b6158974cc8b82592e25f955efa1370bf5b8d04..1d88f2acf197adf4e81a62296e35ca7f044caa54 100644
--- a/Framework/MDAlgorithms/src/MDNormSCD.cpp
+++ b/Framework/MDAlgorithms/src/MDNormSCD.cpp
@@ -112,8 +112,7 @@ void MDNormSCD::init() {
void MDNormSCD::exec() {
cacheInputs();
auto outputWS = binInputWS();
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
setProperty<Workspace_sptr>("OutputWorkspace", outputWS);
createNormalizationWS(*outputWS);
setProperty("OutputNormalizationWorkspace", m_normWS);
diff --git a/Framework/MDAlgorithms/src/MDTransfQ3D.cpp b/Framework/MDAlgorithms/src/MDTransfQ3D.cpp
index c57a848983a4b8c8ba612df6576a0815a74c3bf5..5fab2fedb1c53d6d12dfed93dfd9c8a95a1113b0 100644
--- a/Framework/MDAlgorithms/src/MDTransfQ3D.cpp
+++ b/Framework/MDAlgorithms/src/MDTransfQ3D.cpp
@@ -205,8 +205,7 @@ bool MDTransfQ3D::calcYDepCoordinates(std::vector<coord_t> &Coord, size_t i) {
/** function initalizes all variables necessary for converting workspace
* variables into MD variables in ModQ (elastic/inelastic) cases */
void MDTransfQ3D::initialize(const MDWSDescription &ConvParams) {
- convention =
- Kernel::ConfigService::Instance().getString("Q.convention");
+ convention = Kernel::ConfigService::Instance().getString("Q.convention");
m_pEfixedArray = NULL;
m_pDetMasks = NULL;
//********** Generic part of initialization, common for elastic and inelastic