From 745f1f5a78e210c17bb36a0a98aed27200b3a08d Mon Sep 17 00:00:00 2001
From: Vickie Lynch <lynchve@ornl.gov>
Date: Fri, 11 Dec 2015 16:22:22 -0500
Subject: [PATCH] Refs #12863 change more algorithms; put in preferences
---
Framework/Crystal/src/LoadHKL.cpp | 2 +-
Framework/Crystal/src/LoadIsawPeaks.cpp | 2 +-
Framework/Crystal/src/SaveHKL.cpp | 2 +-
Framework/Crystal/src/SaveIsawPeaks.cpp | 2 +-
Framework/Crystal/src/SaveLauenorm.cpp | 2 +-
.../MantidDataObjects/MDEventWorkspace.tcc | 2 +-
Framework/DataObjects/src/Peak.cpp | 4 +--
Framework/DataObjects/src/PeaksWorkspace.cpp | 2 +-
Framework/Kernel/src/ConfigService.cpp | 4 +--
.../MantidMDAlgorithms/CalculateCoverageDGS.h | 2 ++
.../inc/MantidMDAlgorithms/ConvertToMD.h | 1 -
.../inc/MantidMDAlgorithms/MDNormDirectSC.h | 2 ++
.../inc/MantidMDAlgorithms/MDNormSCD.h | 2 ++
.../inc/MantidMDAlgorithms/MDTransfQ3D.h | 3 ++
.../MDAlgorithms/src/CalculateCoverageDGS.cpp | 5 +++
Framework/MDAlgorithms/src/ConvertToMD.cpp | 29 ----------------
Framework/MDAlgorithms/src/MDNormDirectSC.cpp | 6 ++++
Framework/MDAlgorithms/src/MDNormSCD.cpp | 4 +++
Framework/MDAlgorithms/src/MDTransfQ3D.cpp | 11 ++++++
.../Properties/Mantid.properties.template | 2 +-
MantidPlot/src/ConfigDialog.cpp | 12 +++++++
MantidPlot/src/ConfigDialog.h | 1 +
docs/source/concepts/PropertiesFile.rst | 34 +++++++++----------
.../DefaultConfigFiles/Mantid.user.properties | 2 +-
24 files changed, 78 insertions(+), 60 deletions(-)
diff --git a/Framework/Crystal/src/LoadHKL.cpp b/Framework/Crystal/src/LoadHKL.cpp
index dae696eaf2b..7b0077113a0 100644
--- a/Framework/Crystal/src/LoadHKL.cpp
+++ b/Framework/Crystal/src/LoadHKL.cpp
@@ -62,7 +62,7 @@ void LoadHKL::exec() {
// HKL is flipped by -1 due to different q convention in ISAW vs mantid.
// Default for kf-ki has -q
double qSign = -1.0;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") qSign = 1.0;
Instrument_sptr inst(new Geometry::Instrument);
Detector *detector = new Detector("det1", -1, 0);
diff --git a/Framework/Crystal/src/LoadIsawPeaks.cpp b/Framework/Crystal/src/LoadIsawPeaks.cpp
index f844eda8286..dbd226f4421 100644
--- a/Framework/Crystal/src/LoadIsawPeaks.cpp
+++ b/Framework/Crystal/src/LoadIsawPeaks.cpp
@@ -508,7 +508,7 @@ void LoadIsawPeaks::appendFile(PeaksWorkspace_sptr outWS,
// HKL's are flipped by -1 because of the internal Q convention
// unless Crystallography convention
double qSign = -1.0;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") qSign = 1.0;
// Open the file
std::ifstream in(filename.c_str());
diff --git a/Framework/Crystal/src/SaveHKL.cpp b/Framework/Crystal/src/SaveHKL.cpp
index 31198850b53..65623e55a0d 100644
--- a/Framework/Crystal/src/SaveHKL.cpp
+++ b/Framework/Crystal/src/SaveHKL.cpp
@@ -131,7 +131,7 @@ void SaveHKL::exec() {
// HKL is flipped by -1 due to different q convention in ISAW vs mantid.
// Default for kf-ki has -q
double qSign = -1.0;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") qSign = 1.0;
std::fstream out;
diff --git a/Framework/Crystal/src/SaveIsawPeaks.cpp b/Framework/Crystal/src/SaveIsawPeaks.cpp
index 9d19b56bd04..e63575bfd08 100644
--- a/Framework/Crystal/src/SaveIsawPeaks.cpp
+++ b/Framework/Crystal/src/SaveIsawPeaks.cpp
@@ -249,7 +249,7 @@ void SaveIsawPeaks::exec() {
// HKL's are flipped by -1 because of the internal Q convention
// unless Crystallography convention
double qSign = -1.0;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") qSign = 1.0;
// ============================== Save all Peaks
// =========================================
diff --git a/Framework/Crystal/src/SaveLauenorm.cpp b/Framework/Crystal/src/SaveLauenorm.cpp
index 2f74efad911..cc89a578f67 100644
--- a/Framework/Crystal/src/SaveLauenorm.cpp
+++ b/Framework/Crystal/src/SaveLauenorm.cpp
@@ -114,7 +114,7 @@ void SaveLauenorm::exec() {
// HKL is flipped by -1 due to different q convention in ISAW vs mantid.
// Default for kf-ki has -q
double qSign = -1.0;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") qSign = 1.0;
// Go through each peak at this run / bank
diff --git a/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc b/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc
index 78e56e42f1d..6befe01e64e 100644
--- a/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc
+++ b/Framework/DataObjects/inc/MantidDataObjects/MDEventWorkspace.tcc
@@ -379,7 +379,7 @@ TMDE(std::vector<Mantid::Geometry::MDDimensionExtents<coord_t>>
TMDE(std::vector<std::string> MDEventWorkspace)::getBoxControllerStats() const {
std::vector<std::string> out;
std::ostringstream mess;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") mess << "Crystallography: ki-kf";
else mess << "Inelastic: kf-ki";
out.push_back(mess.str());
diff --git a/Framework/DataObjects/src/Peak.cpp b/Framework/DataObjects/src/Peak.cpp
index 61928c9b866..2a403a14bb8 100644
--- a/Framework/DataObjects/src/Peak.cpp
+++ b/Framework/DataObjects/src/Peak.cpp
@@ -455,7 +455,7 @@ Mantid::Kernel::V3D Peak::getQLabFrame() const {
// And Q in the lab frame
// Default for ki-kf is positive
double qSign = 1.0;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") qSign = -1.0;
return (beamDir * wvi - detDir * wvf) * qSign;
}
@@ -555,7 +555,7 @@ void Peak::setQLabFrame(Mantid::Kernel::V3D QLabFrame,
// Default for ki-kf has -q
double qSign = -1.0;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") qSign = 1.0;
V3D detectorDir = q * qSign;
diff --git a/Framework/DataObjects/src/PeaksWorkspace.cpp b/Framework/DataObjects/src/PeaksWorkspace.cpp
index 52f502840fd..f241633a8b1 100644
--- a/Framework/DataObjects/src/PeaksWorkspace.cpp
+++ b/Framework/DataObjects/src/PeaksWorkspace.cpp
@@ -608,7 +608,7 @@ void PeaksWorkspace::saveNexus(::NeXus::File *file) const {
// HKL is flipped by -1 due to different q convention in Crystallography.
// Always write out in ki-kf so consistent with old files
double qSign = 1.0;
- std::string convention = ConfigService::Instance().getString("default.convention");
+ std::string convention = ConfigService::Instance().getString("Q.convention");
if (convention == "Crystallography") qSign = -1.0;
// Populate column vectors from Peak Workspace
diff --git a/Framework/Kernel/src/ConfigService.cpp b/Framework/Kernel/src/ConfigService.cpp
index 02eab16b956..a67a5e94a1b 100644
--- a/Framework/Kernel/src/ConfigService.cpp
+++ b/Framework/Kernel/src/ConfigService.cpp
@@ -673,9 +673,9 @@ void ConfigServiceImpl::createUserPropertiesFile() const {
filestr << "## e.g. IRIS, HET, NIMROD" << std::endl;
filestr << "default.instrument=" << std::endl;
filestr << std::endl;
- filestr << "## Sets the default convention" << std::endl;
+ filestr << "## Sets the Q.convention" << std::endl;
filestr << "## Uncomment next line for kf-ki instead of ki-kf" << std::endl;
- filestr << "#default.convention=Crystallography" << std::endl;
+ filestr << "#Q.convention=Crystallography" << std::endl;
filestr << std::endl;
filestr << "##" << std::endl;
filestr << "## DIRECTORIES" << std::endl;
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h
index c27d40674a8..59b8446bd6c 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CalculateCoverageDGS.h
@@ -46,6 +46,8 @@ private:
void init();
void exec();
+ // ki-kf for Inelastic convention; kf-ki for Crystallography convention
+ std::string convention = Kernel::ConfigService::Instance().getString("Q.convention");
/// limits for h,k,l,dE dimensions
coord_t m_hmin, m_hmax, m_kmin, m_kmax, m_lmin, m_lmax, m_dEmin, m_dEmax;
/// cached values for incident energy and momentum, final momentum min/max
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
index cf2acc64796..3112f5406d7 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
@@ -116,7 +116,6 @@ protected: // for testing, otherwise private:
/// Sets up the top level splitting, i.e. of level 0, for the box controller
void setupTopLevelSplitting(Mantid::API::BoxController_sptr bc);
- API::IMDEventWorkspace_sptr changeConvention(API::IMDEventWorkspace_sptr spws);
};
} // namespace Mantid
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormDirectSC.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormDirectSC.h
index 375dea55781..55e3e613a52 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormDirectSC.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormDirectSC.h
@@ -88,6 +88,8 @@ private:
Kernel::V3D m_samplePos;
/// Beam direction
Kernel::V3D m_beamDir;
+ /// ki-kf for Inelastic convention; kf-ki for Crystallography convention
+ std::string convention = Kernel::ConfigService::Instance().getString("Q.convention");
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h
index a0c1a0ed9d6..0bd27d0029e 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDNormSCD.h
@@ -91,6 +91,8 @@ private:
Kernel::V3D m_samplePos;
/// Beam direction
Kernel::V3D m_beamDir;
+ /// ki-kf for Inelastic convention; kf-ki for Crystallography convention
+ std::string convention = Kernel::ConfigService::Instance().getString("Q.convention");
};
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfQ3D.h b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfQ3D.h
index 1db019647c7..cb2747980a2 100644
--- a/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfQ3D.h
+++ b/Framework/MDAlgorithms/inc/MantidMDAlgorithms/MDTransfQ3D.h
@@ -4,6 +4,7 @@
#include "MantidMDAlgorithms/MDTransfInterface.h"
#include "MantidMDAlgorithms/MDTransfFactory.h"
#include "MantidMDAlgorithms/MDTransfModQ.h"
+#include "MantidKernel/ConfigService.h"
//
namespace Mantid {
namespace MDAlgorithms {
@@ -98,6 +99,8 @@ protected:
// current value of Sin(Theta)^2 corresponding to the current detector value
// and used to calculate Lorentz corrections
double m_SinThetaSq;
+ // ki-kf for Inelastic convention; kf-ki for Crystallography convention
+ std::string convention = Kernel::ConfigService::Instance().getString("Q.convention");
// all other variables are the same as in ModQ
private:
/// how to transform workspace data in elastic case
diff --git a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
index 314e164716b..6e1e4de7b0e 100644
--- a/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
+++ b/Framework/MDAlgorithms/src/CalculateCoverageDGS.cpp
@@ -456,8 +456,13 @@ CalculateCoverageDGS::calculateIntersections(const double theta,
const double phi) {
V3D qout(sin(theta) * cos(phi), sin(theta) * sin(phi), cos(theta)),
qin(0., 0., m_ki);
+
qout = m_rubw * qout;
qin = m_rubw * qin;
+ if (convention != "Crystallography") {
+ qout *= -1;
+ qin *= -1;
+ }
double hStart = qin.X() - qout.X() * m_kfmin,
hEnd = qin.X() - qout.X() * m_kfmax;
double kStart = qin.Y() - qout.Y() * m_kfmin,
diff --git a/Framework/MDAlgorithms/src/ConvertToMD.cpp b/Framework/MDAlgorithms/src/ConvertToMD.cpp
index a8dcbaf9130..375e4467d68 100644
--- a/Framework/MDAlgorithms/src/ConvertToMD.cpp
+++ b/Framework/MDAlgorithms/src/ConvertToMD.cpp
@@ -19,7 +19,6 @@
#include "MantidMDAlgorithms/ConvToMDSelector.h"
#include "MantidMDAlgorithms/MDWSTransform.h"
-#include "MantidKernel/ConfigService.h"
using namespace Mantid::API;
using namespace Mantid::Kernel;
@@ -215,8 +214,6 @@ void ConvertToMD::exec() {
// Set the normalization of the event workspace
m_Convertor->setDisplayNormalization(spws, m_InWS2D);
- spws = changeConvention(spws) ;
-
// JOB COMPLETED:
setProperty("OutputWorkspace",
boost::dynamic_pointer_cast<IMDEventWorkspace>(spws));
@@ -665,31 +662,5 @@ void ConvertToMD::findMinMax(
}
}
- /**change convention if specified in properties
- * @param spws: md workspace
- *@returns md workspace
- */
-IMDEventWorkspace_sptr ConvertToMD::changeConvention(IMDEventWorkspace_sptr spws) {
- // kf-ki for crystallograpy convention
- std::string convention = ConfigService::Instance().getString("default.convention");
- if (convention == "Crystallography")
- {
- auto trans = createChildAlgorithm("TransformMD");
- trans->initialize();
- trans->setProperty("InputWorkspace", spws);
- trans->setPropertyValue("Scaling", "-1");
- trans->setProperty("OutputWorkspace", spws);
- trans->execute();
-
- g_log.information() << "Workspace has " << spws->getNPoints();
- std::vector<std::string> stats = spws->getBoxControllerStats();
- for (size_t i = 0; i < stats.size(); ++i)
- g_log.information() << stats[i] << "\n";
- g_log.information() << std::endl;
-
- }
- return spws;
-}
-
} // namespace Mantid
} // namespace MDAlgorithms
diff --git a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
index efc710413ea..551d0f5bdfa 100644
--- a/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
+++ b/Framework/MDAlgorithms/src/MDNormDirectSC.cpp
@@ -8,6 +8,7 @@
#include "MantidKernel/CompositeValidator.h"
#include "MantidKernel/TimeSeriesProperty.h"
#include "MantidKernel/VectorHelper.h"
+#include "MantidKernel/ConfigService.h"
namespace Mantid {
namespace MDAlgorithms {
@@ -606,8 +607,13 @@ std::vector<Kernel::VMD>
MDNormDirectSC::calculateIntersections(const double theta, const double phi) {
V3D qout(sin(theta) * cos(phi), sin(theta) * sin(phi), cos(theta)),
qin(0., 0., m_ki);
+
qout = m_rubw * qout;
qin = m_rubw * qin;
+ if (convention != "Crystallography") {
+ qout *= -1;
+ qin *= -1;
+ }
double hStart = qin.X() - qout.X() * m_kfmin,
hEnd = qin.X() - qout.X() * m_kfmax;
double kStart = qin.Y() - qout.Y() * m_kfmin,
diff --git a/Framework/MDAlgorithms/src/MDNormSCD.cpp b/Framework/MDAlgorithms/src/MDNormSCD.cpp
index 665807725fa..60f66f91755 100644
--- a/Framework/MDAlgorithms/src/MDNormSCD.cpp
+++ b/Framework/MDAlgorithms/src/MDNormSCD.cpp
@@ -642,6 +642,10 @@ std::vector<Kernel::VMD> MDNormSCD::calculateIntersections(const double theta,
const double phi) {
V3D q(-sin(theta) * cos(phi), -sin(theta) * sin(phi), 1. - cos(theta));
q = m_rubw * q;
+ if (convention != "Crystallography") {
+ q *= -1;
+ }
+
double hStart = q.X() * m_kiMin, hEnd = q.X() * m_kiMax;
double kStart = q.Y() * m_kiMin, kEnd = q.Y() * m_kiMax;
double lStart = q.Z() * m_kiMin, lEnd = q.Z() * m_kiMax;
diff --git a/Framework/MDAlgorithms/src/MDTransfQ3D.cpp b/Framework/MDAlgorithms/src/MDTransfQ3D.cpp
index 6ea22f885e9..526e269d123 100644
--- a/Framework/MDAlgorithms/src/MDTransfQ3D.cpp
+++ b/Framework/MDAlgorithms/src/MDTransfQ3D.cpp
@@ -80,6 +80,12 @@ bool MDTransfQ3D::calcMatrixCoord3DInelastic(
double qy = -m_ey * k_tr;
double qz = m_Ki - m_ez * k_tr;
+ if (convention == "Crystallography") {
+ qx = -qx;
+ qy = -qy;
+ qz = -qz;
+ }
+
Coord[0] = (coord_t)(m_RotMat[0] * qx + m_RotMat[1] * qy + m_RotMat[2] * qz);
if (Coord[0] < m_DimMin[0] || Coord[0] >= m_DimMax[0])
return false;
@@ -116,6 +122,11 @@ bool MDTransfQ3D::calcMatrixCoord3DElastic(const double &k0,
double qx = -m_ex * k0;
double qy = -m_ey * k0;
double qz = (1 - m_ez) * k0;
+ if (convention == "Crystallography") {
+ qx = -qx;
+ qy = -qy;
+ qz = -qz;
+ }
Coord[0] = (coord_t)(m_RotMat[0] * qx + m_RotMat[1] * qy + m_RotMat[2] * qz);
if (Coord[0] < m_DimMin[0] || Coord[0] >= m_DimMax[0])
diff --git a/Framework/Properties/Mantid.properties.template b/Framework/Properties/Mantid.properties.template
index a42b16387bb..5ec631d5008 100644
--- a/Framework/Properties/Mantid.properties.template
+++ b/Framework/Properties/Mantid.properties.template
@@ -17,7 +17,7 @@ default.instrument =
# This flag controls the convention for converting to Q. Default is ki-kf
# Change to Crystallography for kf-ki
-default.convention = Inelastic
+Q.convention = Inelastic
# Set of PyQt interfaces to add to the Interfaces menu, separated by a space. Interfaces are seperated from their respective categories by a "/".
mantidqt.python_interfaces = Direct/DGS_Reduction.py Direct/DGSPlanner.py SANS/ORNL_SANS.py Reflectometry/REFL_Reduction.py Reflectometry/REFL_SF_Calculator.py Reflectometry/REFM_Reduction.py Utility/TofConverter.py Reflectometry/ISIS_Reflectometry.py Diffraction/Powder_Diffraction_Reduction.py Utility/FilterEvents.py Diffraction/HFIR_Powder_Diffraction_Reduction.py Diffraction/HFIR_4Circle_Reduction.py
diff --git a/MantidPlot/src/ConfigDialog.cpp b/MantidPlot/src/ConfigDialog.cpp
index 87e74e4ea83..cca26e9a243 100644
--- a/MantidPlot/src/ConfigDialog.cpp
+++ b/MantidPlot/src/ConfigDialog.cpp
@@ -690,6 +690,14 @@ void ConfigDialog::initMantidPage()
ckIgnoreParaView->setChecked(ignoreParaView);
grid->addWidget(ckIgnoreParaView, 3, 0);
+ //Change to Crystallography Convention
+ ckQconvention = new QCheckBox("Crystallography Convention");
+ ckQconvention->setToolTip("Change from default ki-kf to kf-ki.");
+ const std::string QconventionProperty = "Q.convention";
+ bool Qconvention = cfgSvc.hasProperty(QconventionProperty) && bool(atoi(cfgSvc.getString(QconventionProperty).c_str()));
+ ckQconvention->setChecked(Qconvention);
+ grid->addWidget(ckQconvention, 4, 0);
+
// Populate boxes
auto faclist = cfgSvc.getFacilityNames();
for ( auto it = faclist.begin(); it != faclist.end(); ++it )
@@ -2464,6 +2472,10 @@ void ConfigDialog::apply()
cfgSvc.setString("default.facility", facility->currentText().toStdString());
cfgSvc.setString("default.instrument", defInstr->currentText().toStdString());
cfgSvc.setString("paraview.ignore", QString::number(ckIgnoreParaView->isChecked()).toStdString());
+ if (ckQconvention->isChecked())
+ cfgSvc.setString("Q.convention", "Crystallography");
+ else
+ cfgSvc.setString("Q.convention", "Inelastic");
updateDirSearchSettings();
diff --git a/MantidPlot/src/ConfigDialog.h b/MantidPlot/src/ConfigDialog.h
index 64f80367c2e..d8122326fc1 100644
--- a/MantidPlot/src/ConfigDialog.h
+++ b/MantidPlot/src/ConfigDialog.h
@@ -188,6 +188,7 @@ private:
QComboBox *facility;
MantidQt::MantidWidgets::InstrumentSelector *defInstr;
QCheckBox* ckIgnoreParaView;
+ QCheckBox* ckQconvention;
/// Mantid tab for setting directories
QWidget *directoriesPage;
diff --git a/docs/source/concepts/PropertiesFile.rst b/docs/source/concepts/PropertiesFile.rst
index 328779f2b8d..8961e803ae1 100644
--- a/docs/source/concepts/PropertiesFile.rst
+++ b/docs/source/concepts/PropertiesFile.rst
@@ -43,23 +43,23 @@ General properties
Facility and instrument properties
**********************************
-+------------------------------+---------------------------------------------------+-------------+
-|Property |Description |Example value|
-+==============================+===================================================+=============+
-|default.facility |The name of the default facility. The facility must| ISIS |
-| |be defined within the facilites.xml file to be | |
-| |considered valid. The file is described here. | |
-| |:ref:`here <Facilities file>`. | |
-+------------------------------+---------------------------------------------------+-------------+
-|default.instrument |The name of the default instrument. The instrument | WISH |
-| |must be defined within the facilities.xml file to | |
-| |be valid. The file is described | |
-| |:ref:`here <Facilities file>`. | |
-+------------------------------+---------------------------------------------------+-------------+
-|default.convention |The convention for converting to Q. For inelastic | Crystal- |
-| |the convention is ki-kf. For Crystallogaphy the | ography |
-| |convention is kf-ki. | |
-+------------------------------+---------------------------------------------------+-------------+
++------------------------------+---------------------------------------------------+-----------------+
+|Property |Description |Example value |
++==============================+===================================================+=================+
+|default.facility |The name of the default facility. The facility must| ISIS |
+| |be defined within the facilites.xml file to be | |
+| |considered valid. The file is described here. | |
+| |:ref:`here <Facilities file>`. | |
++------------------------------+---------------------------------------------------+-----------------+
+|default.instrument |The name of the default instrument. The instrument | WISH |
+| |must be defined within the facilities.xml file to | |
+| |be valid. The file is described | |
+| |:ref:`here <Facilities file>`. | |
++------------------------------+---------------------------------------------------+-----------------+
+|Q.convention |The convention for converting to Q. For inelastic | Crystallography |
+| |the convention is ki-kf. For Crystallography the | |
+| |convention is kf-ki. | |
++------------------------------+---------------------------------------------------+-----------------+
Directory Properties
********************
diff --git a/tools/DefaultConfigFiles/Mantid.user.properties b/tools/DefaultConfigFiles/Mantid.user.properties
index 65a81aceaf7..3bebfafb771 100644
--- a/tools/DefaultConfigFiles/Mantid.user.properties
+++ b/tools/DefaultConfigFiles/Mantid.user.properties
@@ -33,7 +33,7 @@ default.instrument=
# This flag controls the convention for converting to Q. Default is ki-kf
# Change to Crystallography for kf-ki
-default.convention = Inelastic
+Q.convention = Inelastic
##
## DIRECTORIES
--
GitLab